浏览代码

adm:feat> 修改bug,优化项目切换

shaun-sheep 4 年之前
父节点
当前提交
e53b3e1b0a

+ 1 - 1
src/components/model/file/addFolder.vue

@@ -11,7 +11,7 @@
           class="demo-ruleForm"
         >
           <el-form-item label="文件夹名称" prop="name">
-            <el-input v-model="ruleForm.name"  @keyup.enter.native="addFolder" focus></el-input>
+            <el-input v-model.trim="ruleForm.name"  @keyup.enter.native="addFolder" focus></el-input>
           </el-form-item>
         </el-form>
       </div>

+ 1 - 1
src/components/model/file/changeFolderName.vue

@@ -16,7 +16,7 @@
           class="demo-ruleForm"
         >
           <el-form-item label="文件夹名称" prop="name">
-            <el-input v-model="ruleForm.name" @keyup.enter.native="changeFolder" focus></el-input>
+            <el-input v-model.trim="ruleForm.name" @keyup.enter.native="changeFolder" focus></el-input>
           </el-form-item>
         </el-form>
       </div>

+ 7 - 284
src/framework/layout/layout-store.js

@@ -2,6 +2,8 @@ import frameworkApi from '@/api/framework'
 import storage from '@/framework/utils/storage'
 import lStorage from '@/utils/localStorage'
 
+import project from "./project";
+
 const KEY_MENU_SELECTED = 'menu_selected'
 const KEY_PROJECT_SELECTED = 'global_project_selected'
 const KEY_PAGE_BRANDCRUMB = 'page_brandcrumb'
@@ -24,286 +26,7 @@ export default {
     },
     projectId: 'Pj1101051029',
     group_code: '',
-    // projects: [ // 14 全平台测试环境
-    //   {
-    //     id: "Pj1101051029",
-    //     name: "北京万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   },
-    //   {
-    //     id: "Pj1101050029",
-    //     name: "东坝万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   },
-    //   {
-    //     id: "Pj4403070003",
-    //     name: "深圳龙岗万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   },
-    //   {
-    //     id: "Pj5001120003",
-    //     name: "香港置地约克北郡",
-    //     pwd: "saga123456",
-    //     group_code: "XG"
-    //   },
-    //
-    //   {
-    //     id: "Pj1101050013",
-    //     name: "BIM测试项目_亚投行",
-    //     pwd: "saga123456",
-    //     group_code: "BT"
-    //
-    //   },
-    //   {
-    //     id: "Pj1101080259",
-    //     name: "博锐尚格北京总部办公楼",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //
-    //   },],
-    // projects: [// 39环境
-    //   {
-    //     id: "Pj4501030002",
-    //     name: "南宁万象城",
-    //     pwd: "saga123456",
-    //     group_code: "HR"
-    //   }, {
-    //     id: "Pj4403050002",
-    //     name: "深圳万象天地",
-    //     pwd: "saga123456",
-    //     group_code: "HR"
-    //   }, {
-    //     id: "Pj1101051029",
-    //     name: "北京万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj0001110001",
-    //     name: "飞龙商场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj1101050029",
-    //     name: "东坝万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj4403070003",
-    //     name: "深圳龙岗万达广场",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj4403050019",
-    //     name: "招商深圳太子广场汇港二期",
-    //     pwd: "saga123456",
-    //     group_code: "ZS"
-    //   }, {
-    //     id: "Pj5001120003",
-    //     name: "香港置地约克北郡",
-    //     pwd: "saga123456",
-    //     group_code: "XG"
-    //   }, {
-    //     id: "Pj3201110003",
-    //     name: "弘阳集团弘云智慧管理平台",
-    //     pwd: "saga123456",
-    //     group_code: "HY"
-    //   }, {
-    //     id: "Pj3702020002",
-    //     name: "青岛海天中心",
-    //     pwd: "saga123456",
-    //     group_code: "GX"
-    //   }, {
-    //     id: "Pj1101010006",
-    //     name: "亚投行",
-    //     pwd: "saga123456",
-    //     group_code: "BT"
-    //   }, {
-    //     id: "Pj1101050013",
-    //     name: "BIM测试项目_亚投行",
-    //     pwd: "saga123456",
-    //     group_code: "BT"
-    //   }, {
-    //     id: "Pj1101080259",
-    //     name: "博锐尚格北京总部办公楼",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   }, {
-    //     id: "Pj1101150002",
-    //     name: "华润生命科学园",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj3101150007",
-    //     name: "招商上海森兰花园城",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj5101080004",
-    //     name: "成都招商花园城",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj3201130004",
-    //     name: "招商南京燕子矶花园城",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj3702120001",
-    //     name: "金融中心",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   }, {
-    //     id: "Pj1101051130",
-    //     name: "万达模型测试项目2",
-    //     pwd: "saga123456",
-    //     group_code: "WD"
-    //   } ,{
-    //     id: "Pj0002220001",
-    //     name: "数字化交付01",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220002",
-    //     name: "数字化交付02",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220003",
-    //     name: "数字化交付03",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220004",
-    //     name: "数字化交付04",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220005",
-    //     name: "数字化交付05",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220006",
-    //     name: "数字化交付06",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220007",
-    //     name: "数字化交付07",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220008",
-    //     name: "数字化交付08",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220009",
-    //     name: "数字化交付09",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   },{
-    //     id: "Pj0002220010",
-    //     name: "数字化交付10",
-    //     pwd: "saga123456",
-    //     group_code: "BR"
-    //   }
-    // ],
-    projects: [// 18环境
-      {
-        id: "Pj1101051029",
-        name: "北京万达广场",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj0001110001",
-        name: "飞龙商场",
-        pwd: "saga123456",
-        group_code: "MK"
-      }, {
-        id: "Pj0001110002",
-        name: "常州常武",
-        pwd: "saga123456",
-        group_code: "MK"
-      }, {
-        id: "Pj1101050029",
-        name: "东坝万达广场",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj4403070003",
-        name: "深圳龙岗万达广场",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj4403050019",
-        name: "招商深圳太子广场汇港二期",
-        pwd: "saga123456",
-        group_code: "ZS"
-      }, {
-        id: "Pj5001120003",
-        name: "香港置地约克北郡",
-        pwd: "saga123456",
-        group_code: "XG"
-      }, {
-        id: "Pj3201110003",
-        name: "弘阳集团弘云智慧管理平台",
-        pwd: "saga123456",
-        group_code: "HY"
-      }, {
-        id: "Pj3702020002",
-        name: "青岛海天中心",
-        pwd: "saga123456",
-        group_code: "GX"
-      }, {
-        id: "Pj1101010006",
-        name: "亚投行",
-        pwd: "saga123456",
-        group_code: "BT"
-      }, {
-        id: "Pj1101050013",
-        name: "BIM测试项目_亚投行",
-        pwd: "saga123456",
-        group_code: "BT"
-      }, {
-        id: "Pj1101080259",
-        name: "博锐尚格北京总部办公楼",
-        pwd: "saga123456",
-        group_code: "BR"
-      }, {
-        id: "Pj1101150002",
-        name: "华润生命科学园",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj3101150007",
-        name: "招商上海森兰花园城",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj5101080004",
-        name: "成都招商花园城",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj3201130004",
-        name: "招商南京燕子矶花园城",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj3702120001",
-        name: "金融中心",
-        pwd: "saga123456",
-        group_code: "WD"
-      }, {
-        id: "Pj1101051130",
-        name: "万达模型测试项目2",
-        pwd: "saga123456",
-        group_code: "WD"
-      }],
+    projects: project["14"],
     breadcrumb: [],
     uploaderList: [], //当前上传文件列表
     secret: "saga123456", //项目密码
