Merge remote-tracking branch 'origin/master'

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

@@ -31,7 +31,7 @@
         </el-row>
         <div class="dev_control_table">
           <el-table :data="dataTable" height="690px">
-            <el-table-column label="序号" align="center" width="50" fixed/>
+            <el-table-column label="序号" type="index" :index="indexMethod1" width="60" fixed/>
             <el-table-column label="耗能设备" align="center" prop="deviceName" width="150" fixed/>
 <!--            <el-table-column label="日期" align="center" prop="dayDate" width="150" fixed/>-->
             <el-table-column v-for="item in theadList" :key="item.prop" :prop="item.prop" :label="item.label" :fixed="item.fixed" :width="item.width" align="center"/>
@@ -195,7 +195,10 @@ const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
 const total = ref()
-
+//翻页时不刷新序号
+function indexMethod1(index){
+  return index+(currentPage.value-1)*pageSize.value+1
+}
 //获取表格数据
 function getTableFun(){
   getTable({

psdc-ui/src/views/control/manual/index.vue

@@ -7,7 +7,10 @@
       <div class="dev_control_item" v-for="item in deviceArr" :key="item.deviceId">
         <div class="item_header">
           <span>{{ item.deviceName}}</span>
-          <el-switch v-model="item.deviceRunstatus" @change="handleDevChangeFun(item.deviceId,item.deviceRunstatus)" class="switch" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #dddddd"/>
+          <el-switch :disabled="item.isControl == 2 ? flase : true"
+                     v-model="item.deviceRunstatus"
+                     @change="handleDevChangeFun(item.deviceId,item.deviceRunstatus)"
+                     class="switch" style="--el-switch-on-color: #13ce66; --el-switch-off-color: #dddddd"/>
         </div>
         <div class="item_bottom">
           <div class="item_bottom_img">
@@ -15,16 +18,16 @@
           </div>
           <div class="item_bottom_form">
             <el-form :model="form1">
-              <el-form-item label="当前状态：">
+              <el-form-item label="当前状态" label-width="96px">
                 <span :class="{'green':item.deviceRunstatus === true,'red':item.deviceRunstatus === false}">
-                  {{ item.deviceRunstatus === true ? '开启' : '关闭'}}
+                  {{ item.deviceRunstatus === true ? '正在运行' : '停止运行'}}
                 </span>
               </el-form-item>
 
-              <el-form-item label="进水温度："><el-input v-model="form1.intemp"  /></el-form-item>
-              <el-form-item label="出水温度："><el-input v-model="form1.outtemp" /></el-form-item>
+              <el-form-item v-for="inputs in item.control_elements" :label="inputs.controlRemark"><el-input v-model="form1.temp"/></el-form-item>
+<!--              <el-form-item label="出水温度："><el-input v-model="form1.outtemp" /></el-form-item>-->
 <!--              <el-form-item label="温度："   ><el-input v-model="form1.temp"    /></el-form-item>-->
-              <div class="submit" @click="getSetTemperatureFun(item)">确定</div>
+              <div class="submit" v-show="item.control_elements.length > 0 ? true : false"  @click="getSetTemperatureFun(item)">确定</div>
 
             </el-form>
           </div>
@@ -37,7 +40,7 @@
       <div class="control_header"><span>调控日志</span></div>
       <div class="control_table">
         <el-table :data="controlLogList" height="305px">
-          <el-table-column label="序号" align="center" width="50"/>
+          <el-table-column label="序号" type="index" :index="indexMethod1" width="60"></el-table-column>
           <el-table-column label="设备名称" align="center" prop="deviceName"/>
           <el-table-column label="操作内容" align="center" prop="controlValue" width="700"/>
           <el-table-column label="操作时间" align="center" prop="createTime"/>
@@ -97,21 +100,11 @@ onMounted(()=>{
 
 /** 获取所有设备*/
 const deviceArr = ref([])
-// const isShow1 = ref(true)
-// const isShow2 = ref(true)
 function getDeviceFun(){
   getDevice().then((res)=>{
-    console.log(res.data)
     deviceArr.value = res.data
-    for(let i = 0;i < res.data.length;i++){
-      // if(res.data[i].deviceModel == '发热电缆'){
-      //   isShow1.value = false
-      //   isShow2.value = true
-      // }
-    }
   })
 }
-
 /** 设备控制处理*/
 const form1 = reactive({
   intemp:'',
@@ -160,6 +153,10 @@ function getControlLogListFun(){
   })
 }
 
+//翻页时不刷新序号
+function indexMethod1(index){
+  return index+(currentPage.value-1)*pageSize.value+1
+}
 
 /** 策略导入处理*/
 const drawerIshow = ref(false)
@@ -168,26 +165,25 @@ const celueList = ref([])
 function getStrategyListFun(){
   getStrategyList().then((res)=>{
     celueList.value = res.data
-    console.log(res.data)
   })
 }
 function confirmClick() {
   ElMessageBox.confirm(`确定执行 ${radio.value} ?`).then(() => {
     drawerIshow.value = false;
-    console.log('确定')
   })
 }
 
 /** 控制设备启停*/
+const loading = ref(false)
 function handleDevChangeFun(id,sta){
-  console.log(id,sta)
+  // console.log(id,sta)
   //1开启，2关闭
   sta = sta === true ? 1 : 2
   getStartAndStop({
     "deviceId": id,
     "runStatus": sta
   }).then((res)=>{
-    console.log(res.data)
+    // beforeChange()
     if(res.code == 200){
       ElMessage({
         type:'success',
@@ -197,10 +193,20 @@ function handleDevChangeFun(id,sta){
   })
   getControlLogListFun()
 }
+// function beforeChange(){
+//   loading.value = true
+//   return new Promise((resolve) => {
+//     setTimeout(() => {
+//       loading.value = false
+//       // ElMessage.success('111!')
+//       return resolve(true)
+//     }, 1000)
+//   })
+// }
 
 /** 设置温度*/
 function getSetTemperatureFun(item){
-  console.log(item)
+  // console.log(item)
   // getSetTemperature({
   //   "deviceId":100,
   //   "data":[
@@ -405,5 +411,9 @@ function getSetTemperatureFun(item){
   overflow-x: hidden;
   overflow-y: auto;
 }
+::v-deep .el-input__wrapper{
+  padding: 0 10px;
+  border-radius: 0px !important;
+}
 </style>
 

psdc-ui/src/views/control/timer/index.vue

@@ -37,7 +37,7 @@
         </el-row>
           <div class="dev_control_table">
             <el-table :data="timingList" height="685px">
-              <el-table-column label="序号" align="center" width="50"/>
+              <el-table-column label="序号" type="index" :index="indexMethod1" width="60"></el-table-column>
               <el-table-column label="设备名称" align="center" prop="deviceName"/>
               <el-table-column label="任务描述" align="center" prop="controlContext" width="500"/>
 <!--              <el-table-column label="状态" align="center">-->
@@ -247,7 +247,10 @@ const total = ref()
 const small = ref(false)
 const background = ref(false)
 const disabled = ref(false)
-
+//翻页时不刷新序号
+function indexMethod1(index){
+  return index+(currentPage.value-1)*pageSize.value+1
+}
 //获取表格信息
 function getListFun(){
   getList({