Merge remote-tracking branch 'origin/master'

psdc-ui/src/api/bigview/bigview.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
 /** 8个温度传感器接口*/
-export function getTemperature() {
-    return request.get('/indexLook/8wd')
+export function getTemperature(data) {
+    return request.get('/indexLook/8wd/'+data)
 }
 /**运行设备工作信息查询接口*/
 export function getDevicesInfo() {

psdc-ui/src/api/emonitor/api.js

@@ -35,6 +35,30 @@ export function getFrld(data) {
     return request.get('/monitor/frdl/index/sel2/'+data)
 }
 //温度传感器
-export function getWdcgq() {
-    return request.get('/monitor/wdcgq/index/sel1')
+export function getWdcgq(data) {
+    return request.get('/monitor/wdcgq/index/sel1/'+data)
 }
+//沙盘
+export function getSp(data) {
+    return request.get('monitor/sp/index/sel1/'+data)
+}
+//策略管理
+export function getXl() {
+    return request.get('system/cl/index/selMyscene')
+}
+export function getTb(data) {
+    return request.post('system/cl/index/list',data)
+}
+export function postNew(data) {
+    return request.post('system/cl/index',data)
+}
+export function postXg(data) {
+    return request.put('system/cl/index',data)
+}
+export function postDel(data) {
+    return request.post('system/cl/index/del',data)
+}
+//获取用户设备列表
+export function getSb() {
+    return request.get('/monitor/db/index/selMydevices')
+}

psdc-ui/src/views/bigview/index.vue

@@ -131,7 +131,7 @@ onMounted(()=>{
 /** 8个温度传感器数据*/
 const wdcgqArr = ref([])
 function getWenduFun(){
-  getTemperature().then((res)=>{
+  getTemperature(16).then((res)=>{
     wdcgqArr.value = res.data
   })
 }

psdc-ui/src/views/emonitor/db/index.vue

@@ -181,15 +181,18 @@ export default {
     onMounted(() => {//需要获取到element,所以是onMounted的Hook
       getData(13).then((res)=>{
         console.log(res)
-        data.totp=res.data.totp
-        data.totwh=res.data.totwh
-        data.eday=res.data.eday
-        data.emonth=res.data.emonth
-        delete res.data.todayUsePowers.deviceId
-        delete res.data.todayUsePowers.samDate
-        delete res.data.todayUsePowers.userId
-        let arr = Object.values(res.data.todayUsePowers)
-        data.glData=arr
+        if(res.data){
+          data.totp=res.data.totp
+          data.totwh=res.data.totwh
+          data.eday=res.data.eday
+          data.emonth=res.data.emonth
+          delete res.data.todayUsePowers.deviceId
+          delete res.data.todayUsePowers.samDate
+          delete res.data.todayUsePowers.userId
+          let arr = Object.values(res.data.todayUsePowers)
+          data.glData=arr
+        }
+
 
 
 
@@ -304,6 +307,7 @@ export default {
               itemStyle:{
                 color:'#2F8EE0'
               },
+              symbol: "none", //去掉拐角点
             },
           ],
         });

psdc-ui/src/views/emonitor/drgl/index.vue

@@ -422,21 +422,24 @@ export default {
       })
       getDrgl(1).then((res)=>{
         console.log('1',res)
-        data.tempIn=res.data.tempIn
-        data.tempOut=res.data.tempOut
-        data.totp = res.data.totp
-        data.totwh = res.data.totwh
-        if(res.data.runStatus==1){
-          data.runStatus = '开启'
-        }else if (res.data.runStatus==2){
-          data.runStatus = '关闭'
+        if(res.data){
+          data.tempIn=res.data.tempIn
+          data.tempOut=res.data.tempOut
+          data.totp = res.data.totp
+          data.totwh = res.data.totwh
+          if(res.data.runStatus==1){
+            data.runStatus = '开启'
+          }else if (res.data.runStatus==2){
+            data.runStatus = '关闭'
+          }
+          //gl
+          delete res.data.todayUsePowers.deviceId
+          delete res.data.todayUsePowers.samDate
+          delete res.data.todayUsePowers.userId
+          let arr = Object.values(res.data.todayUsePowers)
+          data.glData=arr
         }
-        //gl
-        delete res.data.todayUsePowers.deviceId
-        delete res.data.todayUsePowers.samDate
-        delete res.data.todayUsePowers.userId
-        let arr = Object.values(res.data.todayUsePowers)
-        data.glData=arr
+
         let myChart3 = echarts.getInstanceByDom(document.getElementById("myEcharts3"));
         if (myChart3){
           myChart3.dispose()
@@ -483,6 +486,7 @@ export default {
               itemStyle:{
                 color:'#2F8EE0'
               },
+              symbol: "none", //去掉拐角点
             },
           ],
         });

psdc-ui/src/views/emonitor/frdl/index.vue

@@ -460,6 +460,7 @@ export default {
               itemStyle:{
                 color:'#2F8EE0'
               },
+              symbol: "none", //去掉拐角点
             },
           ],
         });

psdc-ui/src/views/emonitor/kqyrb/index.vue

@@ -480,6 +480,7 @@ export default {
               itemStyle:{
                 color:'#2F8EE0'
               },
+              symbol: "none", //去掉拐角点
             },
           ],
         });

psdc-ui/src/views/emonitor/sp/index.vue

@@ -1,10 +1,35 @@
 <template>
   <div class="app-container home">
-    <h1>沙盘</h1>
+    <h1>{{data.name}}</h1>
+    <h1>运行状态:{{data.status}}</h1>
   </div>
 </template>
 
-<script setup name="Index">
+<script  name="Index">
+import {reactive,onMounted} from "vue";
+import {getSp} from '../../../api/emonitor/api'
+export default {
+  setup(){
+    let data = reactive({
+        name:'',
+      status:'',
+    })
+    onMounted(()=>{
+      getSp(14).then((res)=>{
+        console.log(res)
+        data.name=res.data.deviceName
+        if(res.data.deviceRunstatus==true){
+          data.status='开启'
+        }else{
+          data.status='关闭'
+        }
+      })
+    })
+    return{
+      data
+    }
+  }
+}
 
 
 

psdc-ui/src/views/emonitor/wdcgq/index.vue

@@ -52,7 +52,7 @@ export default {
     })
     onMounted(() => {//需要获取到element,所以是onMounted的Hook
       //温度传感器1-8  id 5-12
-      getWdcgq().then((res)=>{
+      getWdcgq(16).then((res)=>{
         console.log(res)
         let arr = []
         let brr = []

psdc-ui/src/views/emonitor/xrgl/index.vue

@@ -284,6 +284,7 @@ export default {
               itemStyle:{
                 color:'#2F8EE0'
               },
+              symbol: "none", //去掉拐角点
             },
           ],
         });

psdc-ui/src/views/system/cl/index.vue

@@ -4,9 +4,9 @@
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="88px">
           <el-form-item label="策略名称:" prop="name">
-            <el-select v-model="queryParams.week" placeholder="请选择" style="width: 240px">
-              <el-option label="策略一" value="null" />
-              <el-option label="策略二" value="one" />
+            <el-select v-model="data.sceneCode" placeholder="请选择" style="width: 240px" @change="changeSl">
+              <el-option label='所有' :value='0'  />
+              <el-option :label='item.label' :value='item.sceneCode'  :key="item.sceneCode" v-for="item in queryParams"/>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -21,18 +21,17 @@
           </el-col>
         </el-row>
         <div class="dev_control_table">
-          <el-table :data="timingList" height="500px">
-            <el-table-column label="序号" align="center" width="50"/>
-            <el-table-column label="策略名称" align="center" prop="name" width="200"/>
-            <el-table-column label="电磁锅炉进水温度" align="center" prop="DcTemIn"/>
-            <el-table-column label="电磁锅炉出水温度" align="center" prop="DcTemOut"/>
-            <el-table-column label="空气源热泵进水温度" align="center" prop="KqTemIn"/>
-            <el-table-column label="空气源热泵出水温度" align="center" prop="KqTemOut"/>
-            <el-table-column label="发热电缆温度" align="center" prop="DlTem"/>
+          <el-table :data="data.timingList" height="500px">
+            <el-table-column label="序号" align="center" prop="sceneId" width="50"/>
+            <el-table-column label="策略名称" align="center" prop="sceneName" width="200"/>
+            <el-table-column label="设备名称" align="center" prop="deviceName"/>
+            <el-table-column label="监测位置" align="center" prop="sceneContext"/>
+            <el-table-column label="温度" align="center" prop="sceneValue"/>
             <el-table-column label="操作" align="center" prop="handle">
               <template v-slot="scope">
-                <el-button type="primary" size="small" icon="Edit" v-hasPermi="['system:cl:edit']">修改</el-button>
-                <el-button type="danger" size="small" :icon="Delete">删除</el-button>
+                <el-button type="primary" size="small" icon="Edit" v-hasPermi="['system:cl:edit']" @click="handleXg(scope.row.sceneId,scope.row.sceneName,
+                scope.row.deviceId,scope.row.sceneValue,scope.row.sceneContext)">修改</el-button>
+                <el-button type="danger" size="small" :icon="Delete" @click="handleDel(scope.row.sceneId)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -44,7 +43,7 @@
               :disabled="disabled"
               :background="background"
               layout="total, sizes, prev, pager, next, jumper"
-              :total="timingList.length"
+              :total="data.total"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
         </div>
@@ -58,33 +57,39 @@
       <el-form :model="timingForm"  ref="userRef" label-width="88px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="策略名称:" prop="name">
-              <el-input v-model="timingForm.name" placeholder="请输入策略名称" maxlength="11" />
+            <el-form-item label="新建策略:" prop="sceneName" >
+              <el-input v-model="timingForm.sceneName" placeholder="请输入策略名称"  />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电磁锅炉:" prop="DcTem" >
-              <el-input v-model="timingForm.DcTemIn" placeholder="进水温度" />
+            <el-form-item label="策略列表:"  >
+              <el-select v-model="timingForm.sceneCode" placeholder="策略列表">
+                <el-option v-for="item in data.queryParams" :key="item.sceneCode" :label="item.label" :value="item.sceneCode">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="电磁锅炉:" prop="DcTem" >
-              <el-input v-model="timingForm.DcTemOut" placeholder="出水温度" />
+            <el-form-item label="设备列表:"  >
+              <el-select v-model="timingForm.deviceId" placeholder="设备列表">
+                <el-option v-for="item in data.sblb" :key="item.deviceId" :label="item.deviceName" :value="item.deviceId">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="空气源热泵:" prop="KqTem" >
-              <el-input v-model="timingForm.KqTemIn" placeholder="进水温度" />
+            <el-form-item label="进水温度:" prop="intemp" >
+              <el-input v-model="timingForm.intemp" placeholder="进水温度" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="空气源热泵:" prop="DcTem" >
-              <el-input v-model="timingForm.KqTemOut" placeholder="出水温度" />
+            <el-form-item label="出水温度:" prop="outtemp" >
+              <el-input v-model="timingForm.outtemp" placeholder="出水温度" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="发热电缆:" prop="DlTem">
-              <el-input v-model="timingForm.DlTem" placeholder="温度" maxlength="11" />
+            <el-form-item label="温度:" prop="temp">
+              <el-input v-model="timingForm.temp" placeholder="温度" maxlength="11" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -96,74 +101,187 @@
         </div>
       </template>
     </el-dialog>
-
+    <!-- 修改对话框 -->
+    <el-dialog :title="title1" v-model="open1" width="600px" append-to-body>
+      <el-form :model="timingForm1"  ref="userRef" label-width="88px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="策略名称:" prop="sceneName">
+              <el-input v-model="timingForm1.sceneName" placeholder="请输入策略名称" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="设备列表:"  >
+              <el-select v-model="timingForm1.deviceId" placeholder="设备列表">
+                <el-option v-for="item in data.sblb" :key="item.deviceId" :label="item.deviceName" :value="item.deviceId">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="进水温度:" prop="intemp" >-->
+<!--              <el-input v-model="timingForm1.intemp" placeholder="进水温度" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="出水温度:" prop="outtemp" >-->
+<!--              <el-input v-model="timingForm1.outtemp" placeholder="出水温度" />-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+          <el-col :span="13">
+            <el-form-item label="温度值:" prop="temp">
+              <el-input v-model="timingForm1.temp" placeholder="温度" maxlength="11" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm1">确 定</el-button>
+          <el-button @click="cancel1">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Index">
+import {ElMessage,ElMessageBox} from 'element-plus'
 import {Delete} from '@element-plus/icons-vue'
-import {ref,reactive,watch} from "vue";
+import {ref,reactive,watch,onMounted} from "vue";
+import {getXl,getTb,postNew,getSb,postXg,postDel} from '../../../api/emonitor/api'
+onMounted(()=>{
+  getSb().then((res)=>{
+    var arr = []
+    for(var i in res.data){
+      arr=arr.concat(res.data[i].children)
+    }
+    console.log('sblb',arr)
+    data.sblb=arr
+  })
+  getXl().then((res)=>{
+    console.log(res)
+    data.queryParams=res.data
+  })
+  getTb({
+    "sceneCode": data.sceneCode,
 
+    "pageNum": currentPage.value,
 
+    "pageSize": pageSize.value
+  }).then((res)=>{
+    console.log(res)
+    data.timingList=res.rows
+    data.total=res.total
+  })
+  // postNew().then((res)=>{
+  //   console.log(res)
+  // })
+})
 /** 筛选处理 */
-const dateRange = ref([]);
 const data = reactive({
-  queryParams: {
-    name: '',
-  }
+  sblb:[],
+  total:'',
+  timingList:[],
+  queryParams: '',
+  sceneCode:0,
+  dateRange:[],
 });
+//改变
+function changeSl(){
+  console.log(data.sceneCode)
+}
 //搜索按钮
 function handleQuery(){
+  getTb({
+    "sceneCode": data.sceneCode,
+
+    "pageNum": currentPage.value,
+
+    "pageSize": pageSize.value
+  }).then((res)=>{
+    console.log(res)
+    data.timingList=res.rows
+    data.total=res.total
+  })
 }
 //重置按钮
 function resetQuery(){
-  dateRange.value = []
+  data.sceneCode=0
+  currentPage.value=1
+  pageSize.value=10
+  getTb({
+    "sceneCode": data.sceneCode,
+
+    "pageNum": currentPage.value,
+
+    "pageSize": pageSize.value
+  }).then((res)=>{
+    console.log(res)
+    data.timingList=res.rows
+    data.total=res.total
+  })
 }
 
 
 /** 数据表格处理 */
-const timingList = reactive([
-  {
-    name:'策略一',
-    DlTem:'22',
-    DcTemIn:'44',
-    DcTemOut:'55',
-    KqTemIn:'66',
-    KqTemOut:'77'
-  },
-  {
-    name:'策略二',
-    DlTem:'33',
-    DcTemIn:'55',
-    DcTemOut:'66',
-    KqTemIn:'77',
-    KqTemOut:'88'
-  }
-])
+
 const currentPage = ref(1)
-const pageSize = ref(5)
+const pageSize = ref(10)
 const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
 const handleSizeChange = (val) => {
   console.log(`${val}`)
+  getTb({
+    "sceneCode": data.sceneCode,
+
+    "pageNum": currentPage.value,
+
+    "pageSize": pageSize.value
+  }).then((res)=>{
+    console.log(res)
+    data.timingList=res.rows
+    data.total=res.total
+  })
 }
 const handleCurrentChange = (val) => {
   console.log(`${val}`)
+  getTb({
+    "sceneCode": data.sceneCode,
+
+    "pageNum": currentPage.value,
+
+    "pageSize": pageSize.value
+  }).then((res)=>{
+    console.log(res)
+    data.timingList=res.rows
+    data.total=res.total
+  })
 }
 
 
-/** 新增定时处理 */
+/** 新增策略处理 */
 const open = ref(false);
 const title = ref();
+const open1 = ref(false);
+const title1= ref();
 const activeName = ref('1')
 const timingForm = reactive({
-  name:'',
-  DlTem:'',
-  DcTemIn:'',
-  DcTemOut:'',
-  KqTemIn:'',
-  KqTemOut:''
+  sceneName:'',
+  sceneCode:'',
+  deviceId:'',
+  temp:'',
+  intemp:'',
+  outtemp:''
+})
+const timingForm1 = reactive({
+  sceneName:'',
+  sceneCode:'',
+  deviceId:'',
+  temp:'',
+  intemp:'',
+  outtemp:''
 })
 
 // const watchTime = watch(()=> timingForm.executeTime, (val) => {
@@ -183,11 +301,87 @@ function handleAdd() {
 };
 function submitForm() {
   open.value = false;
+  console.log(timingForm)
+  postNew(timingForm).then((res)=>{
+    console.log(res)
+    ElMessage({type:"success",message:'新增成功！'})
+    handleQuery()
+    getXl().then((res)=>{
+      console.log(res)
+      data.queryParams=res.data
+    })
+    timingForm.sceneCode='',
+        timingForm.sceneName='',
+        timingForm.deviceId='',
+        timingForm.temp='',
+        timingForm.intemp='',
+        timingForm.outtemp=''
+  })
+
 };
 function cancel() {
   open.value = false;
+  timingForm.sceneCode='',
+      timingForm.sceneName='',
+      timingForm.deviceId='',
+      timingForm.temp='',
+      timingForm.intemp='',
+      timingForm.outtemp=''
 };
-
+function handleXg(sceneId,sceneName,deviceId,sceneValue,sceneContext) {
+  open1.value = true;
+  title1.value = "修改策略";
+  console.log(sceneId)
+  timingForm1.sceneId=sceneId
+  timingForm1.sceneName=sceneName
+  timingForm1.deviceId=deviceId
+  timingForm1.temp=sceneValue
+  // if(sceneContext=='出水温度'){
+  //   timingForm1.outtemp=sceneValue
+  // }else if (sceneContext=='进水温度'){
+  //   timingForm1.intemp=sceneValue
+  // }else{
+  //   timingForm1.temp=sceneValue
+  // }
+};
+function submitForm1() {
+  open1.value = false;
+  console.log(timingForm1)
+  postXg({
+    'sceneId':timingForm1.sceneId,
+    'sceneValue':timingForm1.temp
+  }).then((res)=>{
+    console.log(res)
+    ElMessage({type:"success",message:'修改成功！'})
+    handleQuery()
+  })
+};
+function cancel1() {
+  open1.value = false;
+  timingForm1.sceneId=''
+  timingForm1.sceneName=''
+  timingForm1.deviceId=''
+  timingForm1.outtemp=''
+  timingForm1.intemp=''
+  timingForm1.temp=''
+};
+function handleDel(sceneId) {
+  ElMessageBox.confirm("是否确认删除此电站？", "提示",{
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning"
+  }).then(() => {
+    console.log(sceneId)
+    postDel({
+      "sceneId":sceneId,
+      "sceneCode":null
+    }).then((res) => {
+      console.log(res)
+      ElMessage({type:"success",message:'删除成功！'})
+      handleQuery()
+    });
+  })
+}