@@ -356,7 +79,7 @@ export default {
     setSidebarSelected: (state, val) => {
       state.sidebarSelected = val
       storage.set(KEY_MENU_SELECTED, val)
-      lStorage.set('screen_data', { path: val, data: {} })
+      lStorage.set('screen_data', {path: val, data: {}})
     },
     setprojectId: (state, val) => {
       lStorage.remove('cacheInfo') //待删除(删除用户浏览器无用缓存)
@@ -393,14 +116,14 @@ export default {
     setErrorReport(contentx, value) {
       contentx.commit('setErrorReport', value)
     },
-    loadUserInfo({ state }) {
+    loadUserInfo({state}) {
       console.log(state)
       // 获取 userInfo 信息
       return new Promise((resolve, reject) => {
         frameworkApi.loadUserInfo().then(resp => {
           console.log(resp)
           if (resp.Result == 'success' && resp.UserId) {
-            state.userInfo = { userName: resp.Username, userId: resp.UserId }
+            state.userInfo = {userName: resp.Username, userId: resp.UserId}
             state.userId = resp.UserId
             storage.set('user_name', resp.Username)
             storage.set('user_id', resp.UserId)
@@ -433,7 +156,7 @@ export default {
     },
     setBreadcrumb: {
       root: true,
-      handler({ state, commit }, val) {
+      handler({state, commit}, val) {
         let label = val[0].label;
         if (label === "消息中心") {
           commit("setSidebarSelected", "message"); // 当进入消息中心页面的时候不选中导航栏

+ 285 - 0
src/framework/layout/project.js

@@ -0,0 +1,285 @@
+const project = {
+  '39': [
+    {
+      id: "Pj4501030002",
+      name: "南宁万象城",
+      pwd: "saga123456",
+      group_code: "HR"
+    }, {
+      id: "Pj4403050002",
+      name: "深圳万象天地",
+      pwd: "saga123456",
+      group_code: "HR"
+    }, {
+      id: "Pj1101051029",
+      name: "北京万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj0001110001",
+      name: "飞龙商场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj1101050029",
+      name: "东坝万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403070003",
+      name: "深圳龙岗万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403050019",
+      name: "招商深圳太子广场汇港二期",
+      pwd: "saga123456",
+      group_code: "ZS"
+    }, {
+      id: "Pj5001120003",
+      name: "香港置地约克北郡",
+      pwd: "saga123456",
+      group_code: "XG"
+    }, {
+      id: "Pj3201110003",
+      name: "弘阳集团弘云智慧管理平台",
+      pwd: "saga123456",
+      group_code: "HY"
+    }, {
+      id: "Pj3702020002",
+      name: "青岛海天中心",
+      pwd: "saga123456",
+      group_code: "GX"
+    }, {
+      id: "Pj1101010006",
+      name: "亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101050013",
+      name: "BIM测试项目_亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101080259",
+      name: "博锐尚格北京总部办公楼",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj1101150002",
+      name: "华润生命科学园",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3101150007",
+      name: "招商上海森兰花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj5101080004",
+      name: "成都招商花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3201130004",
+      name: "招商南京燕子矶花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3702120001",
+      name: "金融中心",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj1101051130",
+      name: "万达模型测试项目2",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj0002220001",
+      name: "数字化交付01",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220002",
+      name: "数字化交付02",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220003",
+      name: "数字化交付03",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220004",
+      name: "数字化交付04",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220005",
+      name: "数字化交付05",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220006",
+      name: "数字化交付06",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220007",
+      name: "数字化交付07",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220008",
+      name: "数字化交付08",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220009",
+      name: "数字化交付09",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj0002220010",
+      name: "数字化交付10",
+      pwd: "saga123456",
+      group_code: "BR"
+    }
+  ],
+  '14': [{
+    id: "Pj1101051029",
+    name: "北京万达广场",
+    pwd: "saga123456",
+    group_code: "WD"
+  },
+    {
+      id: "Pj1101050029",
+      name: "东坝万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    },
+    {
+      id: "Pj4403070003",
+      name: "深圳龙岗万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    },
+    {
+      id: "Pj5001120003",
+      name: "香港置地约克北郡",
+      pwd: "saga123456",
+      group_code: "XG"
+    },
+
+    {
+      id: "Pj1101050013",
+      name: "BIM测试项目_亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+
+    },
+    {
+      id: "Pj1101080259",
+      name: "博锐尚格北京总部办公楼",
+      pwd: "saga123456",
+      group_code: "BR"
+
+    }],
+  '18': [
+    {
+      id: "Pj1101051029",
+      name: "北京万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj0001110001",
+      name: "飞龙商场",
+      pwd: "saga123456",
+      group_code: "MK"
+    }, {
+      id: "Pj0001110002",
+      name: "常州常武",
+      pwd: "saga123456",
+      group_code: "MK"
+    }, {
+      id: "Pj1101050029",
+      name: "东坝万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403070003",
+      name: "深圳龙岗万达广场",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj4403050019",
+      name: "招商深圳太子广场汇港二期",
+      pwd: "saga123456",
+      group_code: "ZS"
+    }, {
+      id: "Pj5001120003",
+      name: "香港置地约克北郡",
+      pwd: "saga123456",
+      group_code: "XG"
+    }, {
+      id: "Pj3201110003",
+      name: "弘阳集团弘云智慧管理平台",
+      pwd: "saga123456",
+      group_code: "HY"
+    }, {
+      id: "Pj3702020002",
+      name: "青岛海天中心",
+      pwd: "saga123456",
+      group_code: "GX"
+    }, {
+      id: "Pj1101010006",
+      name: "亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101050013",
+      name: "BIM测试项目_亚投行",
+      pwd: "saga123456",
+      group_code: "BT"
+    }, {
+      id: "Pj1101080259",
+      name: "博锐尚格北京总部办公楼",
+      pwd: "saga123456",
+      group_code: "BR"
+    }, {
+      id: "Pj1101150002",
+      name: "华润生命科学园",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3101150007",
+      name: "招商上海森兰花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj5101080004",
+      name: "成都招商花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3201130004",
+      name: "招商南京燕子矶花园城",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj3702120001",
+      name: "金融中心",
+      pwd: "saga123456",
+      group_code: "WD"
+    }, {
+      id: "Pj1101051130",
+      name: "万达模型测试项目2",
+      pwd: "saga123456",
+      group_code: "WD"
+    }
+  ]
+
+}
+
+export default project