diff --git a/src/store/index.js b/src/store/index.js index a738dc15..18bbda7e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -8,334 +8,333 @@ Vue.use(Vuex); // import imgReview from './module/imgReview' export default new Vuex.Store({ - plugins: [ - createPersistedState({ - storage: window.sessionStorage, - reducer(val) { - console.log("---------存进去", val); - return { - userInfo: val.userInfo, - currentUrl: val.currentUrl, - menuList: val.menuList, - projectManageMenuList: val.projectManageMenuList, - isShowBackIndex: val.isShowBackIndex, - projectSn: val.projectSn, - selectedGroupSn: val.selectedGroupSn, - groupTreeList: val.groupTreeList, - currentLanguage: val.currentLanguage, - currentProDetail: val.currentProDetail, - currentMoudle: val.currentMoudle, - mapBackArr: val.mapBackArr, - themeType: val.themeType, - chartOptions: val.chartOptions, - menuIndex: val.menuIndex, - subMenuIndex: val.subMenuIndex, - UPLOADURL: val.UPLOADURL, - FILEURL: val.FILEURL, - mouduleIndex: val.mouduleIndex, - secondMenuIndex: val.secondMenuIndex, - curModule: val.curModule, - thirdMenuIndex: val.thirdMenuIndex, - fourMenuIndex: val.fourMenuIndex, - uid: val.uid, - reloadPage: val.reloadPage, - }; - }, - }), - ], + plugins: [ + createPersistedState({ + storage: window.sessionStorage, + reducer(val) { + console.log("---------存进去", val); + return { + userInfo: val.userInfo, + currentUrl: val.currentUrl, + menuList: val.menuList, + projectManageMenuList: val.projectManageMenuList, + isShowBackIndex: val.isShowBackIndex, + projectSn: val.projectSn, + selectedGroupSn: val.selectedGroupSn, + groupTreeList: val.groupTreeList, + currentLanguage: val.currentLanguage, + currentProDetail: val.currentProDetail, + currentMoudle: val.currentMoudle, + mapBackArr: val.mapBackArr, + themeType: val.themeType, + chartOptions: val.chartOptions, + menuIndex: val.menuIndex, + subMenuIndex: val.subMenuIndex, + UPLOADURL: val.UPLOADURL, + FILEURL: val.FILEURL, + mouduleIndex: val.mouduleIndex, + secondMenuIndex: val.secondMenuIndex, + curModule: val.curModule, + thirdMenuIndex: val.thirdMenuIndex, + fourMenuIndex: val.fourMenuIndex, + uid: val.uid, + reloadPage: val.reloadPage, + }; + }, + }), + ], - state: { - PAGESIZRS: [10, 20, 30, 50], - // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 - // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - // UPLOADURL:'http://182.90.224.237:51234/upload/image/', - // FILEURL:'http://182.90.224.237:51234/image/', - // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 - // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 - UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 - WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - // WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) - // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 - // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 - // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 - // FILEURL:'http://42.180.188.17:11211/image/',//测试 + state: { + PAGESIZRS: [10, 20, 30, 50], + // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 + // FILEURL:' http://101.43.164.214:11111/image/',// 百色 + // UPLOADURL:'http://182.90.224.237:51234/upload/image/', + // FILEURL:'http://182.90.224.237:51234/image/', + // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 + UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 + FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 + // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) + // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 + // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 + // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 + // FILEURL:'http://42.180.188.17:11211/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 - // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) - // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) - // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 - // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 - //--------------------------------------------------------------------------------------------- - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/api/upload/image", //金林湾部署地址 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 - // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', - // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', - /* 2022-05-16 */ - // tag: 部署河南项目时，需要打开这两行代码 + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/", //正式环境 + // UPLOADURL: + // window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) + // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) + // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 + // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + //--------------------------------------------------------------------------------------------- + // BASEURL: baseUrl + // ? baseUrl + // : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 + // UPLOADURL: + // window.location.protocol + + // "//" + + // window.location.host + + // "/api/upload/image", //金林湾部署地址 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 + // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image', + // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/', + /* 2022-05-16 */ + // tag: 部署河南项目时，需要打开这两行代码 - // UPLOADURL: 'http://139.9.66.234:6324/upload/image', - // FILEURL: 'http://139.9.66.234:6324/image/', - /* 2022-06-06 广西本地的*/ // FILEURL: 'http://182.90.224.237:7000/image/', - // 邱平毅的 - // BASEURL:'http://192.168.34.116:6023/', - // UPLOADURL: 'http://192.168.34.116:6023/upload/image', - // FILEURL: 'http://192.168.34.116:6023/image/', - // UPLOADURL: 'http://116.169.63.183:7070/upload/image', - // FILEURL: 'http:/116.169.63.183:7070/image/', - //--- - // UPLOADURL: 'http://192.168.34.125:6023/upload/image', - // FILEURL: 'http://192.168.34.125:6023/image/', + // UPLOADURL: 'http://139.9.66.234:6324/upload/image', + // FILEURL: 'http://139.9.66.234:6324/image/', + /* 2022-06-06 广西本地的*/ // FILEURL: 'http://182.90.224.237:7000/image/', + // 邱平毅的 + // BASEURL:'http://192.168.34.116:6023/', + // UPLOADURL: 'http://192.168.34.116:6023/upload/image', + // FILEURL: 'http://192.168.34.116:6023/image/', + // UPLOADURL: 'http://116.169.63.183:7070/upload/image', + // FILEURL: 'http:/116.169.63.183:7070/image/', + //--- + // UPLOADURL: 'http://192.168.34.125:6023/upload/image', + // FILEURL: 'http://192.168.34.125:6023/image/', - // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 - // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 - // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 - // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 - // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 - // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 - // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 - // UPLOADURL: 'http://192.168.34.221:12350/upload/image',//金林湾本地 - // FILEURL: 'http://192.168.34.221:12350/image/',//郭圣雄本地 - // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 - // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 - // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 - // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 - // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上) - // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上） - // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式） - // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） - // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 - // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 - // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 - // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 - // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 - // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 + // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式 + // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式 + // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式 + // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台 + // FILEURL: 'http://182.90.224.147:100/image/',//演示平台 + // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地 + // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:12350/upload/image',//金林湾本地 + // FILEURL: 'http://192.168.34.221:12350/image/',//郭圣雄本地 + // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古 + // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古 + // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四 + // FILEURL: 'http://42.194.144.62:8088/image/',//中建四 + // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润(内部线上) + // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润（内部线上） + // UPLOADURL: 'http://118.121.198.147:23232/upload/image',//四川成润（正式） + // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） + // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 + // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 + // UPLOADURL: 'http://192.168.34.221:30002/upload/image',//郭圣雄本地 + // FILEURL: 'http://192.168.34.221:30002/image/',//郭圣雄本地 + // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 + // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益 - ACCOUNTTYPE: [ - "系统管理员", - "企业一级管理员", - "企业二级管理员", - "企业三级管理员", - "项目管理员", - ], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号 - userInfo: null, //登录返回的账号信息 - // currentUrl:'',//当前路由地址 - menuList: [], //当前菜单列表 - projectManageMenuList: [], // 项目管理页菜单列表 - isShowBackIndex: false, - projectSn: null, //项目后台 里的 项目 sn - selectedGroupSn: "", - groupTreeList: [], - currentLanguage: "zh", - currentProDetail: null, - currentMoudle: null, - mapBackArr: [], - themeType: "white", - chartOptions: { - labelColor: "rgba(38, 45, 72, 0.56)", - }, - menuIndex: 0, - subMenuIndex: 0, - isExpand: false, - //档案管理 - sideMenu: { - isFolder: sessionStorage.getItem("isFolder"), // 左侧栏是否折叠，0不折叠，1折叠 - storageValue: 0, // 已使用存储容量 - storageMaxValue: Math.pow(1024, 3) * 100, // 最大存储容量，100GB - }, - - fileList: { - operaColumnExpand: sessionStorage.getItem("operaColumnExpand"), // 操作列是否展开，0不展开，1展开 - selectedColumnList: sessionStorage.getItem("selectedColumnList"), // 列显隐 - fileModel: sessionStorage.getItem("fileModel"), // 文件展示模式，0列表模式，1网格模式 2时间线模式 - }, - - imgReview: { - imgReviewVisible: false, // 图片查看组件显隐状态 - imgReviewList: [], // 图片列表 - defaultActiveIndex: 0, // 默认当前打开的图片的索引 - }, - mouduleIndex: 0, - secondMenuIndex: 0, - thirdMenuIndex: 0, - fourMenuIndex: 0, - curModule: { - name: "工作站", - id: 1, - url: "/projectV2/taskList", - menuList: [ - { - id: 100000, - menuName: "任务清单", - path: "/projectV2/taskList", + ACCOUNTTYPE: [ + "系统管理员", + "企业一级管理员", + "企业二级管理员", + "企业三级管理员", + "项目管理员", + ], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号 + userInfo: null, //登录返回的账号信息 + // currentUrl:'',//当前路由地址 + menuList: [], //当前菜单列表 + projectManageMenuList: [], // 项目管理页菜单列表 + isShowBackIndex: false, + projectSn: null, //项目后台 里的 项目 sn + selectedGroupSn: "", + groupTreeList: [], + currentLanguage: "zh", + currentProDetail: null, + currentMoudle: null, + mapBackArr: [], + themeType: "white", + chartOptions: { + labelColor: "rgba(38, 45, 72, 0.56)", }, - { - id: 100001, - menuName: "通知公告", - path: "/projectV2/noticeList", + menuIndex: 0, + subMenuIndex: 0, + isExpand: false, + //档案管理 + sideMenu: { + isFolder: sessionStorage.getItem("isFolder"), // 左侧栏是否折叠，0不折叠，1折叠 + storageValue: 0, // 已使用存储容量 + storageMaxValue: Math.pow(1024, 3) * 100, // 最大存储容量，100GB }, - { - id: 100002, - menuName: "工作日程", - path: "/projectV2/workerSchedule", + + fileList: { + operaColumnExpand: sessionStorage.getItem("operaColumnExpand"), // 操作列是否展开，0不展开，1展开 + selectedColumnList: sessionStorage.getItem("selectedColumnList"), // 列显隐 + fileModel: sessionStorage.getItem("fileModel"), // 文件展示模式，0列表模式，1网格模式 2时间线模式 }, - ], + + imgReview: { + imgReviewVisible: false, // 图片查看组件显隐状态 + imgReviewList: [], // 图片列表 + defaultActiveIndex: 0, // 默认当前打开的图片的索引 + }, + mouduleIndex: 0, + secondMenuIndex: 0, + thirdMenuIndex: 0, + fourMenuIndex: 0, + curModule: { + name: "工作站", + id: 1, + url: "/projectV2/taskList", + menuList: [{ + id: 100000, + menuName: "任务清单", + path: "/projectV2/taskList", + }, + { + id: 100001, + menuName: "通知公告", + path: "/projectV2/noticeList", + }, + { + id: 100002, + menuName: "工作日程", + path: "/projectV2/workerSchedule", + }, + ], + }, + uid: false, //是否第三方免码登录 true为免码登录 + reloadPage: false, //重载页面 因为动态加载资源 要刷新页面 }, - uid: false, //是否第三方免码登录 true为免码登录 - reloadPage: false, //重载页面 因为动态加载资源 要刷新页面 - }, - mutations: { - setUPLOADURL(state, data) { - state.UPLOADURL = data; + mutations: { + setUPLOADURL(state, data) { + state.UPLOADURL = data; + }, + setFILEURL(state, data) { + state.FILEURL = data; + }, + setUserInfo(state, data) { + state.userInfo = data; + }, + setMenuList(state, data) { + state.menuList = data; + }, + setIsShowBackIndex(state, data) { + state.isShowBackIndex = data; + }, + setProjectManageMenuList(state, data) { + state.projectManageMenuList = data; + }, + // setCurrentUrl(state,data){ + // state.currentUrl = data + // } + setProjectSn(state, data) { + state.projectSn = data; + }, + setSelectedGroupSn(state, data) { + state.selectedGroupSn = data; + }, + setGroupTreeList(state, data) { + state.groupTreeList = data; + }, + setLang(state, data) { + state.currentLanguage = data; + }, + setProDetail(state, data) { + state.currentProDetail = data; + }, + setMoudle(state, data) { + state.currentMoudle = data; + }, + setMapBackArr(state, data) { + state.mapBackArr = data; + }, + setThemeType(state, data) { + state.themeType = data; + }, + setChartOptions(state, data) { + state.chartOptions = data; + }, + setMenuIndex(state, data) { + state.menuIndex = data; + }, + setSubMenuIndex(state, data) { + state.subMenuIndex = data; + }, + setIsExpand(state, data) { + state.isExpand = data; + }, + //档案管理 + changeOperaColumnExpand(state, data) { + sessionStorage.setItem("operaColumnExpand", data); + state.fileList.operaColumnExpand = data; + }, + changeSelectedColumnList(state, data) { + sessionStorage.setItem("selectedColumnList", data.toString()); + state.fileList.selectedColumnList = data.toString(); + }, + changeFileModel(state, data) { + sessionStorage.setItem("fileModel", data); + state.fileList.fileModel = data; + }, + setImgReviewData(state, data) { + if (data.imgReviewVisible) { + state.imgReview.imgReviewVisible = data.imgReviewVisible; + state.imgReview.imgReviewList = data.imgReviewList; + state.imgReview.defaultActiveIndex = data.activeIndex; + } else { + state.imgReview.imgReviewVisible = data.false; + state.imgReview.imgReviewList = []; + state.imgReview.defaultActiveIndex = 0; + } + }, + changeIsFolder(state, data) { + sessionStorage.setItem("isFolder", data); + state.sideMenu.isFolder = data; + }, + changeMouduleIndex(state, data) { + state.mouduleIndex = data; + }, + changeSecondMenuIndex(state, data) { + state.secondMenuIndex = data; + }, + changeThirdMenuIndex(state, data) { + state.thirdMenuIndex = data; + }, + changeFourMenuIndex(state, data) { + state.fourMenuIndex = data; + }, + setCurModule(state, data) { + state.curModule = data; + }, + setUid(state, data) { + state.uid = data; + }, + setReloadPage(state, data) { + state.reloadPage = data; + }, }, - setFILEURL(state, data) { - state.FILEURL = data; + getters: { + BASEURL: (state) => state.BASEURL, + UPLOADURL: (state) => state.UPLOADURL, + FILEURL: (state) => state.FILEURL, + isLogin: (state) => state.user.isLogin, + username: (state) => state.user.username, + userId: (state) => state.user.userId, + userImgUrl: (state) => state.user.userImgUrl, + userInfoObj: (state) => state.user.userInfoObj, + isFolder: (state) => Number(state.sideMenu.isFolder), // 左侧栏是否折叠，0不折叠，1折叠 + operaColumnExpand: (state) => + state.fileList.operaColumnExpand !== null ? + Number(state.fileList.operaColumnExpand) : + document.body.clientWidth > 1280 ? + 1 : + 0, // 操作列是否展开，0不展开，1展开 + selectedColumnList: (state) => + state.fileList.selectedColumnList === null ? + ["extendName", "fileSize", "uploadTime", "deleteTime"] : + state.fileList.selectedColumnList.split(","), // 列显隐 + fileModel: (state) => + state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), // 文件展示模式，0列表模式，1网格模式 2 时间线模式 }, - setUserInfo(state, data) { - state.userInfo = data; + actions: { + // currentUrl({commit},args) { + // commit('setCurrentUrl',args) + // } }, - setMenuList(state, data) { - state.menuList = data; + modules: { + // user, + // fileList, + // sideMenu, + // imgReview }, - setIsShowBackIndex(state, data) { - state.isShowBackIndex = data; - }, - setProjectManageMenuList(state, data) { - state.projectManageMenuList = data; - }, - // setCurrentUrl(state,data){ - // state.currentUrl = data - // } - setProjectSn(state, data) { - state.projectSn = data; - }, - setSelectedGroupSn(state, data) { - state.selectedGroupSn = data; - }, - setGroupTreeList(state, data) { - state.groupTreeList = data; - }, - setLang(state, data) { - state.currentLanguage = data; - }, - setProDetail(state, data) { - state.currentProDetail = data; - }, - setMoudle(state, data) { - state.currentMoudle = data; - }, - setMapBackArr(state, data) { - state.mapBackArr = data; - }, - setThemeType(state, data) { - state.themeType = data; - }, - setChartOptions(state, data) { - state.chartOptions = data; - }, - setMenuIndex(state, data) { - state.menuIndex = data; - }, - setSubMenuIndex(state, data) { - state.subMenuIndex = data; - }, - setIsExpand(state, data) { - state.isExpand = data; - }, - //档案管理 - changeOperaColumnExpand(state, data) { - sessionStorage.setItem("operaColumnExpand", data); - state.fileList.operaColumnExpand = data; - }, - changeSelectedColumnList(state, data) { - sessionStorage.setItem("selectedColumnList", data.toString()); - state.fileList.selectedColumnList = data.toString(); - }, - changeFileModel(state, data) { - sessionStorage.setItem("fileModel", data); - state.fileList.fileModel = data; - }, - setImgReviewData(state, data) { - if (data.imgReviewVisible) { - state.imgReview.imgReviewVisible = data.imgReviewVisible; - state.imgReview.imgReviewList = data.imgReviewList; - state.imgReview.defaultActiveIndex = data.activeIndex; - } else { - state.imgReview.imgReviewVisible = data.false; - state.imgReview.imgReviewList = []; - state.imgReview.defaultActiveIndex = 0; - } - }, - changeIsFolder(state, data) { - sessionStorage.setItem("isFolder", data); - state.sideMenu.isFolder = data; - }, - changeMouduleIndex(state, data) { - state.mouduleIndex = data; - }, - changeSecondMenuIndex(state, data) { - state.secondMenuIndex = data; - }, - changeThirdMenuIndex(state, data) { - state.thirdMenuIndex = data; - }, - changeFourMenuIndex(state, data) { - state.fourMenuIndex = data; - }, - setCurModule(state, data) { - state.curModule = data; - }, - setUid(state, data) { - state.uid = data; - }, - setReloadPage(state, data) { - state.reloadPage = data; - }, - }, - getters: { - BASEURL: (state) => state.BASEURL, - UPLOADURL: (state) => state.UPLOADURL, - FILEURL: (state) => state.FILEURL, - isLogin: (state) => state.user.isLogin, - username: (state) => state.user.username, - userId: (state) => state.user.userId, - userImgUrl: (state) => state.user.userImgUrl, - userInfoObj: (state) => state.user.userInfoObj, - isFolder: (state) => Number(state.sideMenu.isFolder), // 左侧栏是否折叠，0不折叠，1折叠 - operaColumnExpand: (state) => - state.fileList.operaColumnExpand !== null - ? Number(state.fileList.operaColumnExpand) - : document.body.clientWidth > 1280 - ? 1 - : 0, // 操作列是否展开，0不展开，1展开 - selectedColumnList: (state) => - state.fileList.selectedColumnList === null - ? ["extendName", "fileSize", "uploadTime", "deleteTime"] - : state.fileList.selectedColumnList.split(","), // 列显隐 - fileModel: (state) => - state.fileList.fileModel === null ? 0 : Number(state.fileList.fileModel), // 文件展示模式，0列表模式，1网格模式 2 时间线模式 - }, - actions: { - // currentUrl({commit},args) { - // commit('setCurrentUrl',args) - // } - }, - modules: { - // user, - // fileList, - // sideMenu, - // imgReview - }, -}); +}); \ No newline at end of file diff --git a/src/views/projectFront/projectSummary/cooperationUnit.vue b/src/views/projectFront/projectSummary/cooperationUnit.vue index 356859ca..ebd3396f 100644 --- a/src/views/projectFront/projectSummary/cooperationUnit.vue +++ b/src/views/projectFront/projectSummary/cooperationUnit.vue @@ -384,10 +384,8 @@ - - - + + @@ -403,13 +401,18 @@ - - + + - - + + + + + @@ -484,13 +487,10 @@ - - - - - + + + @@ -986,7 +986,7 @@ export default { } } - console.log('==========',this.enterpriseForm.companyTypeName) + // console.log('==========',this.enterpriseForm.companyTypeName) this.aptitudeFileList = []; this.logoFileList = []; this.layoutImageList = []; @@ -996,7 +996,8 @@ export default { 'message.laborMange.theNewEnterprise' ) this.addEnterpriseDialog = true - // this.enterpriseForm.enterpriseTypeId = Number(this.checkedId) + this.enterpriseForm.enterpriseTypeId = this.checkedId; + // console.log("111111111111",this.checkedId) }, //编辑按钮 editBtn(value) { diff --git a/src/views/projectFront/projectSummary/cooperatorDatails.vue b/src/views/projectFront/projectSummary/cooperatorDatails.vue index 0c8ffdf9..c1c2fabb 100644 --- a/src/views/projectFront/projectSummary/cooperatorDatails.vue +++ b/src/views/projectFront/projectSummary/cooperatorDatails.vue @@ -585,15 +585,16 @@ export default { value2: res.result.projectEnterprise.projectBuildArea ? res.result.projectEnterprise.projectBuildArea : "", }, { - fieldName: "竣工日期", + + fieldName: "项目经理", fieldName2: "项目类型", - value: res.result.projectEnterprise.completionDate ? res.result.projectEnterprise.completionDate :"", + value: res.result.projectEnterprise.projectManage ? res.result.projectEnterprise.projectManage :"", value2: res.result.projectEnterprise.cbsProjectTypeName ? res.result.projectEnterprise.cbsProjectTypeName:"", }, { - fieldName: "项目经理", + fieldName: "施工阶段", fieldName2: "维度位置", - value: res.result.projectEnterprise.projectManage ? res.result.projectEnterprise.projectManage :"", + value: res.result.projectEnterprise.constructionStageName?res.result.projectEnterprise.constructionStageName:"", value2: res.result.projectEnterprise.latitude ? res.result.projectEnterprise.latitude :"", }, { @@ -616,9 +617,9 @@ export default { }, { fieldName: "开工日期", - fieldName2: "施工阶段", + fieldName2: "竣工日期", value: res.result.projectEnterprise.startWorkDate?res.result.projectEnterprise.startWorkDate:"", - value2: res.result.projectEnterprise.constructionStageName?res.result.projectEnterprise.constructionStageName:"", + value2: res.result.projectEnterprise.completionDate ? res.result.projectEnterprise.completionDate :"", }, { fieldName: "现场布置图",