合并冲突

public/js/config.js

@@ -9,7 +9,7 @@ var COMPANY = ""; //通用
 // COMPANY = 'henan' // 河南春笋
 // COMPANY = 'xingxuan'//星璇
 // COMPANY = 'hengtong'//瑞士恒通
-// COMPANY = 'yunlian'//云联万物
+COMPANY = 'yunlian' //云联万物
     // COMPANY = 'neimenggu'//内蒙古项目
     // COMPANY = 'zjsj'//中建四局
     // COMPANY = 'zjwj'//中建五局
@@ -18,7 +18,7 @@ var COMPANY = ""; //通用
     // COMPANY = 'jlw'//金林湾
     // COMPANY = 'shzj' //上海张江
     // COMPANY = 'shjg'//上海优益（上海建工）
-// COMPANY = "agjt"; //鞍钢集团
+    // COMPANY = "agjt"; //鞍钢集团|中新建鞍钢版本
     // COMPANY = 'zkax' //中科安信
     // COMPANY = 'hfqc' //乌丹站舍(合肥启程)
     // COMPANY = 'mulei'   //木垒

src/assets/js/http.js

@@ -202,7 +202,8 @@ if (process.env.NODE_ENV == "development") {
     // axios.defaults.baseURL = "http://jxj.zhgdyun.com:18000"; //包头化工
     // axios.defaults.baseURL = "http://222.80.185.228:6090"; //木垒
     // axios.defaults.baseURL = "https://zm.zhgdyun.com:11111";
-    // axios.defaults.baseURL = "http://121.37.106.37:9809";
+    // // axios.defaults.baseURL = "http://121.37.106.37:9809";
+    // axios.defaults.baseURL = "http://139.9.66.234:20628";
 } else if (process.env.NODE_ENV == "debug") {
     axios.defaults.baseURL = "https://www.ceshi.com";
 } else if (process.env.NODE_ENV == "production") {

src/store/index.js

@@ -48,6 +48,8 @@ export default new Vuex.Store({
 
     state: {
         PAGESIZRS: [10, 20, 30, 50],
+        UPLOADURL: 'http://139.9.66.234:20628/upload/image/', // 云联万物线上
+        FILEURL: 'http://139.9.66.234:20628/image/', //云联万物线上
         // UPLOADURL: 'http://183.249.224.118:9000/upload/image/', // 嘉兴王江泾
         // FILEURL: ' http://183.249.224.118:9000/image/', // 嘉兴王江泾
         // UPLOADURL: 'http://192.168.0.12:9809/upload/image/', // 国维科技

src/views/companyAdmin/layout.vue

@@ -55,8 +55,8 @@
         mode="horizontal"
         @select="handleSelect"
         active-text-color="#5181F6"
-        router
       >
+      <!-- router -->
         <div class="wrapper" ref="wrapper">
           <div class="cont" ref="cont">
             <div
@@ -67,7 +67,8 @@
               <el-menu-item
                 class="firstLevelMenu"
                 v-if="!hasSubMenu(item.menuList)"
-                :index="item.modulePath"
+                :index="item.modulePath ? item.modulePath : item.embedUrl"
+
               >
                 {{ item.moduleName }}
               </el-menu-item>
@@ -212,6 +213,13 @@ export default {
     handleSelect(url) {
       // this.$store.commit('setCurrentUrl',url)
       // this.$store.dispatch('currentUrl',url)
+      console.log(1111, url, this.menuList);
+      if(url.includes("http://")) {
+        window.open(url);
+        return;
+      } else {
+        this.$router.push(url);
+      }
     },
     back() {
       this.$router.push("/firm/projectManage");