11

psdc-ui/src/views/analyse/nhtj/index.vue

@@ -211,7 +211,7 @@ function getTableFun(){
   }).then((res)=>{
     total.value = res.total;
     dataTable.value = res.rows
-    console.log(dataTable.value)
+    console.log('发电量数据',dataTable.value)
   })
 }
 const handleSizeChange = (val) => {
@@ -230,12 +230,26 @@ const open = ref(false)
 const chartDataArr = ref([])
 const showDevName = ref()
 function handleChart(scope){
+  console.log(scope.row)
   open.value = true;
   showDevName.value = scope.row.deviceName
-  delete scope.row.dayDate
-  delete scope.row.dayId
-  delete scope.row.deviceId
-  delete scope.row.deviceName
+  if(scope.row.dayDate){
+    delete scope.row.dayDate
+    delete scope.row.dayId
+    delete scope.row.deviceId
+    delete scope.row.deviceName
+  }else if(scope.row.monthDate){
+    delete scope.row.monthDate
+    delete scope.row.monthId
+    delete scope.row.deviceId
+    delete scope.row.deviceName
+  }else if (scope.row.yearDate){
+    delete scope.row.yearDate
+    delete scope.row.yearId
+    delete scope.row.deviceId
+    delete scope.row.deviceName
+  }
+
   for(let i in scope.row){
     chartDataArr.value.push(scope.row[i])
   }

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

@@ -70,9 +70,12 @@
           <el-checkbox-group v-model="data.checkedSblb" @change="handleCheckedCitiesChange">
             <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" label-width="120" style="margin-bottom: 10px">
                {{item.deviceName}}
-              <el-input v-model="item.intemp" placeholder="进水温度" style="width: 120px ;margin: 10px"/>
-              <el-input v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
-              <el-input v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number"
+                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.intemp"  placeholder="进水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number"
+                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number"
+                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
             </el-checkbox>
           </el-checkbox-group>
 <!--          <el-col :span="12">-->
@@ -133,9 +136,12 @@
           <div style="margin: 15px 0;"></div>
           <el-checkbox-group v-model="data.checkedSblb1" @change="handleCheckedCitiesChange1">
             <el-checkbox v-for="item in data.sblb" :label="item.deviceId" :key="item.deviceId" style="margin-bottom: 10px">{{item.deviceName}}
-              <el-input v-model="item.intemp" placeholder="进水温度" style="width: 120px ;margin: 10px"/>
-              <el-input v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
-              <el-input v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number"
+                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.intemp" placeholder="进水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number"
+                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.outtemp" placeholder="出水温度" style="width: 120px ;margin: 10px"/>
+              <el-input type="number"
+                        onKeypress="return(/^[0-9]*$/.test(String.fromCharCode(event.keyCode)))" v-model="item.temp" placeholder="温度" style="width: 120px ;margin: 10px"/>
             </el-checkbox>
           </el-checkbox-group>
 <!--          <el-col :span="24">-->
@@ -180,9 +186,16 @@ import {ref,reactive,watch,onMounted} from "vue";
 import {getXl,getTb,postNew,getSb,postXg,postDel} from '../../../api/emonitor/api'
 onMounted(()=>{
   getSb().then((res)=>{
+    var crr = []
+    for(let x in res.data){
+  if(res.data[x].isControl==2) {
+      crr.push(res.data[x])
+  }
+    }
+    console.log(crr)
     var arr = []
-    for(var i in res.data){
-      arr=arr.concat(res.data[i].children)
+    for(var i in crr){
+      arr=arr.concat(crr[i].children)
     }
     console.log('sblb',arr)
     data.sblb=arr