fix: BUG 修改

src/assets/js/http.js

@@ -75,11 +75,11 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
   // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
     // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
-    // axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地
+    // axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
-    // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
+    // axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
-    axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地
+    axios.defaults.baseURL ='http://192.168.34.221:12360/' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
-    // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖
+    // axios.defaults.baseURL ='http://61.145.163.135:12345/' //坪山沙湖
     // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
     // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
     // axios.defaults.baseURL ='http://192.168.34.221:30012' //郭圣雄本地

src/components/account.vue

@@ -86,11 +86,7 @@
             class="width_100"
             @click="goDevcenter"
             v-if="
-              (seeEquipment == 0 &&
+                seeEquipment === 0 && $store.state.userInfo.accountType != 6 && $route.path.indexOf('/equipmentCenterIndx') == -1
-                $route.path.indexOf('/equipmentCenterIndx') == -1) ||
-              ($route.path.indexOf('/equipmentCenterIndx') == -1 &&
-                $route.path.indexOf('/projectIndex') == -1) ||
-              $store.state.userInfo.accountType != 6
             "
           >
             <img src="@/assets/images/xmht.png" width="15px" height="15px" />
@@ -334,6 +330,9 @@ export default {
         routeUrl = this.$router.resolve({
           path: '/projectList'
         })
+        // routeUrl = this.$router.resolve({
+        //   path: '/equipmentCenterIndx'
+        // })
         window.open(routeUrl.href, '_self')
       }
     }

src/router/equipmentCenter.js

@@ -135,7 +135,7 @@ const routes = [{
     {
         path: '/equipmentCenterIndx',
         name: 'equipmentCenterIndx',
-        component: () => import('../views/equipmentCenter/equipmentCenterIndex.vue'),
+        component: () => import('@/views/equipmentCenter/equipmentCenterIndex.vue'),
     }
 
 ]

src/views/projectAdmin/dataBoard/laborManage.vue

@@ -581,7 +581,7 @@ export default {
         this.workerTypeList = res.result
         clearTimeout(this.interval1)
         this.interval1 = setTimeout(() => {
-          this.selectProjectWorkerTypeTotalList()
+          // this.selectProjectWorkerTypeTotalList()
           this.selectProjectWorkerStatistics()
         }, 5000)
       })
