修复南昌地铁的bug

src/assets/js/http.js

@@ -83,10 +83,6 @@ if (COMPANY == 'henan') {
     axios.defaults.baseURL = 'http://124.71.178.44:100/'
 }
 
-// tag: 河南
-if (COMPANY == 'xingxuan') {
-    axios.defaults.baseURL = 'http://124.71.178.44:9000/'
-}
 // axios.defaults.baseURL = store.getters.BASEURL //'http://124.71.178.44:100/'axios.defaults.timeout = 600000;
 
 // console.log('store.state.userInfo',store)

src/components/account.vue

@@ -25,17 +25,36 @@
                 <img src="@/assets/images/sjzx.png" width="15px" height="15px" />
                 <span>数据中心</span>
               </div> -->
+          <!--  项目后台 -->
           <div
             class="width_100"
             @click="goProjectBackstage"
             v-if="
               $store.state.userInfo.accountType != 5 &&
-              $store.state.userInfo.accountType != 6&&$store.state.userInfo.enterProjectBackType==0
+              $store.state.userInfo.accountType != 6&&$store.state.userInfo.enterProjectBackType==0 
             "
           >
             <img src="@/assets/images/xmht.png" width="15px" height="15px" />
             <span>{{ $t("message.companyDiagram.projectBackEnd") }}</span>
           </div>
+          <!--  设备中台 -->
+          <!-- <div
+            class="width_100"
+            @click="goDevcenter"
+            v-if="messageB = 1"
+            >
+            <img src="@/assets/images/xmht.png" width="15px" height="15px" />
+            <span>{{ $t("message.companyDiagram.devCenter") }}</span>
+          </div> -->
+          <!--  企业前台 -->
+          <!-- <div
+            class="width_100"
+            @click="goProjectBackstage"
+            >
+            <img src="@/assets/images/xmht.png" width="15px" height="15px" />
+            <span>企业前台</span>
+          </div> -->
+          <!-- // 企业后台 -->
           <div
             class="width_100"
             @click="goto2"
@@ -48,6 +67,7 @@
             <!-- <span>{{$t('message.companyDiagram.operatingCenter')}}</span> -->
             <span>企业后台</span>
           </div>
+          <!-- // 资料中心 -->
           <div
             class="width_100"
             @click="goto4"
