update

src/api/goaf/sensor.js

@@ -89,3 +89,9 @@ export function goafCameraAlarmHandle(data) {
   })
 }
 
+// 新接口
+export function sensordevstatis() {
+  return request({
+    url: '/goaf/goafsensor/goafdevstatis'
+  })
+}

src/settings.js

@@ -36,8 +36,8 @@ module.exports = {
   /**
   * 服务API地址
   */
-  devServerUrl: 'http://113.141.93.143:1688', // 正式环境
-  // devServerUrl: 'http://192.168.3.5:1788', // 开发环境 qu
+  // devServerUrl: 'http://113.141.93.143:1688', // 正式环境
+  devServerUrl: 'http://192.168.3.5:1788', // 开发环境 qu
   serverUrl: 'http://113.141.93.143:1688', // 正式环境
   mqttUrl: 'ws://113.141.93.143:8894/mqtt', // mqtt地址
   /**

src/views/bigScreen/home/components/DeviceState.vue

@@ -84,7 +84,7 @@ export default {
         justify-content: space-between;
         .device-item{
             color: #fff;
-            margin:0 10px 10px 10px;
+            // margin:0 10px 10px 10px;
             // flex-shrink: 0;
             .name{
                 text-align: center;
@@ -94,6 +94,7 @@ export default {
                 width: 200px;
                 height: 100px;
                 overflow: hidden;
+                transform: scale(0.8);
                 .graph{
                     width: 180px;
                     height: 180px;

src/views/bigScreen/home/components/SensorStatusCircle.vue

@@ -149,14 +149,14 @@ export default {
         this.myChart = myChart
       }
       this.myChart.setOption(option)
-      this.myChart.on('click', (params) => {
-        this.$router.push({
-          path: '/particulars/sensor',
-          query: {
-            id: '0'
-          }
-        })
-      })
+      // this.myChart.on('click', (params) => {
+      //   this.$router.push({
+      //     path: '/particulars/sensor',
+      //     query: {
+      //       id: '0'
+      //     }
+      //   })
+      // })
     },
     linkTo() {
       this.$router.push({

src/views/bigScreen/home/index.vue

@@ -142,6 +142,9 @@ export default {
         display: flex;
         justify-content: space-between;
         flex-direction: column;
+        &.side-left{
+          min-width: 432px;
+        }
         .item{
             &{
                 padding: 12px 12px 0 12px;

src/views/iiot/sensor/components/DeviceModel.vue

@@ -114,7 +114,17 @@ export default {
         goafDevGroupid: '',
         goafDevAccountName: '',
         goafInstallTime: '',
-        goafAlarmThreshold: 0
+        goafAlarmThreshold: 0,
+        'thvAccX': 0,
+        'thvAccY': 0,
+        'thvAccZ': 0,
+        'thvVelX': 0,
+        'thvVelY': 0,
+        'thvVelZ': 0,
+        'thvDisX': 0,
+        'thvDisY': 0,
+        'thvDisZ': 0,
+        'thvTemperature': 0
       },
       rules: {},
       ctrlLevelList: [],
@@ -219,7 +229,17 @@ export default {
         goafDevAccountName: '',
         goafInstallTime: '',
         goafAlarmThreshold: 0,
-        goafDevGroupid: ''
+        goafDevGroupid: '',
+        'thvAccX': 0,
+        'thvAccY': 0,
+        'thvAccZ': 0,
+        'thvVelX': 0,
+        'thvVelY': 0,
+        'thvVelZ': 0,
+        'thvDisX': 0,
+        'thvDisY': 0,
+        'thvDisZ': 0,
+        'thvTemperature': 0
       }
     },
     handleUserSelect(accountId) {

src/views/iiot/sensor/index.vue

@@ -140,7 +140,7 @@
 </template>
 
 <script>
-import { getSensor } from '@/api/goaf/sensor'
+import { getSensor, sensordevstatis } from '@/api/goaf/sensor'
 import { Pagination } from '@/components'
 import { NumConvertLM } from '@/utils'
 import SensorStatus from './components/SensorStatus.vue'
@@ -166,6 +166,7 @@ export default {
     NumConvertLM,
     getData() {
       this.listLoading = true
+      sensordevstatis()
       getSensor(this.conditions).then((resp) => {
         this.listLoading = false
         const { code, msg, data } = resp