@@ -603,27 +603,28 @@ export default {
       selectProjectWorkerStatisticsApi({
         sn: this.$store.state.projectSn
       }).then((res) => {
-        console.log(res)
+        console.log("项目人员统计",res.result)
         this.statisticsCount = res.result
 
-        var json1 = this.statisticsCount.presencecount
+        let json1 = this.statisticsCount.presencecount
-        var json2 = this.statisticsCount.workercount
+        let json2 = this.statisticsCount.workercount
-        var yData1 = [
+        let yData1 = [
           json1.age18,
-          json1.age18to25 + json1.age25to35 + json1.age35to45,
+          json1.age18to25 - 0 + json1.age25to35 + json1.age35to45,
           // json1.age25to35,
           // json1.age35to45,
           json1.age45to60,
           json1.age60
         ]
-        var yData2 = [
+        let yData2 = [
           json2.age18,
-          json2.age18to25 + json1.age25to35 + json1.age35to45,
+          json2.age18to25 - 0 + json2.age25to35 + json2.age35to45,
           // json2.age25to35,
           // json2.age35to45,
           json2.age45to60,
           json2.age60
         ]
+        console.log("项目人员统计y轴数据",yData1,yData2)
         // ["18及以下", "18-25岁", "25-35岁", "35-45岁", "45-59岁", "60及以上"]
         this.createdBarCharts(
           this.$t('message.dataBoard.ageTypeList'),
@@ -656,12 +657,12 @@ export default {
       let ydata2 = []
       let dateList = []
       // 24*60*60*1000
-      var oneDayTime = 24 * 60 * 60 * 1000
+      let oneDayTime = 24 * 60 * 60 * 1000
-      var date = new Date()
+      let date = new Date()
-      var todayTime = date.getTime()
+      let todayTime = date.getTime()
       for (let i = 9; i >= 0; i--) {
-        var everyDayTime = todayTime - oneDayTime * i
+        let everyDayTime = todayTime - oneDayTime * i
-        var everyDay = new Date(everyDayTime).getDate()
+        let everyDay = new Date(everyDayTime).getDate()
         xdata.push(everyDay)
       }
       let res = await selectTenDaysWorkerAttendanceCountList({
@@ -686,8 +687,8 @@ export default {
         projectSn: this.$store.state.projectSn,
         type: 1
       }).then((res) => {
-        var Data = res.result
+        let Data = res.result
-        var xData = [],
+        let xData = [],
           yData1 = [],
           yData2 = []
         Data.forEach((element) => {
@@ -711,9 +712,9 @@ export default {
       selectProjectTeamWorkTotalListApi({
         projectSn: this.$store.state.projectSn
       }).then((res) => {
-        var Data = res.result
+        let Data = res.result
         console.log(Data)
-        var xData = [],
+        let xData = [],
           yData1 = [],
           yData2 = []
         Data.forEach((element) => {
@@ -823,7 +824,7 @@ export default {
       let that = this
       let monitor = echarts.init(div)
       // monitor.clear();
-      var option = {
+      let option = {
         color: color ? color : ['#5181F6', '#61D2B9', '#F67F51', '#7851F6'],
         title: {
           show: true,
@@ -881,14 +882,14 @@ export default {
     createGroupChart(xData, yData1, yData2, el, legendData) {
       console.log(yData2)
       let monitor = echarts.init(el)
-      //       var data = [220, 182, 191, 234, 290, 330, 310, 123, 442, 321, 90, 149, 210, 122, 133, 334, 198, 123, 125, 220];
+      //       let data = [220, 182, 191, 234, 290, 330, 310, 123, 442, 321, 90, 149, 210, 122, 133, 334, 198, 123, 125, 220];
-      // var yMax = 500;
+      // let yMax = 500;
-      // var dataShadow = [];
+      // let dataShadow = [];
 
-      // for (var i = 0; i < data.length; i++) {
+      // for (let i = 0; i < data.length; i++) {
       //     dataShadow.push(yMax);
       // }
-      var option = {
+      let option = {
         legend: {
           show: true,
           align: 'left',
@@ -1019,7 +1020,7 @@ export default {
     //出勤人员统计
     createPersonTypeChart(xdata, ydata, dateList) {
       let monitor = echarts.init(this.$refs.personTypeChart)
-      var option = {
+      let option = {
         color: ['#5CE2F6', '#557DED', '#FE6C7F'],
         tooltip: {
           trigger: 'item',

src/views/projectAdmin/projectIndex.vue

@@ -3,47 +3,20 @@
   <div class="fullHeight">
     <vhead :titleName="projectName" :showR="true"></vhead>
     <div class="pageContainer">
-      <div class="pageDataContainer" >
+      <div class="pageDataContainer">
         <vue-scroll>
           <div class="projectIndexBox" ref="artList" @scroll="scrollGet($event)">
             <!-- <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> -->
             <div class="projectIndex" id="projectIndex">
-              <div
+              <div class="moduleBox" v-for="(item, index) in list" :key="index" v-if="item.operation">
-                class="moduleBox"
+                <div class="module_title" v-if="index == 0 || list[index - 1].labelName != item.labelName">
-                v-for="(item, index) in list"
-                :key="index"
-                v-if="item.operation"
-              >
-                <div
-                  class="module_title"
-                  v-if="
-                    index == 0 || list[index - 1].labelName != item.labelName
-                  "
-                >
                   {{ item.labelName }}
                 </div>
-                <div
+                <div class="module canclick" :class="{ hovers: item.operation }" @click="itemClick(item, index)" ref="refName">
-                  class="module canclick"
+                  <img v-if="iconType == 1" :src="require('../../assets/images/menu/' + item.moduleIcon + '.png')" class="icon" />
-                  :class="{ hovers: item.operation }"
-                  @click="itemClick(item, index)"
-                  ref="refName"
-                >
-                  <img
-                    v-if="iconType == 1"
-                    :src="
-                      require('../../assets/images/menu/' +
-                        item.moduleIcon +
-                        '.png')
-                    "
-                    class="icon"
-                  />
                   <img
                     v-if="iconType == 2 && item.bigModuleIcon"
-                    :src="
+                    :src="require('../../assets/images/menu/' + item.bigModuleIcon + '.png')"
-                      require('../../assets/images/menu/' +
-                        item.bigModuleIcon +
-                        '.png')
-                    "
                     style="margin-bottom: 10px"
                     class="icon"
                   />
@@ -68,22 +41,10 @@
                   @click="itemClick(item, index)"
                   v-if="!item.operation"
                 >
-                  <img
+                  <img v-if="iconType == 1" :src="require('../../assets/images/menu/' + item.moduleIcon2 + '.png')" class="icon" />
-                    v-if="iconType == 1"
-                    :src="
-                      require('../../assets/images/menu/' +
-                        item.moduleIcon2 +
-                        '.png')
-                    "
-                    class="icon"
-                  />
                   <img
                     v-if="iconType == 2 && item.bigModuleIcon"
-                    :src="
+                    :src="require('../../assets/images/menu/' + item.bigModuleIcon + '.png')"
-                      require('../../assets/images/menu/' +
-                        item.bigModuleIcon +
-                        '.png')
-                    "
                     style="margin-bottom: 10px; opacity: 0.2"
                     class="icon"
                   />
@@ -102,66 +63,60 @@
   </div>
 </template>
 <script>
-import { getProjectInfoBySn } from "@/assets/js/api/overview";
+import { getProjectInfoBySn } from '@/assets/js/api/overview'
-import vhead from "@/components/header"; 
+import vhead from '@/components/header'
 import axios from 'axios'
-import { getProjectDetail } from "@/assets/js/api/baseInfo.js";
+import { getProjectDetail } from '@/assets/js/api/baseInfo.js'
-import {
+import { getProjectModuleList, getAllModuleApi } from '@/assets/js/api/jxjadmin.js'
-  getProjectModuleList,
+import { getSafeyHatSessionApi } from '@/assets/js/api/demo'
-  getAllModuleApi,
+import { getDockingUrlApi } from '@/assets/js/api/configManage'
-} from "@/assets/js/api/jxjadmin.js";
-import {
-  getSafeyHatSessionApi
-} from '@/assets/js/api/demo'
-import {
-  getDockingUrlApi
-} from "@/assets/js/api/configManage";
 export default {
-  name: "projectIndex",
+  name: 'projectIndex',
   components: { vhead },
   data() {
     return {
+      firstIn: 0,
       selfScrollTop: 0,
-      projectSn: "",
+      projectSn: '',
-      baseURL: "",
+      baseURL: '',
-      projectNumber: '',
+      projectNumber: null,
-      projectName: "",
+      projectName: '',
       list: [],
       showNotBuyMoudle: showNotBuyMoudle,
-      brIndex: "",
+      brIndex: '',
-      iconType: "1"
+      iconType: '1'
-    };
+    }
   },
   created() {
-    console.log("进来 created");
+    console.log('进来 created')
     this.projectSn = this.$store.state.projectSn
     this.baseURL = this.$http.defaults.baseURL
-
+    
   },
-  mounted() {
+  async mounted() {
-  
+    // if(this.firstIn == 0) {
-    if (localStorage.getItem('systemInfo')) {
+    //   this.firstIn ++
-      this.iconType = JSON.parse(localStorage.getItem('systemInfo')).iconType ? JSON.parse(localStorage.getItem('systemInfo')).iconType : '1'
+    //   this.$router.go(0)
-    }
-    console.log(this.iconType)
-    this.getDataDateils();
-    // if(this.$store.state.userInfo.accountType==5){
-    //   this.getProjectModule()
-    // }else{
-    var arr = this.$store.state.userInfo.menuAuthority.moduleList;
-    this.getAllModule(arr);
-    this.getProjectNumber();
-
     // }
+    if (localStorage.getItem('systemInfo')) {
+      this.iconType = JSON.parse(localStorage.getItem('systemInfo')).iconType
+        ? JSON.parse(localStorage.getItem('systemInfo')).iconType
+        : '1'
+    }
+    console.log(this.iconType,'iconType,iconTypeiconTypeiconTypeiconTypeiconType')
+    await this.getDataDateils()
+    let arr = this.$store.state.userInfo.menuAuthority.moduleList
+    await this.getAllModule(arr)
+    await this.getProjectNumber()
+  },
+  activated() {
+    this.$refs.artList.scrollTop = this.selfScrollTop
   },
-  activated(){
-    this.$refs.artList.scrollTop= this.selfScrollTop
-},
   methods: {
-   scrollGet (e) {
+    scrollGet(e) {
-      this.selfScrollTop= this.$refs.artList.scrollTop
+      this.selfScrollTop = this.$refs.artList.scrollTop
- },
+    },
-   
+
     getSafeyHatSession() {
       let data = {}
       data.projectSn = this.projectSn
@@ -183,16 +138,16 @@ export default {
         // 此处注释是因为免登陆 传projectId到后端
         if (res.code == 200) {
           this.url = 'https://caps.runde.pro/login#token=' + res.result.token + '&user_name=' + res.result.userName + '&target=home'
-          // let url = 'https://caps.runde.pro/login#token='+ res.result.token + '&user_name=' + res.result.userName + '&target=home' 
+          // let url = 'https://caps.runde.pro/login#token='+ res.result.token + '&user_name=' + res.result.userName + '&target=home'
           window.open(this.url)
         }
       })
     },
     getProjectNumber() {
       let data = {
-        projectSn: this.projectSn,
+        projectSn: this.projectSn
-      };
+      }
-      getProjectInfoBySn(data).then((res) => {
+      getProjectInfoBySn(data).then(res => {
         console.log('------------', res.result.projectNumber)
         this.projectNumber = res.result.projectNumber
       })
@@ -200,16 +155,16 @@ export default {
     // 全景成像测距
     getPanoramicRanging() {
       axios({
-        method: "GET",
+        method: 'GET',
         // url:'http://182.90.224.237:8070/xmgl/docking/url',
         // url:'http://182.90.224.237:7000/xmgl/docking/url',
         url: `${this.$http.defaults.baseURL}${'xmgl/docking/url'}`,
         params: {
-          projectNumber: this.projectNumber,
+          projectNumber: this.projectNumber
         }
-      }).then((res) => {
+      }).then(res => {
         console.log('全景成像测距', res)
-        let toUrl = res.data.find((item) => {
+        let toUrl = res.data.find(item => {
           if (this.projectNumber == item.jinqianmaosn) {
             return item.url
           }
@@ -218,11 +173,10 @@ export default {
       })
     },
     itemClick(item, index) {
-
       console.log('item：：：：：：：：：', index)
 
       // console.log(item,this.$store.state.userInfo.account)
-      if (item.moduleName == "智能安全帽系统") {
+      if (item.moduleName == '智能安全帽系统') {
         this.getSafeyHatSession()
         // 次数更改因为原来跳转的是星璇  无法显示 所以更改跳转到 润德 龙光同一个页面
         //    let NodeRSA = require("node-rsa");
@@ -237,136 +191,132 @@ export default {
         // MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDcmP0ug4NTHwW2oeHxheZjmYPDxVGFP770eECdLwRtaH0pPWvsXG6MSO/kCzgjEVEo1K1bvRxkkasQRu02fhI+gsZa8wvVeo3s4zJDA48Oj99JAXsx56/WN1RlNh+tsXcH9oQWy3gbX5cDkheuVZj8gsV7Ez59Ucj4e78zNJrUDwIDAQAB
         // -----END PUBLIC KEY-----`;
 
-        //   var publicKey = new NodeRSA(pubKey);
+        //   let publicKey = new NodeRSA(pubKey);
-        //   var async_key = publicKey.encrypt(params, 'base64')
+        //   let async_key = publicKey.encrypt(params, 'base64')
 
         //   window.open("http://58.210.96.206:91/async_danzhou.html?async_key="+async_key)
         //   // window.location.href = "http://58.210.96.206:91/async_danzhou.html?async_key="+async_key;
-
       }
-      if (item.moduleName == "全景成像测距") {
+      if (item.moduleName == '全景成像测距') {
         this.getPanoramicRanging()
       }
-      if (item.moduleName == "智能穿戴管理系统") {
+      if (item.moduleName == '智能穿戴管理系统') {
         this.getSafeyHatSession()
       }
-      if (item.moduleName == "智能穿戴管理系统") {
+      if (item.moduleName == '智能穿戴管理系统') {
-        return;
+        return
       }
-      if (item.moduleName == "智能安全帽系统") {
+      if (item.moduleName == '智能安全帽系统') {
-        this.getSafeyHatSession();
+        this.getSafeyHatSession()
       }
       if (!item.operation) {
-        this.$message.error(this.$t("message.projectIndex.tips1"));
+        this.$message.error(this.$t('message.projectIndex.tips1'))
-        return;
+        return
       }
       if (item.menuList && item.menuList.length > 0 && item.moduleName != '全景成像测距') {
-        var arr = item.menuList,
+        let arr = item.menuList,
-          arr2 = [];
+          arr2 = []
-        arr.forEach((element) => {
+        arr.forEach(element => {
           if (element.menuEquipment == 0) {
-            arr2.push(element);
+            arr2.push(element)
           }
-        });
+        })
-        this.$store.commit("setMenuList", arr2);
+        this.$store.commit('setMenuList', arr2)
-        this.$store.commit("setIsShowBackIndex", true);
+        this.$store.commit('setIsShowBackIndex', true)
-        this.$store.commit("setMoudle", item);
+        this.$store.commit('setMoudle', item)
-        if (arr2[0].target == "_blank") {
+        if (arr2[0].target == '_blank') {
           let routeUrl = ''
           if (arr2[0].path.indexOf('http') != -1) {
             routeUrl = arr2[0].path
           } else {
             let url = this.$router.resolve({
-              path: arr2[0].path,
+              path: arr2[0].path
-            });
+            })
             routeUrl = url.href
           }
-          window.open(routeUrl, "_blank");
+          window.open(routeUrl, '_blank')
         } else {
           if (arr2[0].path == '' || arr2[0].path.indexOf('/') == -1) {
-            this.$router.push(arr2[0].menuList[0].path);
+            this.$router.push(arr2[0].menuList[0].path)
           } else {
-            this.$router.push(arr2[0].path);
+            this.$router.push(arr2[0].path)
           }
         }
-      }
+      } else if (item.moduleName == '全景成像测距' || item.moduleName == '智能安全帽系统') {
-      else if (item.moduleName == '全景成像测距' || item.moduleName == "智能安全帽系统") {
+        this.$message.success(this.$t('message.projectIndex.tips3'))
-        this.$message.success(this.$t("message.projectIndex.tips3"));
+      } else {
-      }
+        this.$message.error(this.$t('message.projectIndex.tips2'))
-      else {
-        this.$message.error(this.$t("message.projectIndex.tips2"));
       }
       window._paq.push(['trackEvent', '点击', item.moduleName, '进入' + item.moduleName])
     },
     //获取详情
     getDataDateils() {
       let data = {
-        projectSn: this.projectSn,
+        projectSn: this.projectSn
-      };
+      }
-      getProjectDetail(data).then((res) => {
+      getProjectDetail(data).then(res => {
         // console.log(res);
         if (res.code == 200) {
-          this.projectName = res.result.projectName;
+          this.projectName = res.result.projectName
-          document.title = this.projectName;
+          document.title = this.projectName
-          this.$store.commit("setProDetail", res.result);
+          this.$store.commit('setProDetail', res.result)
         }
-      });
+      })
     },
     //为了展示未解锁产品，所以需要查询所有模块
     getAllModule(half) {
-      getAllModuleApi({ moduleType: 2 }).then((res) => {
+      getAllModuleApi({ moduleType: 2 }).then(res => {
         if (res.success) {
-          var all = res.result;
+          let all = res.result
           console.log('all', all)
           all.forEach((element, index) => {
-            all[index].operation = false;
+            all[index].operation = false
-            half.forEach((element2) => {
+            half.forEach(element2 => {
               if (element2.moduleId == element.moduleId) {
-                all[index].operation = true;
+                all[index].operation = true
-                all[index].menuList = element2.menuList;
+                all[index].menuList = element2.menuList
               }
-            });
+            })
-          });
+          })
-          this.list = all;
+          this.list = all
-          console.log(this.list)
+          // console.log(this.list,"权限数据")
           this.$nextTick(() => {
+            let projectIndex = document.getElementById('projectIndex')
 
-            var projectIndex = document.getElementById("projectIndex");
+            let array = document.getElementsByClassName('module_title')
-
-            var array = document.getElementsByClassName('module_title')
             console.log(array)
             for (let index = 0; index < array.length; index++) {
-              var newElement = document.createElement('div')
+              let newElement = document.createElement('div')
               newElement.style = 'width: 100%; height: 1px'
-              projectIndex.insertBefore(newElement, array[index].parentNode);
+              projectIndex.insertBefore(newElement, array[index].parentNode)
             }
-          });
+          })
         }
-      });
+      })
     },
     insertAfter(newElement, targetElement) {
       // newElement是要追加的元素 targetElement 是指定元素的位置
-      var parent = targetElement.parentNode; // 找到指定元素的父节点
+      let parent = targetElement.parentNode // 找到指定元素的父节点
       if (parent.lastChild == targetElement) {
         // 判断指定元素的是否是节点中的最后一个位置 如果是的话就直接使用appendChild方法
-        parent.appendChild(newElement, targetElement);
+        parent.appendChild(newElement, targetElement)
       } else {
-        parent.insertBefore(newElement, targetElement.nextSibling);
+        parent.insertBefore(newElement, targetElement.nextSibling)
       }
-    },
+    }
     //获取项目解锁的模块
     // getProjectModule(projectSn) {
     //   getProjectModuleList({ projectSn: this.$store.state.projectSn }).then(
     //     (result) => {
     //       if (result.success) {
-    //         var half = result.result;
+    //         let half = result.result;
     //         this.getAllModule(half);
     //       }
     //     }
     //   );
     // },
-  },
+  }
-};
+}
 </script>
 <style lang="less" scoped>
 .pageContainer {
@@ -473,9 +423,10 @@ export default {
   // display: inline-block;
 }
 ::-webkit-scrollbar {
-     width: 0 !important;
+  width: 0 !important;
-   }
+}
-   ::-webkit-scrollbar {
+::-webkit-scrollbar {
-     width: 0 !important;height: 0;
+  width: 0 !important;
-   }
+  height: 0;
-</style>
+}
+</style>

src/views/projectAdmin/projectList.vue

@@ -129,12 +129,12 @@
                 >
                   进入衢州版本
                 </div>
-                <div v-if="$store.state.userInfo.styleType==1"
+                <div v-if="$store.state.userInfo.styleType==1 && $store.state.userInfo.enterProjectBackType === 0"
                   class="operationText"
                   style="margin-right: 30px"
                   @click="goProjectIndex(scope.row)"
                 >{{$t('message.companyDiagram.goProjectBackEnd')}}</div>
-                <div v-if="$store.state.userInfo.styleType==1"
+                <div v-if="$store.state.userInfo.styleType===1 && $store.state.userInfo.seeEquipment === 0"
                   class="operationText"
                   @click="goDevCenter(scope.row)"
                 >{{$t('message.companyDiagram.goDevCenter')}}</div>

src/views/projectFront/equipmentManagement/leasingEquipment.vue

@@ -1406,15 +1406,16 @@ export default {
 
     },
     //下载附件
-    download(item, type) {
+    download(val) {
-      if (item) {
+      if(val =='[]'){
+        this.$message.error('未查询到附件')
+      }else{
         let arr = []
-        arr = JSON.parse(item)
+        arr = JSON.parse(val)
         arr.forEach(element => {
-          window.location.href = element.url;
+          let url = this.$http.defaults.baseURL + '/xmgl/upload/getRenameFile?fileUrl=' + this.$store.state.FILEURL + element.url + '&fileName=' + element.name
+           window.location.href = url;
         });
-      } else {
-        this.$message.success('未查询到附件')
       }
     },
 

src/views/projectFront/projectSummary/panoramaPlan.vue

@@ -12,7 +12,7 @@
             class=""
             ></el-input>
         </div>
-          <el-select style="margin-right: 10px" v-model="alarmType" class="alarmTypeBox">
+          <el-select style="margin-right: 10px" v-model="alarmType" class="alarmTypeBox" v-if="COMPANY != 'sccr'">
               <el-option v-for="(item,index) in ProgressPlanBidSectionList" :key="index" :value="item.id" :label="item.projectfName"></el-option>
           </el-select>
         <el-button type="primary" @click="loadDataTwo">
@@ -313,6 +313,7 @@ export default {
         }
     },
     created(){
+        console.log(this.COMPANY,'当前项目端')
         this.projectSn = this.$store.state.projectSn;
         this.loadData()
         this.selectProgressPlanBidSectionList()

src/views/projectFront/towerCrane/basicInfo.vue

@@ -97,7 +97,7 @@
                   :value="2">
                 </el-option>
               </el-select> -->
-          <div
+          <!-- <div
             class="nav_box"
             v-if="$route.path != '/equipmentCenter/towerCraneList'"
           >
@@ -112,10 +112,11 @@
               class="nav_item"
               :class="{ active_item: mapType == 2 }"
               @click="chekMapType(2)"
+              v-if="company != 'jlw'"
             >
               3D
             </div>
-          </div>
+          </div> -->
         </div>
         <div
           ref="imgBgBox"
@@ -1546,6 +1547,7 @@ export default {
       }
     }
     return {
+      nowCompany: null,
       company: COMPANY,
       cs: 6,
       weightSet: false,

src/views/projectFront/towerCrane/home.vue

@@ -125,10 +125,10 @@
                         <div class="head titile_box">
                             <!-- 群塔防碰撞 -->
                             <span>{{ $t('message.towerCrane.antiCollision') }}</span> 
-                            <div class="nav_box" >
+                            <!-- <div class="nav_box" >
                                 <div class="nav_item" :class="{'active_item': mapType == 1}" @click="chekMapType(1)">2D</div>
-                                <div class="nav_item" :class="{'active_item': mapType == 2}" @click="chekMapType(2)">3D</div>
+                                <div v-if="nowCompany != 'jlw'" class="nav_item" :class="{'active_item': mapType == 2}" @click="chekMapType(2)">3D</div>
-                            </div>
+                            </div> -->
                         </div>
                         <div class="svgBox" :class="{'svgBox2': isShow3D}">
                             <svg v-if="towerData.length > 0" id="svg" ref="svg" style="width: 100%; height: 100%;">
@@ -217,10 +217,12 @@
                 timer: null,
                 flag:'',
                 mapType: 1,
-                isShow3D: false
+                isShow3D: false,
+                nowCompany: null,
             }
         },
         created() {
+            this.nowCompany = COMPANY
             this.projectSn = this.sn ? this.sn:this.$store.state.projectSn;
             // this.bgUrl = this.$store.state.currentProDetail.constructionMapUrl;
             if(this.$store.state.currentProDetail){
@@ -317,7 +319,7 @@
 
                     console.log(_this.panZoomTiger, _this.towerData)
                     _this.towerData.forEach((item,index)=>{
-                        console.log(item.mapX, item.mapY,item.posteriorArmLength,item.ranger);
+                        console.log(item.mapX, item.mapY,item.posteriorArmLength,item.ranger,'群塔绘图数据');
                         // if(item.multiple){
                         //     item.forearmLength = item.forearmLength*item.multiple
                         // }
@@ -348,17 +350,30 @@
                             stroke: "#31D067",
                             strokeWidth: 0.5,
                         });
-                        item.t1 = _this.svgDom.paper.text((Number(item.mapX) - 3*item.multiple), (Number(item.mapY) + 6*item.multiple),[item.devName?item.devName: ""]).attr({
+                        // item.t1 = _this.svgDom.paper.text((Number(item.mapX) - 3*item.multiple), (Number(item.mapY) + 6*item.multiple -10),[item.devName?item.devName: ""]).attr({
+                        //     fill: "#000",
+                        //     fontSize: "12px"
+                        // })
+
+                        item.t1 = _this.svgDom.paper.text((Number(item.mapX)-6*item.multiple), (Number(item.mapY) - (item.forearmLength*item.multiple)/2 ),[item.devName?item.devName: ""]).attr({
                             fill: "#000",
                             fontSize: "12px"
                         })
                         //  forearmLength  前臂长
-                        item.t2 = _this.svgDom.paper.text((Number(item.mapX)-6*item.multiple), (Number(item.mapY) - (item.forearmLength*item.multiple)/2),[this.$t('message.towerCrane.forearmLength')+':',item.forearmLength?item.forearmLength: "0", "m"]).attr({
+                        // item.t2 = _this.svgDom.paper.text((Number(item.mapX)-6*item.multiple), (Number(item.mapY) - (item.forearmLength*item.multiple)/2),[this.$t('message.towerCrane.forearmLength')+':',item.forearmLength?item.forearmLength: "0", "m"]).attr({
+                        //     fill: "#000",
+                        //     fontSize: "12px"
+                        // })
+                        item.t2 = _this.svgDom.paper.text((Number(item.mapX)-6*item.multiple), (Number(item.mapY) - (item.forearmLength*item.multiple)/2 -35),[this.$t('message.towerCrane.forearmLength')+':',item.forearmLength?item.forearmLength: "0", "m"]).attr({
                             fill: "#000",
                             fontSize: "12px"
                         })
                         //  boomHeight  大臂高
-                        item.t3 = _this.svgDom.paper.text(Number(item.mapX)-4*item.multiple, Number(item.mapY) - (item.forearmLength*item.multiple)/12,[this.$t('message.towerCrane.boomHeight')+':',item.towerHeight?item.towerHeight: "0", "m"]).attr({
+                        // item.t3 = _this.svgDom.paper.text(Number(item.mapX)-4*item.multiple, Number(item.mapY) - (item.forearmLength*item.multiple)/12,[this.$t('message.towerCrane.boomHeight')+':',item.towerHeight?item.towerHeight: "0", "m"]).attr({
+                        //     fill: "#000",
+                        //     fontSize: "12px"
+                        // })
+                        item.t3 = _this.svgDom.paper.text((Number(item.mapX)-6*item.multiple), (Number(item.mapY) - (item.forearmLength*item.multiple)/2 -15),[this.$t('message.towerCrane.boomHeight')+':',item.towerHeight?item.towerHeight: "0", "m"]).attr({
                             fill: "#000",
                             fontSize: "12px"
                         })
@@ -538,6 +553,7 @@
                                         // console.log(value);
                                         if (!isNaN(value[0])) {
                                             if(_this.towerData[i].t2 && _this.towerData[i].b && _this.towerData[i].c){
+                                                _this.towerData[i].t1.transform(new Snap.Matrix().rotate(value[0], _this.towerData[i].mapX, _this.towerData[i].mapY));
                                                 _this.towerData[i].t2.transform(new Snap.Matrix().rotate(value[0], _this.towerData[i].mapX, _this.towerData[i].mapY));
                                                 _this.towerData[i].t3.transform(new Snap.Matrix().rotate(value[0], _this.towerData[i].mapX, _this.towerData[i].mapY));
                                                 _this.towerData[i].b.transform(new Snap.Matrix().rotate(value[0], _this.towerData[i].mapX, _this.towerData[i].mapY));

src/views/projectFront/towerCrane/monitoringStatistics.vue

@@ -340,12 +340,12 @@
                     radar: {
                         // shape: 'circle',
                         indicator: [
-                            { name: this.$t('message.towerCrane.limit') + '(' + this.dataList1[0] + ')', max: this.maxNum+12}, // 限位
+                            { name: this.$t('message.towerCrane.limit'), max: this.maxNum+12}, // 限位
-                            { name: this.$t('message.towerCrane.dipAngle') + '(' + this.dataList1[1] + ')', max: this.maxNum+12}, // 倾角
+                            { name: this.$t('message.towerCrane.dipAngle'), max: this.maxNum+12}, // 倾角
-                            { name: this.$t('message.towerCrane.moment') + '(' + this.dataList1[2] + ')', max: this.maxNum+12}, // 力矩
+                            { name: this.$t('message.towerCrane.moment'), max: this.maxNum+12}, // 力矩
-                            { name: this.$t('message.towerCrane.restrictedArea') + '(' + this.dataList1[3] + ')',max: this.maxNum+12}, // 限行区
+                            { name: this.$t('message.towerCrane.restrictedArea'),max: this.maxNum+12}, // 限行区
-                            { name: this.$t('message.towerCrane.rotation') + '(' + this.dataList1[4] + ')', max: this.maxNum+12}, // 回转
+                            { name: this.$t('message.towerCrane.rotation'), max: this.maxNum+12}, // 回转
-                            { name: this.$t('message.towerCrane.antiCollisionTwo') + '(' + this.dataList1[5] + ')', max: this.maxNum+12} // 防碰撞
+                            { name: this.$t('message.towerCrane.antiCollisionTwo'), max: this.maxNum+12} // 防碰撞
                         ],
                         splitLine: { //     // 网格线
                             lineStyle: {

src/views/projectFront/waterManage/relaTimeData.vue

@@ -68,10 +68,10 @@
                   <div class="value">
                     {{
                       gateStatus == 1
-                        ? $t('message.energyManage.open')
+                        ? "开"
                         : gateStatus == 2
-                        ? $t('message.energyManage.close')
+                        ? "关"
-                        : $t('message.energyManage.not')
+                        : "无"
                     }}
                   </div>
                 </div>
@@ -91,7 +91,8 @@
                   <div class="left">
                     <img src="@/assets/images/waterAndElectricity/gross.png" />
                     <div>
-                      {{ $t('message.energyManage.nowAmmeter') }}
+                      <!-- {{ $t('message.energyManage.nowAmmeter') }} -->
+                      当前水表读数
                       <!-- 当前电表读数 -->
                     </div>
                   </div>