From 375f02960aade0d81226ac3a3abd9c74594ddf7f Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Thu, 11 Apr 2024 22:30:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 +- src/store/index.js | 2 +- src/views/companyAdmin/companyDiagram.vue | 18 ++- src/views/jxjadmin/moduleMenuManage.vue | 2 +- src/views/jxjadmin/registerAudit.vue | 4 + .../configManage/groupStructureManagement.vue | 2 +- .../projectFront/configManage/roleManage.vue | 2 +- .../components/apply-info.vue | 12 +- .../components/qualification-info.vue | 7 +- src/views/workSpace/index.vue | 130 +++++++++--------- 10 files changed, 108 insertions(+), 75 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 6f530745..0d71d028 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -83,7 +83,7 @@ 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://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 @@ -91,7 +91,7 @@ if (process.env.NODE_ENV == 'development') { // 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/'//中建四局(沙湖)线上（最新）地址 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 + axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index 949251b3..9d0bd3dd 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -61,7 +61,7 @@ export default new Vuex.Store({ "//" + window.location.host + "/upload/image", //正式环境 - FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // WORKFLOWURL: 'http://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl diff --git a/src/views/companyAdmin/companyDiagram.vue b/src/views/companyAdmin/companyDiagram.vue index cfadab1e..77f17055 100644 --- a/src/views/companyAdmin/companyDiagram.vue +++ b/src/views/companyAdmin/companyDiagram.vue @@ -1056,6 +1056,14 @@ :label="i.moduleId" >{{ i.moduleName }} +
工作台模块
+ {{ i.moduleName }}
{ - this.jobList = res.result; + this.jobList = res.result.records; + this.pagInfo.total = res.result.total; }); }, // 拒绝申请 @@ -3336,7 +3345,8 @@ export default { pageSize: this.pagInfo.pageSize } getUserManagerPageApi(requestData).then((res) => { - this.userManageList = res.result; + this.userManageList = res.result.records; + this.pagInfo.total = res.result.total; }); }, // 获取新用户审核列表 @@ -3364,8 +3374,8 @@ export default { pageSize: this.pagInfo.pageSize } getSystemUserBySnPageApi(requestData).then((res) => { - this.level1AccountData = res.result; - this.pagInfo.total = res.result.length; + this.level1AccountData = res.result.records; + this.pagInfo.total = res.result.total; }); }, //删除项目 diff --git a/src/views/jxjadmin/moduleMenuManage.vue b/src/views/jxjadmin/moduleMenuManage.vue index c485a4cd..c7f48bd9 100644 --- a/src/views/jxjadmin/moduleMenuManage.vue +++ b/src/views/jxjadmin/moduleMenuManage.vue @@ -740,7 +740,7 @@ export default { ] }, btnList: [], - moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台','供应商管理'], + moudleTypeArr: ['企业前台', '项目后台', '企业后台', '项目看板', '项目前台','供应商管理','工作台'], searchModuleType: 2, styleTypeArr: [ '普通项目级版本', diff --git a/src/views/jxjadmin/registerAudit.vue b/src/views/jxjadmin/registerAudit.vue index ce4c1de2..4e7bfbd2 100644 --- a/src/views/jxjadmin/registerAudit.vue +++ b/src/views/jxjadmin/registerAudit.vue @@ -203,6 +203,10 @@ {{ i.moduleName }} +
工作台模块
+ {{ + i.moduleName + }} diff --git a/src/views/projectFront/configManage/groupStructureManagement.vue b/src/views/projectFront/configManage/groupStructureManagement.vue index 02439b2b..3e3fb205 100644 --- a/src/views/projectFront/configManage/groupStructureManagement.vue +++ b/src/views/projectFront/configManage/groupStructureManagement.vue @@ -128,7 +128,7 @@ :rules="formRules" > diff --git a/src/views/projectFront/configManage/roleManage.vue b/src/views/projectFront/configManage/roleManage.vue index 8cbb723b..7f69e843 100644 --- a/src/views/projectFront/configManage/roleManage.vue +++ b/src/views/projectFront/configManage/roleManage.vue @@ -348,7 +348,7 @@ export default { getProjectMenu() { getProjectModuleGroupMenuListApi({ projectSn: this.$store.state.projectSn, - moduleTypes:'2,4', + moduleTypes:'2,4,7', }).then(res => { var DATA = res.result; // DATA.forEach((element,i) => { diff --git a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue index 1b00485c..f8616c5b 100644 --- a/src/views/supplierAdmin/qualificationApply/components/apply-info.vue +++ b/src/views/supplierAdmin/qualificationApply/components/apply-info.vue @@ -29,10 +29,10 @@ - {{ + {{ $t("message.laborMange.inquire") }} - {{ + {{ $t("message.laborMange.refresh") }} { + this.$refs.addFileForm.clearValidate(); + }); }, getTableList() { let requestData = { @@ -308,7 +312,8 @@ export default { getQualificationFilePageApi(requestData).then((res) => { console.log(res, "资质文件表格"); if (res.result) { - this.tableList = res.result; + this.tableList = res.result.records; + this.total = res.result.total; this.tableList.map((item) => { if (!item.fileUrl.includes(this.$store.state.FILEURL)) { item.fileUrl = this.$store.state.FILEURL + item.fileUrl; diff --git a/src/views/workSpace/index.vue b/src/views/workSpace/index.vue index 35b70815..b36f420f 100644 --- a/src/views/workSpace/index.vue +++ b/src/views/workSpace/index.vue @@ -51,7 +51,10 @@ import vhead from "@/components/header"; import { getProjectDetail } from "@/assets/js/api/baseInfo.js"; import { getGroupListApi } from "@/assets/js/api/loginSign.js"; -import { getAllModuleApi } from "@/assets/js/api/jxjadmin.js"; +import { + getAllModuleApi, + getNewUserAllModulePageApi, +} from "@/assets/js/api/jxjadmin.js"; export default { name: "workSpace", components: { vhead }, @@ -78,70 +81,73 @@ export default { }, methods: { // 查询全部模块(拿到工作流的模块菜单) - async getModuleList() { - const res = await getAllModuleApi({ - moduleType: 2, - styleType: this.$store.state.userInfo.styleType, - }); - console.log(res); - // 传递的工作流菜单 - const responseMenuList = []; - if (res && res.result) { - res.result.map((item) => { - if (item.moduleName == "工作流" && item.menuList) { - item.menuList.map((item2) => { + getModuleList() { + getNewUserAllModulePageApi({ + projectSn: this.$store.state.projectSn, + moduleType: 7, + }).then((res) => { + // 传递的工作流菜单 + const responseMenuList = []; + let all = res.result.moduleList; + console.log("all", res.result); + all.forEach((element, index) => { + all[index].operation = false; + res.result.menuList.forEach((element2) => { + if (element2.moduleId == element.moduleId) { + all[index].operation = true; responseMenuList.push({ - menuName: item2.menuName, - path: item2.path, - icon: item2.icon, + menuName: element2.menuName, + path: element2.path, + icon: element2.icon, }); - }); - } + } + }); + }); + console.log(responseMenuList, "我的测试数据啊啊啊啊"); + // 传递的工作流菜单 + const defaultMenuList = [ + { + menuName: "审批列表", + path: "/workspace/forms", + icon: "el-icon-s-order", + }, + { + menuName: "待我处理", + path: "/workspace/unfinished", + icon: "el-icon-s-check", + }, + { + menuName: "已处理的", + path: "/workspace/finished", + icon: "el-icon-s-custom", + }, + { + menuName: "我发起的", + path: "/workspace/submit", + icon: "el-icon-s-claim", + }, + { + menuName: "关于我的", + path: "/workspace/cc", + icon: "el-icon-s-promotion", + }, + ]; + this.$nextTick(() => { + setTimeout(() => { + let iframe = document.getElementById("myIframe"); + iframe.contentWindow.postMessage( + { + type: "emitData", + data: JSON.stringify(this.$store.state.userInfo), + authMenuList: + responseMenuList.length > 0 + ? JSON.stringify(responseMenuList) + : JSON.stringify(defaultMenuList), + }, + "*" + ); + }, 1000); }); - } - // 传递的工作流菜单 - const defaultMenuList = [ - { - menuName: "审批列表", - path: "/workspace/forms", - icon: "el-icon-s-order", - }, - { - menuName: "待我处理", - path: "/workspace/unfinished", - icon: "el-icon-s-check", - }, - { - menuName: "已处理的", - path: "/workspace/finished", - icon: "el-icon-s-custom", - }, - { - menuName: "我发起的", - path: "/workspace/submit", - icon: "el-icon-s-claim", - }, - { - menuName: "关于我的", - path: "/workspace/cc", - icon: "el-icon-s-promotion", - }, - ]; - this.$nextTick(() => { - setTimeout(() => { - let iframe = document.getElementById("myIframe"); - iframe.contentWindow.postMessage( - { - type: "emitData", - data: JSON.stringify(this.$store.state.userInfo), - authMenuList: - responseMenuList.length > 0 - ? JSON.stringify(responseMenuList) - : JSON.stringify(defaultMenuList), - }, - "*" - ); - }, 1000); }); }, // 默认选中已选中组织的第一个项目