diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index f16815e..df5f681 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,11 +86,14 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
-        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
-        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+        // { text: '描述', value: 'descn', align: 'center' },
+        // { text: '记录时间', value: 'logtime', align: 'center' },
+        // { text: '信号与干扰加噪声比', value: 'pci', align: 'center', filter: true },
+        // { text: '物理小区标识', value: 'sinr', align: 'center' },
+        // { text: '参考信号接收功率', value: 'rsrp', width: 80, align: 'center', checkCell: true },
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数

diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index f16815e..df5f681 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,11 +86,14 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
-        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
-        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+        // { text: '描述', value: 'descn', align: 'center' },
+        // { text: '记录时间', value: 'logtime', align: 'center' },
+        // { text: '信号与干扰加噪声比', value: 'pci', align: 'center', filter: true },
+        // { text: '物理小区标识', value: 'sinr', align: 'center' },
+        // { text: '参考信号接收功率', value: 'rsrp', width: 80, align: 'center', checkCell: true },
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
diff --git a/src/views/zhangqiu/api/zq.js b/src/views/zhangqiu/api/zq.js
new file mode 100644
index 0000000..f1ddcd7
--- /dev/null
+++ b/src/views/zhangqiu/api/zq.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import axios from 'axios'
+
+
+
+// export function getDevice(params){
+//   return request({
+//     url: 'http://60.208.121.150:5002/whale/eye/installed-device',
+//     method: 'get',
+//     params
+//   })
+// }
+
+export function getDevice(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/installed-device`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getAlarm(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/alarm-rate`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getOperation(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/operational-status`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}

diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index f16815e..df5f681 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,11 +86,14 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
-        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
-        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+        // { text: '描述', value: 'descn', align: 'center' },
+        // { text: '记录时间', value: 'logtime', align: 'center' },
+        // { text: '信号与干扰加噪声比', value: 'pci', align: 'center', filter: true },
+        // { text: '物理小区标识', value: 'sinr', align: 'center' },
+        // { text: '参考信号接收功率', value: 'rsrp', width: 80, align: 'center', checkCell: true },
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
diff --git a/src/views/zhangqiu/api/zq.js b/src/views/zhangqiu/api/zq.js
new file mode 100644
index 0000000..f1ddcd7
--- /dev/null
+++ b/src/views/zhangqiu/api/zq.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import axios from 'axios'
+
+
+
+// export function getDevice(params){
+//   return request({
+//     url: 'http://60.208.121.150:5002/whale/eye/installed-device',
+//     method: 'get',
+//     params
+//   })
+// }
+
+export function getDevice(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/installed-device`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getAlarm(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/alarm-rate`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getOperation(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/operational-status`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
index 8149bfd..7868dc7 100644
--- a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
+++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
@@ -23,6 +23,7 @@
 import progressBar from '@/views/zhangqiu/components/progressBar.vue'
 import ProgressBar from '@/views/zhangqiu/components/progressBar.vue'
 import showItem from '@/views/zhangqiu/components/showItem.vue'
+import { getAlarm } from "@/views/zhangqiu/api/zq.js"
 export default {
   name: 'DeviceAlarmSum',
   components: {showItem, ProgressBar, progressBar },
@@ -30,7 +31,7 @@
     return {
       deviceAlarm: [
         {
-          title: '井盖测试仪',
+          title: '井盖状态监测仪',
           context: '',
         },
         {
@@ -38,7 +39,7 @@
           context: '',
         },
         {
-          title: '可燃气体监测',
+          title: '可燃气体监测仪',
           context: '',
         },
         {
@@ -49,23 +50,33 @@
     }
   },
   created() {
-    this.getWellPercent()
-    this.getGasPercent()
-    this.getGasdectorPercent()
-    this.getTubePercent()
+    // this.getWellPercent()
+    // this.getGasPercent()
+    // this.getGasdectorPercent()
+    // this.getTubePercent()
+    this.getAlarmList()
   },
   methods: {
-    getWellPercent() {
-      this.deviceAlarm[0].context = '10'
-    },
-    getGasPercent() {
-      this.deviceAlarm[1].context = '70'
-    },
-    getGasdectorPercent() {
-      this.deviceAlarm[2].context = '50'
-    },
-    getTubePercent() {
-      this.deviceAlarm[3].context = '45'
+    // getWellPercent() {
+    //   this.deviceAlarm[0].context = '10'
+    // },
+    // getGasPercent() {
+    //   this.deviceAlarm[1].context = '70'
+    // },
+    // getGasdectorPercent() {
+    //   this.deviceAlarm[2].context = '50'
+    // },
+    // getTubePercent() {
+    //   this.deviceAlarm[3].context = '45'
+    // }
+    getAlarmList() {
+      getAlarm().then(response => {
+        console.log(response)
+        this.deviceAlarm[0].context = parseFloat(response.data[0].rate).toFixed(3).substring(0, parseFloat(response.data[0].rate).toFixed(3).length - 1)
+        this.deviceAlarm[1].context = parseFloat(response.data[1].rate).toFixed(3).substring(0, parseFloat(response.data[1].rate).toFixed(3).length - 1)
+        this.deviceAlarm[2].context = parseFloat(response.data[2].rate).toFixed(3).substring(0, parseFloat(response.data[2].rate).toFixed(3).length - 1)
+        this.deviceAlarm[3].context = parseFloat(response.data[3].rate).toFixed(3).substring(0, parseFloat(response.data[3].rate).toFixed(3).length - 1)
+      })
     }
   }
 }

diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index f16815e..df5f681 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,11 +86,14 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
-        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
-        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+        // { text: '描述', value: 'descn', align: 'center' },
+        // { text: '记录时间', value: 'logtime', align: 'center' },
+        // { text: '信号与干扰加噪声比', value: 'pci', align: 'center', filter: true },
+        // { text: '物理小区标识', value: 'sinr', align: 'center' },
+        // { text: '参考信号接收功率', value: 'rsrp', width: 80, align: 'center', checkCell: true },
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
diff --git a/src/views/zhangqiu/api/zq.js b/src/views/zhangqiu/api/zq.js
new file mode 100644
index 0000000..f1ddcd7
--- /dev/null
+++ b/src/views/zhangqiu/api/zq.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import axios from 'axios'
+
+
+
+// export function getDevice(params){
+//   return request({
+//     url: 'http://60.208.121.150:5002/whale/eye/installed-device',
+//     method: 'get',
+//     params
+//   })
+// }
+
+export function getDevice(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/installed-device`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getAlarm(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/alarm-rate`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getOperation(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/operational-status`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
index 8149bfd..7868dc7 100644
--- a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
+++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
@@ -23,6 +23,7 @@
 import progressBar from '@/views/zhangqiu/components/progressBar.vue'
 import ProgressBar from '@/views/zhangqiu/components/progressBar.vue'
 import showItem from '@/views/zhangqiu/components/showItem.vue'
+import { getAlarm } from "@/views/zhangqiu/api/zq.js"
 export default {
   name: 'DeviceAlarmSum',
   components: {showItem, ProgressBar, progressBar },
@@ -30,7 +31,7 @@
     return {
       deviceAlarm: [
         {
-          title: '井盖测试仪',
+          title: '井盖状态监测仪',
           context: '',
         },
         {
@@ -38,7 +39,7 @@
           context: '',
         },
         {
-          title: '可燃气体监测',
+          title: '可燃气体监测仪',
           context: '',
         },
         {
@@ -49,23 +50,33 @@
     }
   },
   created() {
-    this.getWellPercent()
-    this.getGasPercent()
-    this.getGasdectorPercent()
-    this.getTubePercent()
+    // this.getWellPercent()
+    // this.getGasPercent()
+    // this.getGasdectorPercent()
+    // this.getTubePercent()
+    this.getAlarmList()
   },
   methods: {
-    getWellPercent() {
-      this.deviceAlarm[0].context = '10'
-    },
-    getGasPercent() {
-      this.deviceAlarm[1].context = '70'
-    },
-    getGasdectorPercent() {
-      this.deviceAlarm[2].context = '50'
-    },
-    getTubePercent() {
-      this.deviceAlarm[3].context = '45'
+    // getWellPercent() {
+    //   this.deviceAlarm[0].context = '10'
+    // },
+    // getGasPercent() {
+    //   this.deviceAlarm[1].context = '70'
+    // },
+    // getGasdectorPercent() {
+    //   this.deviceAlarm[2].context = '50'
+    // },
+    // getTubePercent() {
+    //   this.deviceAlarm[3].context = '45'
+    // }
+    getAlarmList() {
+      getAlarm().then(response => {
+        console.log(response)
+        this.deviceAlarm[0].context = parseFloat(response.data[0].rate).toFixed(3).substring(0, parseFloat(response.data[0].rate).toFixed(3).length - 1)
+        this.deviceAlarm[1].context = parseFloat(response.data[1].rate).toFixed(3).substring(0, parseFloat(response.data[1].rate).toFixed(3).length - 1)
+        this.deviceAlarm[2].context = parseFloat(response.data[2].rate).toFixed(3).substring(0, parseFloat(response.data[2].rate).toFixed(3).length - 1)
+        this.deviceAlarm[3].context = parseFloat(response.data[3].rate).toFixed(3).substring(0, parseFloat(response.data[3].rate).toFixed(3).length - 1)
+      })
     }
   }
 }
diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue
index c9c1618..b639417 100644
--- a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue
+++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue
@@ -15,10 +15,10 @@
             <div class="itemconT_right">
               <div class="right_text">
                 <div :deviceInstalled="deviceInstalled" class="text1">
-                  {{ deviceInstalled[0].context }}{{ deviceInstalled[0].flag }}
+                 {{ deviceInstalled[0].context }}{{ deviceInstalled[0].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[0].title }}
+                  {{ deviceInstalled[0].typeName }}
                 </div>
               </div>
             </div>
@@ -37,7 +37,7 @@
                   {{ deviceInstalled[1].context }}{{ deviceInstalled[1].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[1].title }}
+                  {{ deviceInstalled[1].typeName }}
                 </div>
               </div>
             </div>
@@ -56,7 +56,7 @@
                   {{ deviceInstalled[2].context }}{{ deviceInstalled[2].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[2].title }}
+                  {{ deviceInstalled[2].typeName }}
                 </div>
               </div>
             </div>
@@ -78,7 +78,7 @@
                   {{ deviceInstalled[3].context }}{{ deviceInstalled[3].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[3].title }}
+                  {{ deviceInstalled[3].typeName }}
                 </div>
               </div>
             </div>
@@ -97,7 +97,7 @@
                   {{ deviceInstalled[4].context }}{{ deviceInstalled[4].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[4].title }}
+                  {{ deviceInstalled[4].typeName }}
                 </div>
               </div>
             </div>
@@ -116,7 +116,7 @@
                   {{ deviceInstalled[5].context }}{{ deviceInstalled[5].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[5].title }}
+                  {{ deviceInstalled[5].typeName }}
                 </div>
               </div>
             </div>
@@ -130,6 +130,8 @@
 <script>
 
 import showItem from '@/views/zhangqiu/components/showItem.vue'
+import { getDevice } from "@/views/zhangqiu/api/zq.js"
+import axios from 'axios'
 export default {
   name: 'DeviceInstalled',
   components: { showItem },
@@ -141,32 +143,32 @@
       deviceInstalled:
         [
           {
-            title: '井盖',
+            typeName: '电子标识器',
             context: '',
             flag: '个'
           },
           {
-            title: '燃气终端',
+            typeName: '云台',
             context: '',
             flag: '台'
           },
           {
-            title: '云台',
-            context: '',
-            flag: '台'
-          },
-          {
-            title: '燃气管盯',
+            typeName: '井盖状态监测仪',
             context: '',
             flag: '个'
           },
           {
-            title: '可燃气体',
+            typeName: '燃气智能监测仪',
+            context: '',
+            flag: '个'
+          },
+          {
+            typeName: '可燃气体',
             context: '',
             flag: '台'
           },
           {
-            title: '电子标识器',
+            typeName: '管盯',
             context: '',
             flag: '个'
           }
@@ -174,31 +176,20 @@
     }
   },
   created() {
-    this.getWellCount()
-    this.getGasCount()
-    this.getCloudCount()
-    this.getTubeCount()
-    this.getGasdectorCount()
-    this.getElecCount()
+    this.getDeviceList()
   },
   methods: {
-    getWellCount() {
-      this.deviceInstalled[0].context = '2250'
-    },
-    getGasCount() {
-      this.deviceInstalled[1].context = '1050'
-    },
-    getCloudCount() {
-      this.deviceInstalled[2].context = '8250'
-    },
-    getTubeCount() {
-      this.deviceInstalled[3].context = '1231'
-    },
-    getGasdectorCount() {
-      this.deviceInstalled[4].context = '2141'
-    },
-    getElecCount() {
-      this.deviceInstalled[5].context = '8250'
+    getDeviceList() {
+      getDevice().then(response => {
+        console.log(response)
+        this.deviceInstalled[0].context = response.data[0].count
+        this.deviceInstalled[1].context = response.data[1].count
+        this.deviceInstalled[2].context = response.data[2].count
+        this.deviceInstalled[3].context = response.data[3].count
+        this.deviceInstalled[4].context = response.data[4].count
+        this.deviceInstalled[5].context = response.data[5].count
+        console.log(this.deviceInstalled[0].context)
+      })
     }
   }
 }

diff --git a/src/views/dataManage/deviceData/listGasdectorData.vue b/src/views/dataManage/deviceData/listGasdectorData.vue
index f16815e..df5f681 100644
--- a/src/views/dataManage/deviceData/listGasdectorData.vue
+++ b/src/views/dataManage/deviceData/listGasdectorData.vue
@@ -86,11 +86,14 @@
         { text: '设备编号', value: 'devcode', align: 'center' },
         { text: '点位编号', value: 'wellCode', align: 'center' },
         { text: '设备类型', value: 'deviceTypeName', align: 'center' },
-        { text: '可燃气体浓度(%LEL)', value: 'gasSampleValue', align: 'center', filter: true },
-        { text: '电量(%)', value: 'batteryValue', width: 80, align: 'center', checkCell: true },
-        // {text: '状态描述',value: 'descn', align: 'center'},
+        { text: '燃气浓度(%LEL)', value: 'strength', align: 'center' },
         { text: '权属单位', value: 'deptName', align: 'center' },
         { text: '上传时间', value: 'uptime', width: 170, align: 'center' }
+        // { text: '描述', value: 'descn', align: 'center' },
+        // { text: '记录时间', value: 'logtime', align: 'center' },
+        // { text: '信号与干扰加噪声比', value: 'pci', align: 'center', filter: true },
+        // { text: '物理小区标识', value: 'sinr', align: 'center' },
+        // { text: '参考信号接收功率', value: 'rsrp', width: 80, align: 'center', checkCell: true },
       ], // 显示列
       list: [], // 列表数据
       total: 0, // 数据总数
diff --git a/src/views/zhangqiu/api/zq.js b/src/views/zhangqiu/api/zq.js
new file mode 100644
index 0000000..f1ddcd7
--- /dev/null
+++ b/src/views/zhangqiu/api/zq.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+import axios from 'axios'
+
+
+
+// export function getDevice(params){
+//   return request({
+//     url: 'http://60.208.121.150:5002/whale/eye/installed-device',
+//     method: 'get',
+//     params
+//   })
+// }
+
+export function getDevice(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/installed-device`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getAlarm(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/alarm-rate`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
+
+export function getOperation(params) {
+  return new Promise((resolve, reject) => {
+    axios
+      .post(`http://60.208.121.150:5002/whale/eye/operational-status`, params)
+      .then((res) => {
+        resolve(res)
+      })
+      .catch((err) => {
+        reject(err)
+      })
+  })
+}
diff --git a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
index 8149bfd..7868dc7 100644
--- a/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
+++ b/src/views/zhangqiu/components/deviceAlarmSum/deviceAlarmSum.vue
@@ -23,6 +23,7 @@
 import progressBar from '@/views/zhangqiu/components/progressBar.vue'
 import ProgressBar from '@/views/zhangqiu/components/progressBar.vue'
 import showItem from '@/views/zhangqiu/components/showItem.vue'
+import { getAlarm } from "@/views/zhangqiu/api/zq.js"
 export default {
   name: 'DeviceAlarmSum',
   components: {showItem, ProgressBar, progressBar },
@@ -30,7 +31,7 @@
     return {
       deviceAlarm: [
         {
-          title: '井盖测试仪',
+          title: '井盖状态监测仪',
           context: '',
         },
         {
@@ -38,7 +39,7 @@
           context: '',
         },
         {
-          title: '可燃气体监测',
+          title: '可燃气体监测仪',
           context: '',
         },
         {
@@ -49,23 +50,33 @@
     }
   },
   created() {
-    this.getWellPercent()
-    this.getGasPercent()
-    this.getGasdectorPercent()
-    this.getTubePercent()
+    // this.getWellPercent()
+    // this.getGasPercent()
+    // this.getGasdectorPercent()
+    // this.getTubePercent()
+    this.getAlarmList()
   },
   methods: {
-    getWellPercent() {
-      this.deviceAlarm[0].context = '10'
-    },
-    getGasPercent() {
-      this.deviceAlarm[1].context = '70'
-    },
-    getGasdectorPercent() {
-      this.deviceAlarm[2].context = '50'
-    },
-    getTubePercent() {
-      this.deviceAlarm[3].context = '45'
+    // getWellPercent() {
+    //   this.deviceAlarm[0].context = '10'
+    // },
+    // getGasPercent() {
+    //   this.deviceAlarm[1].context = '70'
+    // },
+    // getGasdectorPercent() {
+    //   this.deviceAlarm[2].context = '50'
+    // },
+    // getTubePercent() {
+    //   this.deviceAlarm[3].context = '45'
+    // }
+    getAlarmList() {
+      getAlarm().then(response => {
+        console.log(response)
+        this.deviceAlarm[0].context = parseFloat(response.data[0].rate).toFixed(3).substring(0, parseFloat(response.data[0].rate).toFixed(3).length - 1)
+        this.deviceAlarm[1].context = parseFloat(response.data[1].rate).toFixed(3).substring(0, parseFloat(response.data[1].rate).toFixed(3).length - 1)
+        this.deviceAlarm[2].context = parseFloat(response.data[2].rate).toFixed(3).substring(0, parseFloat(response.data[2].rate).toFixed(3).length - 1)
+        this.deviceAlarm[3].context = parseFloat(response.data[3].rate).toFixed(3).substring(0, parseFloat(response.data[3].rate).toFixed(3).length - 1)
+      })
     }
   }
 }
diff --git a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue
index c9c1618..b639417 100644
--- a/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue
+++ b/src/views/zhangqiu/components/deviceInstalled/deviceInstalled.vue
@@ -15,10 +15,10 @@
             <div class="itemconT_right">
               <div class="right_text">
                 <div :deviceInstalled="deviceInstalled" class="text1">
-                  {{ deviceInstalled[0].context }}{{ deviceInstalled[0].flag }}
+                 {{ deviceInstalled[0].context }}{{ deviceInstalled[0].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[0].title }}
+                  {{ deviceInstalled[0].typeName }}
                 </div>
               </div>
             </div>
@@ -37,7 +37,7 @@
                   {{ deviceInstalled[1].context }}{{ deviceInstalled[1].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[1].title }}
+                  {{ deviceInstalled[1].typeName }}
                 </div>
               </div>
             </div>
@@ -56,7 +56,7 @@
                   {{ deviceInstalled[2].context }}{{ deviceInstalled[2].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[2].title }}
+                  {{ deviceInstalled[2].typeName }}
                 </div>
               </div>
             </div>
@@ -78,7 +78,7 @@
                   {{ deviceInstalled[3].context }}{{ deviceInstalled[3].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[3].title }}
+                  {{ deviceInstalled[3].typeName }}
                 </div>
               </div>
             </div>
@@ -97,7 +97,7 @@
                   {{ deviceInstalled[4].context }}{{ deviceInstalled[4].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[4].title }}
+                  {{ deviceInstalled[4].typeName }}
                 </div>
               </div>
             </div>
@@ -116,7 +116,7 @@
                   {{ deviceInstalled[5].context }}{{ deviceInstalled[5].flag }}
                 </div>
                 <div class="text2">
-                  {{ deviceInstalled[5].title }}
+                  {{ deviceInstalled[5].typeName }}
                 </div>
               </div>
             </div>
@@ -130,6 +130,8 @@
 <script>
 
 import showItem from '@/views/zhangqiu/components/showItem.vue'
+import { getDevice } from "@/views/zhangqiu/api/zq.js"
+import axios from 'axios'
 export default {
   name: 'DeviceInstalled',
   components: { showItem },
@@ -141,32 +143,32 @@
       deviceInstalled:
         [
           {
-            title: '井盖',
+            typeName: '电子标识器',
             context: '',
             flag: '个'
           },
           {
-            title: '燃气终端',
+            typeName: '云台',
             context: '',
             flag: '台'
           },
           {
-            title: '云台',
-            context: '',
-            flag: '台'
-          },
-          {
-            title: '燃气管盯',
+            typeName: '井盖状态监测仪',
             context: '',
             flag: '个'
           },
           {
-            title: '可燃气体',
+            typeName: '燃气智能监测仪',
+            context: '',
+            flag: '个'
+          },
+          {
+            typeName: '可燃气体',
             context: '',
             flag: '台'
           },
           {
-            title: '电子标识器',
+            typeName: '管盯',
             context: '',
             flag: '个'
           }
@@ -174,31 +176,20 @@
     }
   },
   created() {
-    this.getWellCount()
-    this.getGasCount()
-    this.getCloudCount()
-    this.getTubeCount()
-    this.getGasdectorCount()
-    this.getElecCount()
+    this.getDeviceList()
   },
   methods: {
-    getWellCount() {
-      this.deviceInstalled[0].context = '2250'
-    },
-    getGasCount() {
-      this.deviceInstalled[1].context = '1050'
-    },
-    getCloudCount() {
-      this.deviceInstalled[2].context = '8250'
-    },
-    getTubeCount() {
-      this.deviceInstalled[3].context = '1231'
-    },
-    getGasdectorCount() {
-      this.deviceInstalled[4].context = '2141'
-    },
-    getElecCount() {
-      this.deviceInstalled[5].context = '8250'
+    getDeviceList() {
+      getDevice().then(response => {
+        console.log(response)
+        this.deviceInstalled[0].context = response.data[0].count
+        this.deviceInstalled[1].context = response.data[1].count
+        this.deviceInstalled[2].context = response.data[2].count
+        this.deviceInstalled[3].context = response.data[3].count
+        this.deviceInstalled[4].context = response.data[4].count
+        this.deviceInstalled[5].context = response.data[5].count
+        console.log(this.deviceInstalled[0].context)
+      })
     }
   }
 }
diff --git a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue
index eba28dc..31764b6 100644
--- a/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue
+++ b/src/views/zhangqiu/components/sevenDaysOperationStatus/sevenDaysOperationStatus.vue
@@ -64,6 +64,8 @@
 <script>
 
 import showItem from '@/views/zhangqiu/components/showItem.vue'
+import { getOperation } from "@/views/zhangqiu/api/zq.js"
+
 export default {
   name: 'SevenDaysOperationStatus',
   components: { showItem },
@@ -82,36 +84,47 @@
       },
       sevenDaysOperationStatus: [
         {
+          title: '运维工单',
+          context: ''
+        },
+        {
           title: '运维任务',
           context: ''
         },
         {
           title: '运维事件',
           context: ''
-        },
-        {
-          title: '运维工单',
-          context: ''
         }
       ],
-      vls: '444'
+      vls : '1'
     }
   },
   created() {
-    this.getMissionCount()
-    this.getEventCount()
-    this.getWorksheetCount()
+    // this.getMissionCount()
+    // this.getEventCount()
+    // this.getWorksheetCount()
+    this.getOperationList()
   },
   methods: {
-    getMissionCount() {
-      this.sevenDaysOperationStatus[0].context = '111'
-    },
-    getEventCount() {
-      this.sevenDaysOperationStatus[1].context = '222'
-    },
-    getWorksheetCount() {
-      this.sevenDaysOperationStatus[2].context = '333'
+    getOperationList() {
+      getOperation().then(response => {
+        console.log(response)
+        this.sevenDaysOperationStatus[0].context = response.data.data[1].count
+        this.sevenDaysOperationStatus[1].context = response.data.data[2].count
+        this.sevenDaysOperationStatus[2].context = response.data.data[3].count
+        this.vls = response.data.data[0].count
+        console.log(this.vls, '-------------------')
+        })
     }
+    // getMissionCount() {
+    //   this.sevenDaysOperationStatus[0].context = '111'
+    // },
+    // getEventCount() {
+    //   this.sevenDaysOperationStatus[1].context = '222'
+    // },
+    // getWorksheetCount() {
+    //   this.sevenDaysOperationStatus[2].context = '333'
+    // }
   }
 }
 </script>