页面调整

src/pages/components/myPies.vue

@@ -20,9 +20,9 @@ export default {
       let myPie = document.getElementById('myPies')
       this.myPies = this.$echarts.init(myPie)
       const data = [
-        { name: '冷', value: 150 },
-        { name: '适中', value: 80 },
-        { name: '热', value: 80 }
+        { name: '冷', value: 500 },
+        { name: '适中', value: 900 },
+        { name: '热', value: 600 }
       ]
       const option = {
         tooltip: {

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

@@ -26,24 +26,21 @@
       p.leftP 安装日期：   {{ dataForm.installDate }}
   .info-form
     el-row.text-size(v-if="openOrClose.indexOf(dataForm.type)>-1")
+      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) 故障
       el-col(:span='10')
         .switch-warp
           div(:class="[state == 1 ? 'on' : '']", @click="handleSwitch(1)") 打开
           div(:class="[state == 2 ? 'on' : '']", @click="handleSwitch(2)") 关闭
-      el-col(:span='10') 当前已
-        span(v-if="dataForm.status == 1") 打开
-        span(v-else-if="dataForm.status == 2") 关闭
-        span(v-else) 故障
     el-row.text-size(style="margin-top: 10px" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'||dataForm.type=='f4c840711eae4bcb9536a890cdfda493'")
-      el-col(:span="15" )
+      el-col(:span="16" )
         span 频率设置：
-        el-input(size="mini", style="width: 70px", v-model="speed")
-        span  转
-        el-button(type="primary", size="mini", style="margin-left: 5px") 设定
-      el-col(:span="9" v-if='params.length' )
-        span 当前频率：
-        span(style="color: blue") {{ params[0].current_frequency }}
+        el-input(size="mini", style="width: 80px", v-model="speed")
         span  转/分
+        el-button(type="primary", size="mini", style="margin-left: 3px") 设定
     //- 卷帘门
     el-row
       el-col(v-if="dataForm.type=='c788ce98c1f248f590434394da485ce4'")
@@ -57,7 +54,7 @@
       span.type 电量(kwh)：
       span.value {{ params[0].electric_energy }}
     div(v-if="this.params.length && this.params[0].current_frequency")
-      span.type 当前频率：
+      span.type 当前频率(转/分)：
       span.value {{ params[0].current_frequency }}
     div(v-if="this.params.length && this.params[0].feng_shui_mode")
       span.type 风水模式：

src/pages/sys/commandlog/index.vue

@@ -47,6 +47,7 @@ export default {
         { label: '操作员', prop: 'createUserName' }, //是否插槽
         { label: '来源', prop: 'comSource', slot: true },
         { label: '指令类型', prop: 'comType', slot: true },
+        { label: '被控设备', prop: 'resourceName' },
         { label: '操作时间', prop: 'createTime' },
         { label: '指令内容', prop: 'comMark' }
         // {label:'操作',prop:''},