Merge branch 'visu_environment' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization into visu_environment

src/components/vBottomMenu.vue

@@ -456,17 +456,17 @@ export default {
           icon: 'iconfont sj-icon-clgj',
           click: 'editableLayers'
         },
-        {
-          name: '林班',
-          icon: 'iconfont sj-icon-lbzy',
-          click: 'forestban'
-        },
-
-        {
-          name: '林场',
-          icon: 'iconfont sj-icon-lczy',
-          click: 'forestchang'
-        },
+        // {
+        //   name: '林班',
+        //   icon: 'iconfont sj-icon-lbzy',
+        //   click: 'forestban'
+        // },
+        //
+        // {
+        //   name: '林场',
+        //   icon: 'iconfont sj-icon-lczy',
+        //   click: 'forestchang'
+        // },
         {
           name: '电视墙',
           icon: 'el-icon-s-grid',

src/views/monitor.vue

@@ -26,6 +26,20 @@
                     <h5>{{ item.deviceName }}</h5>
                   </div>
                 </div>
+                <div class="icon-con w-33 m-btm-no">
+                  <div class="icon icon-dot"></div>
+                  <div class="icon-text">
+                    <h6>0</h6>
+                    <h5>传感器</h5>
+                  </div>
+                </div>
+                <div class="icon-con w-33 m-btm-no">
+                  <div class="icon icon-dot"></div>
+                  <div class="icon-text">
+                    <h6>0</h6>
+                    <h5>大喇叭</h5>
+                  </div>
+                </div>
               </div>
               <div class="overflow-y" style="height: 33vh;">
                 <el-collapse accordion>

vue.config.js

@@ -38,7 +38,6 @@ module.exports = {
       cert: fs.readFileSync(ssl_path.join(__dirname, 'src/ssl/supermap.pem')),
       key: fs.readFileSync(ssl_path.join(__dirname, 'src/ssl/supermap.key'))
     },
-
     /**
      * 昨夜星辰昨夜风
      * 画廊西畔桂堂东
@@ -48,7 +47,6 @@ module.exports = {
      * 寻找附件-有缘人@阿弥陀佛
      * @param attach_ids
      */
-
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {