From 1941d4558696fc6b50720a46f34c746613782783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Mon, 27 Jun 2022 15:56:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=B9=BF=E8=A5=BF?=
 =?UTF-8?q?=E8=81=94=E9=80=9A=E7=9A=84=E4=B8=80=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                         |  1 +
 src/components/account.vue                    |  6 ++---
 src/router/index.js                           |  2 ++
 src/views/companyFront/project/overview.vue   |  2 ++
 .../projectFront/aiAnalysis/warningList.vue   |  1 +
 .../projectFront/configManage/roleManage.vue  | 23 ++++++++++++++++---
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 6c39f338..30700295 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -42,6 +42,7 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL = 'http://124.71.178.44:100/'
     // tag: 本地
     axios.defaults.baseURL = 'http://192.168.34.125:6023/'; //本地 http/1.1
+    // axios.defaults.baseURL = 'http://120.196.217.6:7000/';
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
     // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
diff --git a/src/components/account.vue b/src/components/account.vue
index b90b7e6f..44a9e82f 100644
--- a/src/components/account.vue
+++ b/src/components/account.vue
@@ -15,7 +15,7 @@
           <div style="margin-left:10px">
             <p>{{ $store.state.userInfo.companyName }}</p>
             <!-- 横琴和鹤洲不需要客服电话-->
-            <!-- <p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p> -->
+            <p>客服电话：{{$store.state.userInfo.customerServicePhone}}</p>
           </div>
         </div>
         <!-- <div class="flex2" style="margin-top:20px">
@@ -216,7 +216,7 @@ export default {
       window.open("/equipmentCenter.html#/equipmentCenterIndx", "_blank");
     },
     goto5(){
-      window.open("/firm/projectManage#/firm/projectManage", "_self");
+      window.open("/index.html#/firm/projectManage", "_self");
     },
     loginOut() {
       this.$store.commit("setUserInfo", null);
@@ -268,7 +268,7 @@ export default {
         }else{
           window.open("/#/projectList", "_self");
         }
-      }if( type == 5 || type == 6 || type == 7 ){
+      }if( type == 5 || type == 6  ){
          window.open("/index.html#/projectIndex", "_self");
       }else {
         routeUrl = this.$router.resolve({
diff --git a/src/router/index.js b/src/router/index.js
index b20882f8..64b78332 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,6 +29,7 @@ const routes2 = [
         name: '授权',
         component: () => import('../views/home/authorization.vue')
     },
+    // 中建四局的登录页面
     // {
     //     path: '/',
     //     name: 'HomeTwo',
@@ -1453,6 +1454,7 @@ const routes2 = [
                 component: () => import('@/views/projectAdmin/dataBoard/AiAnalysis.vue'),
             }
         ]
+    // 中建四局的看板
     //     children: [{
     //         path: 'index',
     //         name: '数据看板-首页概览',
diff --git a/src/views/companyFront/project/overview.vue b/src/views/companyFront/project/overview.vue
index b2a56253..8debc9fd 100644
--- a/src/views/companyFront/project/overview.vue
+++ b/src/views/companyFront/project/overview.vue
@@ -619,6 +619,7 @@ export default {
     getSafeData() {
       selectWorkerSafeEducationStatisticsApi({ sn: this.searchsn }).then(
         (res) => {
+          console.log('培训学校',res)
           var xData = [],
             yData1 = [],
             yData2 = [];
@@ -650,6 +651,7 @@ export default {
     //设备在线统计
     getDevCountStatictis() {
       getProjectDevStatisticsCountApi({ sn: this.searchsn }).then((res) => {
+        console.log('设备在线统计',res.result.videoList)
         if (res.result) {
           var arr3 = res.result.environmentList;
           var arr2 = res.result.ufaceList;
diff --git a/src/views/projectFront/aiAnalysis/warningList.vue b/src/views/projectFront/aiAnalysis/warningList.vue
index 0e42cb90..c9736754 100644
--- a/src/views/projectFront/aiAnalysis/warningList.vue
+++ b/src/views/projectFront/aiAnalysis/warningList.vue
@@ -209,6 +209,7 @@ export default {
 			// return timer;
 		},
     getTypeName(val){
+      // console.log('点击',val)
       let text = ""
       this.alarmTypeArr.forEach(item=>{
         if(item.value == val){
diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue
index 15db8b55..89f3fa55 100644
--- a/src/views/projectFront/configManage/roleManage.vue
+++ b/src/views/projectFront/configManage/roleManage.vue
@@ -172,11 +172,15 @@
       <div class="dialog_content">
         <!-- default-expand-all -->
           <!-- <div>项目模块</div> -->
+          <!-- <div>
+            <el-checkbox v-model="checkAll" @change="selectAll">全选</el-checkbox>
+          </div> -->
           <el-tree ref="tree"
             node-key="authorityId"
             :props="props"
             :data="projectMenus"
             show-checkbox
+
             @check-change="handleCheckChange"
           >
             <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -233,6 +237,7 @@ export default {
   },
   data() {
     return {
+      checkAll:false, //是否全选
       addEditForm: {
         roleName: "",
         roleDesc: "",
@@ -488,10 +493,22 @@ export default {
     //   this.pagInfo.pageNo = val;
     //   this.getList();
     // },
-    handleCheckChange(data, checked, indeterminate) {
+    handleCheckChange(e) {
+      console.log('eeee',e)
       // console.log(data, checked, indeterminate);
-      console.log(this.$refs.tree.getCheckedKeys());
-    }
+      // console.log('选择',this.$refs.tree.getCheckedKeys());
+    },
+     // 全选反选
+    // selectAll(){
+    //   if(this.checkAll){
+    //     console.log('111111',this.$refs)
+    //       // this.$refs.tree.setCheckedNodes(this.projectMenus);
+    //   }else{
+    //     this.$nextTick(()=>{
+    //       this.$refs.tree.setCheckedNodes([])
+    //     })
+    //   }
+    // },
   },
 };
 </script>