diff --git a/src/api/insurance/index.js b/src/api/insurance/index.js index 9454c14..96665b0 100644 --- a/src/api/insurance/index.js +++ b/src/api/insurance/index.js @@ -7,6 +7,13 @@ const getProjectInsuranceList=(deptId,projectId)=> { }) } +const getProjectInsurance=id=>{ + return request({ + url: `bgscreen/insurance/getProjectInsurance?id=${id}`, + method: 'get' + }) +} export default{ - getProjectInsuranceList + getProjectInsuranceList, + getProjectInsurance } \ No newline at end of file diff --git a/src/pages/detail/projectInfoDlg.vue b/src/pages/detail/projectInfoDlg.vue index 2ca4b2e..884ef69 100644 --- a/src/pages/detail/projectInfoDlg.vue +++ b/src/pages/detail/projectInfoDlg.vue @@ -139,92 +139,28 @@ 实际完工时间:
{{ prj.actualCompletionTime }}
- + - - - 责任主体: -
{{ users11.length > 0 ? users11[0].deptName : '' }}
- -
- - - - - - - - - - -
姓名岗位
{{ it.nickName }}{{ it.jobTypeName }}
- -
- - - - - 监理单位: -
{{ users4.length > 0 ? users4[0].deptName : '' }}
- -
- - - - - - - - - - -
姓名岗位
{{ it.nickName }}{{ it.jobTypeName }}
- -
- - - - - - 总包单位: -
{{ users2.length > 0 ? users2[0].deptName : '' }}
- -
- - - - - - - - - - -
姓名岗位
{{ it.nickName }}{{ it.jobTypeName }}
- -
- - - - - - - 分包单位: -
{{ users3.length > 0 ? users3[0].deptName : '' }}
- -
+ + + +
+ + + - - + + + + + -
姓名单位类型单位 岗位联系电话
{{ it.nickName }}{{ it.jobTypeName }}{{ it.nickName }}{{ it.dName }}{{ it.deptName }}{{ it.jobTypeName }}{{ it.phonenumber }}
-
@@ -255,10 +191,7 @@ export default { projectWeight: [], projectCategory: [], projectLevel: [], - projectBuildType: [], - users11: [],//责任主体 - users4: [],//监理单位 - users2: [],//总包单位 + projectBuildType: [], users3: [],//分包单位 }; }, @@ -288,7 +221,8 @@ export default { if (this.users && this.users.length > 0) { let tmps = this.users.filter(it => it.jobTypeName == t); if (tmps.length > 0) { - return tmps[0].deptName; + let it=tmps[0]; + return it.nickName+(it.phonenumber?`(${it.phonenumber})`:''); } }; return ""; @@ -382,11 +316,22 @@ export default { this.projectBuildType = d || []; }); - this.users11 = users.filter(d => d.deptType == 11); - this.users4 = users.filter(d => d.deptType == 4); - this.users2 = users.filter(d => d.deptType == 2); - this.users3 = users.filter(d => d.deptType == 3); - + + this.users3=[]; + this.addUsers(2,users,"总包单位","项目经理"); + this.addUsers(4,users,"监理单位","总监"); + this.addUsers(1,users,"设计单位","项目负责人"); + + }, + addUsers(n,users,dName,jobTypeName){ + users.filter(d=>d.deptType==n).forEach(it=>{ + if(it.jobTypeName==jobTypeName){ + if(this.users3.filter(item=>item.deptType==n && item.jobTypeName==jobTypeName && item.deptName==it.deptName ).length==0){ + it.dName=dName; + this.users3.push(it); + } + } + }); }, modifyLeftBtn() { let n = this.index; @@ -480,7 +425,7 @@ export default { } .data-table { padding: 48px 24px; - + margin-top: 32px; table { th { diff --git a/src/pages/projectQuality.vue b/src/pages/projectQuality.vue index d441855..da26b56 100644 --- a/src/pages/projectQuality.vue +++ b/src/pages/projectQuality.vue @@ -161,7 +161,7 @@ %
-
+
diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index ea8e245..67324dd 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -207,7 +207,7 @@
- @@ -263,6 +263,7 @@ +
@@ -282,18 +283,21 @@ import '../components/people-number' import worktrainDlg from './dlg/workTrainDlg.vue' import projectSpecialDlg from './dlg/projectSpecialDlg.vue' import ProblemmodifyDetail from './components/ProblemmodifyDetail.vue' +import projectInsuranceDlg from './safe/projectInsuranceDlg.vue' export default { components: { worktrainDlg, projectSpecialDlg, - ProblemmodifyDetail + ProblemmodifyDetail, + projectInsuranceDlg }, data() { return { elKey: 0, dept: null, projectInfo:null, + projects:[], safeNav: 0, safeText: '汇总总数', rowStyle: { @@ -348,6 +352,9 @@ export default { this.getDeptWorksList(); this.getProjectInsuranceList(); }); + this.$bus.$on("loadProjects", prjs => { + this.projects = prjs; + }) this.$bus.$on("deptChange", dept => { this.dept = dept; this.doDeptChane(); @@ -360,6 +367,9 @@ export default { }, methods: { + doInsuranceRowClick(row){ + this.$refs.insDlg.showDialog(this.projects, this.projectInfo,row) + }, doProbleRowClick(a,b,c){ this.$refs.probDlg.showDialog(a,0,this.safeNav); }, diff --git a/src/pages/quality/showCheckingDlg.vue b/src/pages/quality/showCheckingDlg.vue new file mode 100644 index 0000000..0407860 --- /dev/null +++ b/src/pages/quality/showCheckingDlg.vue @@ -0,0 +1,207 @@ + + + + + \ No newline at end of file diff --git a/src/pages/safe/projectInsuranceDlg.vue b/src/pages/safe/projectInsuranceDlg.vue new file mode 100644 index 0000000..2bd9027 --- /dev/null +++ b/src/pages/safe/projectInsuranceDlg.vue @@ -0,0 +1,236 @@ + + + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index f7654db..7318249 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,26 +1,33 @@ const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ transpileDependencies: true, - publicPath:'./', + publicPath :'./' , productionSourceMap:false, devServer: { host: '0.0.0.0', port: 3000, open: true, proxy: { - '/profile':{ - target: `http://62.234.3.186/profile`, + // '/':{ + // target: `http://127.0.0.1/`, + // changeOrigin: true, + // pathRewrite: { + // ['^/']:'' + // } + // }, + '/profile/upload':{ + target: `http://62.234.3.186/profile/upload`, changeOrigin: true, pathRewrite: { - ['^/profile']:'' + '^/profile/upload':'/' } }, - '/jhapi/profile':{ - //target: `http://62.234.3.186/jhapi/profile`, - target: `http://127.0.0.1:8090/jhapi/profile`, + '/jhapi/profile/upload':{ + target: `http://62.234.3.186/jhapi/profile/upload`, + //target: `http://127.0.0.1:8090/jhapi/profile`, changeOrigin: true, pathRewrite: { - ['^/jhapi/profile']:'' + '^/jhapi/profile/upload':'/' } }, [process.env.VUE_APP_BASE_API]: {