.

src/pages/components/tableList.vue

@@ -21,6 +21,7 @@
         <el-table-column
           :key="item.id"
           v-if="item.slot"
+          :show-overflow-tooltip="item.showOverflowTooltip ? item.showOverflowTooltip : false"
           :prop="item.prop"
           :label="item.label"
           :width="item.width"
@@ -35,6 +36,7 @@
         <el-table-column
           :key="item.id"
           v-else
+          :show-overflow-tooltip="item.showOverflowTooltip ? item.showOverflowTooltip : false"
           :prop="item.prop"
           :label="item.label"
           :width="item.width"

src/pages/eq/view/query-detail.vue

@@ -25,20 +25,20 @@
       p.leftP 设备型号：   {{ dataForm.equipmentModel }}
     .quDetailM
       p.leftP 安装日期：   {{ dataForm.installDate }}
-  .info-form(v-if='$store.state.d2admin.paramsList.list.syBean.type == 1' :style="{'border-bottom':(['b45827c068254695864ee3c1d42573cb','b6af764f2a6e454490a6b1b3c9057e57','173466a2cf9a42a6a17b2bdfbeae36d5'].includes(dataForm.type))&&$store.state.d2admin.paramsList.list.syBean.type == 1 ? '1px solid #c0c0c0': ''}" )
+  .info-form(v-if='$store.state.d2admin.paramsList.list.syBean.type == 1' :style="{'border-bottom':(['b45827c068254695864ee3c1d42573cb','b6af764f2a6e454490a6b1b3c9057e57','173466a2cf9a42a6a17b2bdfbeae36d5','f4c840711eae4bcb9536a890cdfda493'].includes(dataForm.type))&&$store.state.d2admin.paramsList.list.syBean.type == 1 ? '1px solid #c0c0c0': ''}" )
     //- | {{dataForm.status}}
     //- el-row.text-size(v-if="openOrClose.indexOf(dataForm.type)>-1")
-    el-row.text-size(v-if="['b45827c068254695864ee3c1d42573cb','b6af764f2a6e454490a6b1b3c9057e57','173466a2cf9a42a6a17b2bdfbeae36d5'].includes(dataForm.type)")
+    el-row.text-size
       el-col(:span='10') 当前已
         span(v-if="dataForm.status == 1") 运行
         span(v-else-if="dataForm.status == 2") 停止
         span(v-else-if="dataForm.status == 3") 离线
-        span(v-else) 故障
+        span(v-else-if="dataForm.status == 4") 故障
       el-col(:span='10' v-if="dataForm.status == 1 || dataForm.status ==2")
         .switch-warp
           div(:class="[dataForm.status == 1 ? 'on' : '']", @click="handleSwitch(1)" :style="{'pointer-events':( dataForm.status ==1) ? 'none':''}") 打开
           div(:class="[dataForm.status == 2 ? 'on' : '']", @click="handleSwitch(0)"  :style="{'pointer-events':( dataForm.status ==2) ? 'none':''}") 关闭
-      el-col(:span='10' v-else)
+      el-col(:span='10' v-else-if="dataForm.status ==4")
         el-button(type='primary' size='mini' @click="failureReset") 故障复位
     el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='173466a2cf9a42a6a17b2bdfbeae36d5'&&dataForm.status==1")
       el-col(:span="16" )
@@ -79,6 +79,10 @@
         el-input-number(v-model="hotWindStart" @blur='changeTemperature(3)' size="mini" :controls='false' :min='0' :max='100' :precision='0' style="width: 65px")
         span(style="margin:0 10px") -
         el-input-number(v-model="hotWindEnd" @blur='changeTemperature(4)' size="mini" :controls='false' :min='0' :max='100' :precision='0' style="width: 65px")
+    //- 水泵
+    el-row.text-size(v-if="dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
+      span 设置频率：
+      el-input-number(v-model="frequency" @blur='changeFrequency()' :controls='false' :min="35" :max="45" size="mini" autocomplete="off")
     //- el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
     //-   el-col(:span="16" )
     //-     span 频率设置：
@@ -232,6 +236,7 @@ watch: {
       heatingEnd: null,
       hotWindStart: null,
       hotWindEnd: null,
+      frequency: null,
     }
   },
 
@@ -281,6 +286,7 @@ watch: {
           break
         case 'f4c840711eae4bcb9536a890cdfda493': //水泵
           this.params = this.sbList.filter((e) => e.resource_id == data.id)
+          this.frequency = this.params[0].current_frequency
           break
         case '303310efddb34a2e9bf269bdff8a7dc5': //室内机风柜
           this.params = this.sljfgList.filter((e) => e.resource_id == data.id)
@@ -305,6 +311,25 @@ watch: {
         })
       })
     },
+    // 设置频率
+    changeFrequency(){
+      this.$http({
+        url: this.$http.adornUrl('/equipment/onOrOff'),
+        method: 'post',
+        data: {
+          id: this.dataForm.id,
+          params: this.frequency,
+          actionName: this.dataForm.name + "设定频率为:" + this.frequency,
+          actionType: 5
+        }
+      }).then((data) => {
+        if (data && data.code === 0) {
+          this.$message.success(data.msg)
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
     // 故障复位
     failureReset(){
       this.$http({

src/pages/sys/commandlog/index.vue

@@ -53,7 +53,7 @@ export default {
         { label: '指令类型', prop: 'comType', slot: true },
         { label: '被控设备', prop: 'resourceName' },
         { label: '操作时间', prop: 'createTime' },
-        { label: '指令内容', prop: 'comMark' }
+        { label: '指令内容', prop: 'comMark', showOverflowTooltip: true }
       ],
       tableOption: {
         border: false, //是否边框

src/pages/sys/commandlog/query-detail.vue

@@ -50,7 +50,7 @@
               <el-input  size="medium" :title='dataForm.attachedInfo' v-model='dataForm.attachedInfo' readonly></el-input>
             </el-form-item>
             <el-form-item label='指令内容:' prop='comMark'>
-              <el-input type="textarea" resize="none" readonly v-model="dataForm.comMark"></el-input>
+              <el-input type="textarea" resize="none" readonly v-model="dataForm.comMark" autosize></el-input>
             </el-form-item>
           </el-form>
         </div>
@@ -97,6 +97,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/.el-dialog{
+  min-width: 1100px;
+}
 .m_i_dialog_lift {
   width: 364px;
   height: 300px;