fix: BUG修改

src/assets/js/http.js

@@ -83,11 +83,11 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
-  axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
+  // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
   // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
   // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
 

src/components/account.vue

@@ -119,6 +119,19 @@
             <!-- <span>{{ $t("message.docManage.fileCenter") }}</span> -->
             <span>{{ dataCenter }}</span>
           </div>
+          <!--  项目前台 -->
+          <div
+            class="width_100"
+            @click="goto6()"
+            v-if="
+              $route.path.indexOf('/firm/projectManage') == -1 &&
+              $store.state.userInfo.accountType == 5
+            "
+            :title="projectFront"
+          >
+            <img src="@/assets/images/xmht.png" width="15px" height="15px" />
+            <span>{{ projectFront }}</span>
+          </div>
         </div>
 
         <div class="flex2 logout" @click="loginOut">
@@ -158,7 +171,8 @@ export default {
       headerConfiguration: '公司管理员', //标头配置
       enterpriseFront: '企业前台', //企业前台
       equipmentChina: '设备中台', //设备中台
-      dataCenter: '资料中心' //资料中心
+      dataCenter: '资料中心', //资料中心
+      projectFront: '项目前台' //项目前台
     }
   },
   watch: {
@@ -273,6 +287,9 @@ export default {
     goto5() {
       window.open('/index.html#/firm/projectManage', '_self')
     },
+    goto6() {
+      window.open('/index.html#/firm/projectFront', '_self')
+    },
     loginOut() {
       this.$store.currentProDetail = {}
       // this.$store.commit('setUserInfo', null)

src/components/layout.vue

@@ -3,9 +3,9 @@
     <vhead showR="true"></vhead>
     <!-- 点击标题跳转项目概况首页，菜单导航栏渲染的数据是vuex中的projectManageMenuList -->
     <div
-      v-if="tabsShow && $route.path.indexOf('/firm/') != -1"
+      v-if="tabsShow && ($route.path.indexOf('/firm/') != -1 || $route.path.indexOf('/page') != -1)"
       class="menuBox"
-      :class="{ big: $route.path.indexOf('/firm/') != -1 }"
+      :class="{ big: ($route.path.indexOf('/firm/') != -1 || $route.path.indexOf('/page') != -1) }"
     >
       <el-menu
         :default-active="$route.path"
@@ -138,10 +138,15 @@
     </div>
     <div class="pageContainer">
       <div class="pageDataContainer">
+        <template v-if="moduleData.pathType == 1 || !moduleData.pathType">
           <keep-alive>
             <router-view v-if="$route.meta.keepAlive"></router-view>
           </keep-alive>
           <router-view v-if="!$route.meta.keepAlive"></router-view>
+        </template>
+        <template v-else>
+          <iframe :key="key" :src="moduleData.embedUrl" frameborder="0" style="width: 100%;height: 100%;"></iframe>
+        </template>
       </div>
     </div>
     <!-- <el-backtop target=".pages"></el-backtop> -->
@@ -161,11 +166,23 @@ export default {
       currentUrl: "",
       scroll: '',
       company: COMPANY,
-      isIframe: false
+      isIframe: false,
+      moduleData: {
+        pathType: 1
+      }, // 点击的模块数据
+      key: new Date().getTime()
     };
   },
+  created() {
+    this.moduleData = this.$store.state.menuList[0]
+    if(this.$route.path != this.$store.state.menuList[0].modulePath){
+      this.$router.push(this.$store.state.menuList[0].modulePath);
+    }
+    console.log(this.$store.state.menuList,'7778888')
+    console.log(this.moduleData,'7778888')
+  },
   mounted() {
-    // console.log("mounted", this.$route.path);
+    console.log("mounted", this.$route);
     this.$nextTick(() => {
       let timer = setTimeout(() => {
         if (timer) {
@@ -188,6 +205,8 @@ export default {
 
   methods: {
     clickItem(item) {
+      console.log(item)
+      this.moduleData = item;
       //金林湾跳转
       if (this.company == 'jlw') {
         if (item.menuName == '工地可视化') {
@@ -203,6 +222,7 @@ export default {
         window._paq.push(['trackEvent', '点击', item.moduleName ? item.moduleName : item.menuName, '切换到' + (item.moduleName ? item.moduleName : item.menuName)]);
 
       }
+      this.$forceUpdate();
     },
     hasSubMenu(list) {
       //用于判断有没有下级菜单
@@ -264,6 +284,14 @@ export default {
       this.reload;
     }
   },
+  watch: {
+    $route: {
+      handler(val) {
+        this.key = new Date().getTime();
+      },
+      immediate: true
+    }
+  }
 };
 </script>
 <style lang="less" scoped>

src/pages/equipmentCenter/equipmentCenter.js

@@ -38,6 +38,7 @@ if (COMPANY == 'xingxuan') {
       ? data.menuAuthority.moduleList
       : [];
     var companyModule = [];
+    let projectModule = [];
     if (moduleList.length == 0 && data.accountType != 1) {
       Message.warning("当前账号还没分配权限");
       return false;
@@ -46,6 +47,9 @@ if (COMPANY == 'xingxuan') {
       if (element.moduleType == 1) {
         companyModule.push(element);
       }
+      if(element.moduleType == 5){
+        projectModule.push(element);
+      }
     });
     var menu2 = [
       {
@@ -106,7 +110,11 @@ if (COMPANY == 'xingxuan') {
         // } else {
         //   router.push("/projectV2/taskList");
         // }
+        store.commit("setMenuList", projectModule);
+        store.commit("setProjectManageMenuList",projectModule)
+        store.commit("setIsShowBackIndex", false);
         store.commit("setProjectSn", data.sn);
+        router.push(projectModule[0].modulePath);
         break;
       case 6:
         // if (data.styleType == 1 || !data.styleType) {

src/pages/index/index.js

@@ -75,6 +75,7 @@ if (COMPANY == 'xingxuan') {
       ? data.menuAuthority.moduleList
       : []
     var companyModule = []
+    var projectModule = []
     if (moduleList.length == 0 && data.accountType != 1) {
       Message.warning('当前账号还没分配权限')
       return false
@@ -83,6 +84,9 @@ if (COMPANY == 'xingxuan') {
       if (element.moduleType == 1) {
         companyModule.push(element)
       }
+      if (element.moduleType == 5) {
+        projectModule.push(element)
+      }
     })
     var menu2 = [
       {
@@ -130,7 +134,11 @@ if (COMPANY == 'xingxuan') {
 
         break
       case 5:
+        store.commit('setMenuList', projectModule)
+        store.commit('setProjectManageMenuList', projectModule)
+        store.commit('setIsShowBackIndex', false)
         store.commit('setProjectSn', data.sn)
+        router.push(projectModule[0].modulePath)
         break
       case 6:
         store.commit('setProjectSn', data.sn)
@@ -153,6 +161,7 @@ function handler(data, sn) {
     ? data.menuAuthority.moduleList
     : []
   var companyModule = []
+  var projectModule = []
   if (moduleList.length == 0 && data.accountType != 1) {
     return false
   }
@@ -160,6 +169,9 @@ function handler(data, sn) {
     if (element.moduleType == 1) {
       companyModule.push(element)
     }
+    if (element.moduleType == 5) {
+      projectModule.push(element)
+    }
   })
   var 菜单 = [
     { menuName: '企业管理', id: 9199, path: '/registerAudit' },
@@ -186,6 +198,9 @@ function handler(data, sn) {
       break
     case 5:
     case 6:
+      store.commit('setMenuList', projectModule)
+      store.commit('setProjectManageMenuList', projectModule)
+      store.commit('setIsShowBackIndex', false)
       if (PROJECT_TYPE != 'zjsj') {
         //看看项目看板内有没有菜单
         let arr = data.menuAuthority.moduleList

src/router/index.js

@@ -56,7 +56,7 @@ const routes2 = [
   //     component: () => import('../views/homeTwo/authorization.vue')
   // },
   {
-    path: "/page",
+    path: "/page/*",
     name: "page5",
     component: () => import("@/components/layout.vue"),
     children: [
@@ -100,6 +100,11 @@ const routes2 = [
         component: () =>
           import("@/views/companyFront/peopleManage/peopleManage.vue"),
       },
+      {
+        path: "/firm/projectFront",
+        name: "firmprojectFront",
+        component: () => import("@/views/projectFront/project/overview.vue"),
+      },
       {
         path: "/firm/projectManage",
         name: "firmprojectManage",

src/views/companyAdmin/companyDiagram.vue

@@ -924,6 +924,14 @@
             :label="i.moduleId"
             >{{ i.moduleName }}</el-checkbox
           >
+          <div class="CheckboxTitle">项目前台模块</div>
+          <el-checkbox
+            v-if="i.moduleType === 5"
+            v-for="i in checkArr"
+            :key="i.moduleId"
+            :label="i.moduleId"
+            >{{ i.moduleName }}</el-checkbox
+          >
         </el-checkbox-group>
         <div class="dialog-footer">
           <el-button

src/views/equipmentCenter/equipmentCenterIndex.vue

@@ -325,7 +325,7 @@ var arr = this.$store.state.userInfo.menuAuthority.moduleList
       });
     },
     getAllModule(half){
-      getAllModuleApi({moduleType:2}).then(res => {
+      getAllModuleApi({moduleType:2, styleType: this.$store.state.userInfo.styleType}).then(res => {
           if (res.success) {
               var all = res.result
               // console.log(res)

src/views/home/login_v1.vue

@@ -744,6 +744,7 @@ export default {
         ? data.menuAuthority.moduleList
         : []
       var companyModule = []
+      var projectModule = []
       if (moduleList.length == 0 && data.accountType != 1) {
         this.$message.warning('当前账号还没分配权限')
         return false
@@ -752,6 +753,9 @@ export default {
         if (element.moduleType == 1) {
           companyModule.push(element)
         }
+        if (element.moduleType == 5) {
+          projectModule.push(element)
+        }
       })
       var menu2 = [
         {
@@ -785,6 +789,7 @@ export default {
         //   path: '/brand'
         // }
       ]
+      console.log(data.accountType,'777888')
       switch (data.accountType) {
         case 1:
           this.$store.commit('setMenuList', menu2)
@@ -820,6 +825,9 @@ export default {
         case 5:
         case 6:
           // 中建四局
+          this.$store.commit('setMenuList', projectModule)
+          this.$store.commit('setProjectManageMenuList', projectModule)
+          this.$store.commit('setIsShowBackIndex', false)
           if (this.projectType == 'zjsj') {
             console.log('是这里吗', data)
             //看看项目看板内有没有菜单

src/views/homeTwo/login_v1.vue

@@ -390,6 +390,7 @@ export default {
         ? data.menuAuthority.moduleList
         : [];
       var companyModule = [];
+      var projectModule = [];
       if (moduleList.length == 0 && data.accountType != 1) {
         this.$message.warning("当前账号还没分配权限");
         return false;
@@ -398,6 +399,9 @@ export default {
         if (element.moduleType == 1) {
           companyModule.push(element);
         }
+        if (element.moduleType == 5) {
+          projectModule.push(element);
+        }
       });
       var menu2 = [
         {
@@ -454,6 +458,9 @@ export default {
           this.$router.push(companyModule[0].modulePath);
           break;
         case 5:
+          this.$store.commit("setMenuList", projectModule);
+          this.$store.commit("setProjectManageMenuList",projectModule)
+          this.$store.commit("setIsShowBackIndex", false);
           if ((data.styleType != 2 && data.styleType != 3) || !data.styleType) {
             this.$router.push("/projectIndex");
           } else {

src/views/jxjadmin/moduleMenuManage.vue

@@ -220,6 +220,18 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="内容类型" prop="pathType">
+              <el-radio-group v-model="addEditForm.pathType">
+                <el-radio :label="1">内部模块内容</el-radio>
+                <el-radio :label="2">嵌入url内容</el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <el-form-item label="嵌入url" prop="embedUrl" v-if="addEditForm.pathType == 2">
+              <el-input
+                v-model="addEditForm.embedUrl"
+                :placeholder="$t('message.alarmValueSet.placeholder')"
+              ></el-input>
+            </el-form-item>
             <el-form-item
               v-show="addEditForm.moduleType == 2"
               label="项目模块类型"
@@ -638,6 +650,8 @@ export default {
         moduleDesc: '',
         moduleIcon2: '',
         moduleType: 1,
+        pathType: 1,
+        embedUrl: '',
         plugin: '',
         moduleEquipment: '',
         appName: '',
@@ -726,7 +740,7 @@ export default {
         ]
       },
       btnList: [],
-      moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板'],
+      moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台'],
       searchModuleType: 2,
       styleTypeArr: [
         '普通项目级版本',
@@ -775,6 +789,8 @@ export default {
         modulePath: '',
         moduleDesc: '',
         moduleType: 1,
+        pathType: 1,
+        embedUrl: '',
         appName: '',
         labelName: '',
         labelSortNum: 0,
@@ -1066,6 +1082,8 @@ export default {
         modulePath: '',
         moduleDesc: '',
         moduleType: 1,
+        pathType: 1,
+        embedUrl: '',
         appName: '',
         labelName: '',
         labelSortNum: 0,

src/views/jxjadmin/registerAudit.vue

@@ -199,6 +199,10 @@
               <el-checkbox v-if="i.moduleType === 4" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
                 i.moduleName
               }}</el-checkbox>
+              <div class="CheckboxTitle">项目前台模块</div>
+              <el-checkbox v-if="i.moduleType === 5" v-for="i in companyArr" :key="i.moduleId" :label="i.moduleId">{{
+                i.moduleName
+              }}</el-checkbox>
             </el-checkbox-group>
           </el-col>
         </el-row>

src/views/jxjadmin/systemSettings.vue

@@ -123,7 +123,16 @@
               </el-form-item>
             </el-col>
           </el-row>
-
+          <el-row :gutter="12">
+            <el-col :span="6">
+              <el-form-item label="项目前台" prop="projectFront">
+                <el-input
+                  style="width: 150px"
+                  v-model="form.projectFront"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
           <el-row :gutter="12">
             <el-col :span="6">
               <el-form-item :label="'登录页面logo'" prop="loginLogo">
@@ -247,6 +256,7 @@ export default {
         enterpriseFront: '', //企业前台
         projectBackground: '', //项目后台
         equipmentChina: '', //设备中台
+        projectFront: '', // 项目前台
         dataCenter: '', //资料中心
         loginTimeOut:1,
         zoomType:0,