优化

src/system/IOT/controlPanel/model/FW01/index.vue

@@ -51,12 +51,12 @@
         <img class="image" :src="imgUrl" mode="aspectFit" />
         <div class="data-block-box">
           <dataBlock
-            v-if="detail.params.U002"
-            :title="detail.params.U002.paramname"
+            v-if="detail.params.E015"
+            :title="detail.params.E015.paramname"
             :data="[
               {
-                value: detail.params.U002.lastvalue,
-                unit: detail.params.U002.unit,
+                value: detail.params.E015.lastvalue,
+                unit: detail.params.E015.unit,
               },
             ]"
           ></dataBlock>
@@ -75,7 +75,7 @@
       <div class="chart">
         <MyChart
           ref="chart"
-          :options="[{ label: '阀门开度', value: ['U002'], sumShow: true }]"
+          :options="[{ label: '阀门开度', value: ['E015'], sumShow: true }]"
         ></MyChart>
       </div>
       <div class="message-header">
@@ -354,6 +354,7 @@ onUnmounted(() => {
 .control .control-content .map {
   width: 100%;
   height: 100%;
+  max-height: 68%;
   display: flex;
   justify-content: center;
   align-items: center;

src/system/IOT/equipmentMag/index.vue

@@ -1,31 +1,30 @@
 <template>
-  <listTemp ref="list" :param="param" tableName="equipmentTable" keyRouteName="devicename" :searchType="searchType" :detailPage="{name:'equipmentDetail',idname:'w_deviceid'}">
+  <listTemp ref="list" :param="param" tableName="equipmentTable" keyRouteName="devicename" :searchType="searchType"
+    :detailPage="{ name: 'equipmentDetail', idname: 'w_deviceid' }">
     <template #operation>
       <Add @onSuccess="$refs.list.tableData()" :disabled="!utils.hasPermission('insert')"></Add>
     </template>
-    <template #tb_cell="{data}">
+    <template #tb_cell="{ data }">
       <template v-if="data.column.dataIndex === 'operation'">
       </template>
       <template v-if="data.column.dataIndex === 'isused'">
-        <span :style="{color:utils.statusAndColor(data.record.isused ? '启用' : '停用')}">{{ data.record.isused ? '启用' : '停用' }}</span>
+        <span :style="{ color: utils.statusAndColor(data.record.isused ? '启用' : '停用') }">{{ data.record.isused ? '启用' :
+          '停用' }}</span>
+      </template>
+      <template v-if="data.column.dataIndex === 'status'">
+        <span :style="{ color: utils.statusAndColor(data.record.status == '离线' ? '停用' : '启用') }">{{ data.record.status}}</span>
       </template>
       <template v-else-if="data.column.dataIndex === 'sitename'">
         <div v-if="(authStore.nowAccount.siteid != data.record.siteid) && data.record.ispush == 0">
           <a-tag>{{ data.record.sitename }}</a-tag>
         </div>
         <div v-else>
-          <a-tag v-if="data.record.ispush == 1" :closable="true" @close.prevent="delSite(data.record)">{{ data.record.sitename }}</a-tag>
-          <SelectModel 
-            ref="site" 
-            @selectRowData="selectSite" 
-            rowKey="siteid" 
-            :param="siteParam" 
-            :filterMultiple="true" 
-            :columns="utils.TBLayout('siteTable')" title="选择推送站点"
-            v-else
-          >
+          <a-tag v-if="data.record.ispush == 1" :closable="true" @close.prevent="delSite(data.record)">{{
+            data.record.sitename }}</a-tag>
+          <SelectModel ref="site" @selectRowData="selectSite" rowKey="siteid" :param="siteParam" :filterMultiple="true"
+            :columns="utils.TBLayout('siteTable')" title="选择推送站点" v-else>
             <template v-slot:slot1>
-              <a-button @click="$refs.site.modeVisible=true;selectRow=data.record" type="link">推送站点</a-button>
+              <a-button @click="$refs.site.modeVisible = true; selectRow = data.record" type="link">推送站点</a-button>
             </template>
           </SelectModel>
         </div>
@@ -40,11 +39,11 @@ import SelectModel from '@/components/selectModel/index.vue'
 import normalTable from '@/template/normalTable/index.vue'
 import customBtn from '@/components/customHandleBtn/index.vue'
 import Add from './modules/Add.vue'
-import {ref, defineProps, defineEmits, onMounted} from 'vue'
+import { ref, defineProps, defineEmits, onMounted, onBeforeUnmount } from 'vue'
 import { useBaseStore } from '@/stores/modules/base'
 import { useAuthStore } from '@/stores/modules/auth'
 
-import {Modal} from 'ant-design-vue'
+import { Modal } from 'ant-design-vue'
 import Api from '@/api/api'
 import utils from '@/utils/utils'
 import { useRouter } from 'vue-router'
@@ -56,34 +55,36 @@ let emit = defineEmits([])
 let props = defineProps({})
 let list = ref()
 let searchType = ref([
-  {label:'搜索',key:'condition',type:'input'},
-  {label:'状态:',key:'isused',type:'select',dataSource:[
-    {remarks:'全部',value:''},
-    {remarks:'启用',value:1},
-    {remarks:'禁用',value:0}
-  ]},
+  { label: '搜索', key: 'condition', type: 'input' },
+  {
+    label: '状态:', key: 'isused', type: 'select', dataSource: [
+      { remarks: '全部', value: '' },
+      { remarks: '启用', value: 1 },
+      { remarks: '禁用', value: 0 }
+    ]
+  },
 ])
 let selectRow = ref({})
 let param = ref({
   "id": 20230704111702,
   "content": {
-      "pageNumber": 1,
-      "pageSize": 25,
-      "where": {
-          "condition": "",
-          "status": ""
-      }
+    "pageNumber": 1,
+    "pageSize": 25,
+    "where": {
+      "condition": "",
+      "status": ""
+    }
   },
 })
 
 let siteParam = ref({
   "id": 20230705161502,
   "content": {
-      "pageNumber": 1,
-      "pageSize": 20,
-      "where": {
-          "condition": ""
-      }
+    "pageNumber": 1,
+    "pageSize": 20,
+    "where": {
+      "condition": ""
+    }
   },
 })
 
@@ -92,39 +93,45 @@ let selectSite = async (site) => {
     "id": 20230705161302,
     "content": {
       "siteid": site[site.length - 1].siteid,
-      "w_deviceid":selectRow.value.w_deviceid,
+      "w_deviceid": selectRow.value.w_deviceid,
       "ispush": 1//0取消，1推送
     },
   })
-  utils.message(res,'操作成功', async () => {
+  utils.message(res, '操作成功', async () => {
     list.value.tableData()
   })
 }
 
 let delSite = async (data) => {
   Modal.confirm({
-    title:'确定取消推送站点吗?',
-    async onOk () {
+    title: '确定取消推送站点吗?',
+    async onOk() {
       let res = await Api.requested({
         "id": 20230705161302,
         "content": {
-            "siteid": data.siteid,
-            "w_deviceid": data.w_deviceid,
-            "ispush": 0//0取消，1推送
+          "siteid": data.siteid,
+          "w_deviceid": data.w_deviceid,
+          "ispush": 0//0取消，1推送
         },
       })
-      utils.message(res,'操作成功', async () => {
-      list.value.tableData()
+      utils.message(res, '操作成功', async () => {
+        list.value.tableData()
       })
     }
-   })
+  })
 }
 
+//定时器
+let timer = null
+
 onMounted(async () => {
- 
+  timer = setInterval(list.value.tableData, 180000)
 })
-</script>
 
-<style scoped>
+// 当页面关闭的时候
+onBeforeUnmount(() => {
+  clearInterval(timer)
+})
+</script>
 
-</style>
+<style scoped></style>