Merge branch 'feixian' of http://123.132.248.154:10000/xujingliang/Fei_Xian_Lin_Ye_Fang_Huo into feixian

src/components/mars3d/Map.vue

@@ -76,7 +76,7 @@ export default {
               name: item.serverName,
               type: "group",
             };
-            configLayers.push(group);
+            configLayers.unshift(group);
             if (item.children && item.children.length > 0) {
               item.children.forEach((it, idx) => {
                 let attribute = JSON.parse(it.attribute);
@@ -84,7 +84,7 @@ export default {
                   attribute.symbol.styleOptions.label.pixelOffsetY = -40
                 }
                 attribute.pid = group.id;
-                configLayers.push(attribute);
+                configLayers.unshift(attribute);
               });
             }
             // if (item.children && item.children.length > 0) {

src/store/modules/user.js

@@ -37,6 +37,7 @@ const user = {
           localStorage.setItem("userName",response.userInfo.account);
           localStorage.setItem("areaName",response.userInfo.areaENName);
           localStorage.setItem("areaCNName",response.userInfo.areaCNName);
+          localStorage.setItem("unitName",response.userInfo.unitName);
           commit('SET_TOKEN', data.token)
           resolve()
         }).catch(error => {

src/views/home/widget/onlineuserbox.vue

@@ -233,7 +233,7 @@ import { getMethodCommon, postMethodCommon } from '../../../api/common';
         videoCall(phone){
             let userId = localStorage.getItem("userName");
 
-            let wind = window.open("https://ssl.hopetrytech.com:9233/#/?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
+            let wind = window.open("https://ssl.hopetrytech.com:9237?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
             wind.onload = function(){
                 wind.document.title = "视频通话";
             }

src/views/home/widget/personnel.vue

@@ -119,7 +119,14 @@ export default {
   },
   methods: {
     videoCall(phone) {
-      this.$emit("videoCall", phone);
+            let userId = localStorage.getItem("userName");
+
+            let wind = window.open("https://ssl.hopetrytech.com:9237?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
+            wind.onload = function(){
+                wind.document.title = "视频通话";
+            }
+
+      // this.$emit("videoCall", phone);
     },
     close() {
       this.graphicLayerArr.forEach(item => {
@@ -316,6 +323,7 @@ export default {
           phoneArr.push(item.phone)
         })
       }
+
       let param = {
         phoneNumbers: phoneArr.join(','),
         time: dates,

src/views/home/widget/rightechartsdata.vue

@@ -1,11 +1,11 @@
 <template>
-    <div class="box">
-      <div class="box-title">数据统计</div>
-      <div class="box-container">
-          <div class="max-w max-h" id="echartsId"></div>
-      </div>
+<div class="box">
+    <div class="box-title">数据统计</div>
+    <div class="box-container">
+        <div class="max-w max-h" id="echartsId"></div>
     </div>
-  </template>
+</div>
+</template>
   
   <script>
   let BASE_URL = process.env.VUE_APP_BASE_API
@@ -203,6 +203,7 @@
             );
             myChart.setOption(option);
           }
+           
       }
     }
   </script>

src/views/home/widget/socketdiabox.vue

@@ -67,7 +67,12 @@ export default {
       this.$emit("close");
     },
     videoCall(phone) {
-      this.$emit("videoCall", phone);
+      let userId = localStorage.getItem("userName");
+
+            let wind = window.open("https://ssl.hopetrytech.com:9237?userID="+userId+"&callUserID="+phone, "视频通话", "location=no,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,width=640,height=460");
+            wind.onload = function(){
+                wind.document.title = "视频通话";
+            }
     },
     getOnLineInfo() {
       getMethodCommon("/FireManagement/GetOnOffLineInfo").then((res) => {

src/views/navigation/index.vue

@@ -3,7 +3,7 @@
     <div class="body">
         <p class="tip">控制台</p>
         <div class="navigation-center">
-            <div class="navigation-item" v-for="(item,index) in routerlist" :key="index" :style="{'background':item.bgColor}" @click="goDetail(item)">
+            <div class="navigation-item" v-for="(item,index) in routerlist" :key="index" :style="{'background':item.bgColor}" @click="goDetail(item)" v-show="item.show">
                 <div class="item-icon">
                     <img class="top-img" :src="'/img/navigation/top-'+(index+1)+'.png'" alt="">
                     <img class="bottom-img" :src="'/img/navigation/bottom-'+(index+1)+'.png'" alt="">
@@ -50,7 +50,7 @@
 
 <script>
     import VueQr from "vue-qr";
-    import { getMethodCommon, postMethodCommon } from '../../api/common';
+    import { getMethodCommon } from '../../api/common';
   export default {
     name: 'index',
     components:{
@@ -64,27 +64,32 @@
                     lable:"防灭火沙盘",
                     icon:"",
                     url:"/home",
-                    bgColor:"linear-gradient(180deg, #4CF6EA 0%, #3C31F5 100%)"
+                    bgColor:"linear-gradient(180deg, #4CF6EA 0%, #3C31F5 100%)",
+                    show:true
                 },{
                     lable:"网格化管理",
                     icon:"",
                     url:"/gridman",
-                    bgColor:"linear-gradient(180deg, #DBA2FD 0%, #3C31F5 100%)"
+                    bgColor:"linear-gradient(180deg, #DBA2FD 0%, #3C31F5 100%)",
+                    show:true
                 },{
                     lable:"监测中心",
                     icon:"",
                     url:"http://60.213.14.14:6088/forestry/",
-                    bgColor:"linear-gradient(180deg, #FEA887 0%, #EF3E70 100%)"
+                    bgColor:"linear-gradient(180deg, #FEA887 0%, #EF3E70 100%)",
+                    show:true
                 },{
                     lable:"数据中心",
                     icon:"",
                     url:"http://223.99.16.253:9003/#/dashboard?id="+ localStorage.getItem("X-Token"),
-                    bgColor:"linear-gradient(180deg, #E0FF13 0%, #086D3C 100%)"
+                    bgColor:"linear-gradient(180deg, #E0FF13 0%, #086D3C 100%)",
+                    show:localStorage.getItem("unitName") && localStorage.getItem("unitName") != "null" ? false : true,
                 },{
                     lable:"管理中心",
                     icon:"",
                     url:"/dashboard",
-                    bgColor:"linear-gradient(180deg, #FFDF2F 0%, #FB5757 100%)"
+                    bgColor:"linear-gradient(180deg, #FFDF2F 0%, #FB5757 100%)",
+                    show:true
                 }
             ]
         }
@@ -100,15 +105,19 @@
                 }
             })
         },
-            goDetail(item) {
-                if (item.lable == '数据中心') {
-                    window.open('http://223.99.16.253:9003/#/dashboard?id=' + localStorage.getItem("X-Token"), '_blank')
-                }else  if (item.lable == '监测中心') {
-                    window.open('http://60.213.14.14:6088/forestry/', '_blank')
-                }  else {
-                    this.$router.push({ 'path': item.url })
-                }
-            },
+        goDetail(item) {
+            let sql = `
+            
+            `
+            if (item.lable == '数据中心') {
+                window.open('http://223.99.16.253:9003/#/dashboard?id=' + localStorage.getItem("X-Token"), '_blank')
+            }else  if (item.lable == '监测中心') {
+                window.open('http://60.213.14.14:6088/forestry/', '_blank')
+            }  else {
+                this.$router.push({ 'path': item.url })
+            }
+        },
+
         }
   }
 </script>