@@ -87,11 +107,16 @@
 export default {
   data() {
     return {
+      messageB:'',
       seeEquipment: 1, //是否能查看设备中台，0是，1否
     };
   },
   mounted() {
     this.seeEquipment = this.$store.state.userInfo.seeEquipment;
+    this.$EventBus.$on('aMsg',(data)=>{
+      this.messageB = data
+        // console.log('赋值过来的是什么呢',this.messageB)
+    })
   },
   methods: {
     sendMsg2() {
@@ -201,6 +226,7 @@ export default {
 
     //去项目后台
     goProjectBackstage() {
+      this.messageB = '1'
       var url = window.location.href;
       let routeUrl = '';
       // 判断当前页面是不是设备中台
@@ -219,6 +245,28 @@ export default {
       window.open(routeUrl.href, "_self");
       window._paq.push(['trackEvent', '点击', '项目后台','进入项目后台' ])
     },
+    // 去设备中台
+    goDevcenter(){
+      this.messageB = '2'
+      console.log('改了吗',this.messageB)
+      var url = window.location.href;
+      let routeUrl = '';
+      // 判断当前页面是不是设备中台
+      if (url.indexOf("equipmentCenter.html") != -1) {
+        // 南昌项目打开的是/index.html#/ 的页面
+        if(COMPANY == 'nanchang') {
+          window.open("/index.html#/projectList", "_self");
+        }else{
+          window.open("/#/projectList", "_self");
+        }
+      } else {
+        routeUrl = this.$router.resolve({
+          path: "/projectList",
+        });
+      }
+      window.open(routeUrl.href, "_self");
+      window._paq.push(['trackEvent', '点击', '项目后台','进入项目后台' ])
+    }
   },
 };
 </script>

src/router/index.js

@@ -1287,6 +1287,11 @@ const routes2 = [
         name: 'projectIndex',
         component: () => import('../views/projectAdmin/projectIndex.vue'),
     },
+    {
+        path: '/equipmentCenterIndx',
+        name: 'equipmentCenterIndx',
+        component: () => import('../views/equipmentCenter/equipmentCenterIndex.vue'),
+    },
     {
         path: '/project/panoramicOverview',
         name: 'panoramicView',

src/views/projectAdmin/projectList.vue

@@ -130,7 +130,7 @@
                 >{{$t('message.companyDiagram.goProjectBackEnd')}}</div>
                 <div v-if="$store.state.userInfo.styleType==1"
                   class="operationText"
-                  @click="goDevCenter(scope.row)"
+                  @click="goToDevCenter(scope.row)"
                 >{{$t('message.companyDiagram.goDevCenter')}}</div>
               </template>
             </el-table-column>
@@ -165,6 +165,8 @@ export default {
   components: { vhead },
   data() {
     return {
+      messageA: '1', //进入后台判断条件
+      msg:'1',
       userInfo: "",
       searchForm: {
         firstCompanyId: "",
@@ -361,12 +363,26 @@ export default {
         });
         window.open(routeUrl.href, "_self");
       window._paq.push(['trackEvent', '点击', '项目后台','进入项目后台' ])
+      //给一个判断条件
+      this.$EventBus.$emit('aMsg',this.messageA)
+      // console.log('点击操作中项目传入为1',this.messageA)
     },
     //去设备中台
-    goDevCenter(value) {
+    // goToDevCenter(value) {
+    //   this.$store.commit("setProjectSn", value.projectSn);
+    //   window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self");
+    //   window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]);
+    // },
+    goToDevCenter(value) {
       this.$store.commit("setProjectSn", value.projectSn);
-      window.open("/equipmentCenter.html#/equipmentCenterIndx", "_self");
+      let routeUrl = this.$router.resolve({
-      window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ])
+              path: '/equipmentCenterIndx'
+        });
+      window.open(routeUrl.href, "_self");
+      window._paq.push(['trackEvent', '点击', '设备中台','进入设备中台' ]);
+      this.messageA = '2'
+      this.$EventBus.$emit('aMsg',this.messageA)
+      // console.log('点击操作中项目传入为2',this.messageA)
     },
   },
 };

src/views/projectFront/epidemicPrevention/passingData.vue

@@ -138,6 +138,7 @@ export default {
       dataIndex: 0,
       projectList: [],
       projectSn: "",
+      userEnterpriseId:'',
       enterpriseId: "",
       statisticalData: {
         workerNum: 0, //实名人数
@@ -155,6 +156,7 @@ export default {
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
+    this.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
   },
   mounted() {
     this.getProjectList();
@@ -474,9 +476,10 @@ export default {
       selectProjectAllEnterpriseList({
         projectSn: this.projectSn,
         enterpriseName: this.searchWord,
+        userEnterpriseId:this.userEnterpriseId
       }).then((res) => {
         if (res.code == 200) {
-          console.log(res);
+          console.log('企业列表的信息',res);
           this.projectList = res.result;
           this.enterpriseId = this.projectList[0].enterpriseId;
           this.enterpriseName = this.projectList[0].name;

src/views/projectFront/laborManage/overview.vue

@@ -461,6 +461,7 @@ export default {
   //   },
   data() {
     return {
+      userEnterpriseId:'',
       timer1: null,
       timer2: null,
       statictisData: {
@@ -717,6 +718,7 @@ export default {
     getCompanyData() {
       selectEnterpriseAttendanceCountApi({
         projectSn: this.$store.state.projectSn,
+        userEnterpriseId: this.$store.state.userInfo.userEnterpriseId
       }).then((res) => {
         this.statictisData = res.result;
         if (res.result.list.length > 0) {

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -2454,11 +2454,11 @@ export default {
     this.uploadUrl = this.$store.state.UPLOADURL;
     this.fileUrl = this.$store.state.FILEURL;
     let data = JSON.parse(sessionStorage.getItem("vuex"));
-    console.log('vuex信息',data)
+    // console.log('vuex信息',data)
     data.menuList.forEach((item)=>{
       if(item.actionList){
          item.actionList.forEach((item2)=>{
-          if(item2.actionCode == 'akey_issued'){
+          if(item2.actionCode = 'akey_issued'){
               this.key = true
           }
         })

src/views/projectFront/laborManage/reportCenter.vue

@@ -26,6 +26,7 @@ export default {
   data() {
     return {
       projectSn: "",
+      userEnterpriseId:'',
       listData: [
         { id: 1, name: this.$t('message.laborMange.companyAttendanceRanking') },
       ],
@@ -34,6 +35,7 @@ export default {
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
+    this.userEnterpriseId = this.$store.state.userInfo.userEnterpriseId;
     this.checkedId = this.listData[0].id;
     this.getListData();
   },
@@ -41,8 +43,10 @@ export default {
     getListData() {
       let data = {
         projectSn: this.projectSn,
+        userEnterpriseId: this.userEnterpriseId
       };
       selectProjectComapnyWorkTotalListApi(data).then((res) => {
+        console.log('res',res)
         if (res.code == 200) {
           var Data = res.result;
           var xData = [],