From ca2f29b4e7f88c86069353164301cb992c7182d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Fri, 11 Aug 2023 22:16:15 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 4 +- src/api/workFile/index.js | 12 ++++++ src/pages/projectSafety.vue | 79 +++++++++++++++---------------------- 3 files changed, 46 insertions(+), 49 deletions(-) create mode 100644 src/api/workFile/index.js diff --git a/src/api/index.js b/src/api/index.js index 474bdf5..f893313 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -3,10 +3,12 @@ import dept from './dept/index' import schedule from './schedule/index' import quarterlyAssess from './quarterlyAssess/index' import problemmodify from './problemmodify/index' +import workFile from './workFile/index' export default { project, dept, schedule, quarterlyAssess, - problemmodify + problemmodify, + workFile } \ No newline at end of file diff --git a/src/api/workFile/index.js b/src/api/workFile/index.js new file mode 100644 index 0000000..d26f070 --- /dev/null +++ b/src/api/workFile/index.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +const getWorkFileList=(fileBelong)=> { + return request({ + url: `bgscreen/workfile/getWorkFileList?fileBelong=${fileBelong}`, + method: 'get' + }) +} + +export default{ + getWorkFileList +} \ No newline at end of file diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index 7f70411..863aca4 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -99,40 +99,18 @@ - +
- 上级部门 - 集团公司 - 子分公司 + 上级部门 + 集团公司 + 子分公司
-
+
-
{{it.name}}
-
{{it.time}}
-
-
- 查看详情 -
-
- -
- -
-
{{it.name}}
-
{{it.time}}
-
-
- 查看详情 -
-
- -
- -
-
{{it.name}}
-
{{it.time}}
+
{{it.fileName}}
+
{{it.createTime}}
查看详情 @@ -210,13 +188,14 @@ import '../components/rank-chart' import '../components/staff-survey-chart' import '../components/idle-list-chart' import '../components/people-number' +import '../components/people-number' export default { data() { return { elKey:0, dept:null, safeNav:0, - safeText:'汇总总数', + safeText:'汇总总数', rowStyle:{ color:'#B6CFEF', fontSize:'12px', @@ -228,21 +207,12 @@ export default { {id:'03',title:'防汛应急培训',img:'images/842.jpg',cnt:25,start:'2023-06-04',end:'2023-06-13',team:'中铁一局,陕西澜海泓森建设工程有限公司',flag:0}, {id:'04',title:'超重吊装专项培训',img:'images/843.jpg',cnt:16,start:'2023-06-04',end:'2023-06-13',team:'中铁一局,大国工匠',flag:1}, ], - fileNav:0, - files:[ - {name:'2023.7.28关于泾河在建工程安全管理的通知',time:'2023-07-15 11:22:33',url:'/jhfiles/1.上级部门/2023.7.28关于泾河在建工程安全管理的通知.pdf'}, - ], - files2:[ - {name:'2023.8.7建设项目检查周报',time:'2023-07-15 11:22:33',url:'/jhfiles/2.集团公司/2023.8.7建设项目检查周报.pdf'}, - ], - files3:[ - {name:'1.城投公司项目推进会材料7.17.pdf',time:'2023-07-15 11:22:33',url:'/jhfiles/3.分子公司/1.城投公司项目推进会材料7.24.pdf'}, - {name:'2.置业公司项目推进会材料7.21.pdf',time:'2023-07-15 11:22:33',url:'/jhfiles/3.分子公司/2.置业公司项目推进会材料7.21.pdf'}, - {name:'3.投资公司项目推进会材料7.21.pdf',time:'2023-07-15 11:22:33',url:'/jhfiles/3.分子公司/3.投资公司项目推进会材料7.21.pdf'}, - {name:'4.产发绿能项目推进会材料7.21.pdf',time:'2023-07-15 11:22:33',url:'/jhfiles/3.分子公司/4.产发绿能项目推进会材料7.21.pdf'}, - {name:'5.智能产业园项目推进会材料7.24.pdf',time:'2023-07-15 11:22:33',url:'/jhfiles/3.分子公司/5.智能产业园项目推进会材料7.24.pdf'}, - {name:'6.医疗公司项目推进会材料7.21.pdf',time:'2023-07-15 11:22:33',url:'/jhfiles/3.分子公司/6.医疗公司项目推进会材料7.21.pdf'}, - ], + // 传达文件路由 + fileNav:1, + // 传达文件标题 + fileTitle:"传达文件（0）", + // 传达文件列表 + fileList:[], infoNav:0, staffText:'在岗人员', surveyUrl:'images/survey_icon_4.png', @@ -273,7 +243,8 @@ export default { } }, created() { - this.init() + this.init(); + this.getWorkFileList(); }, mounted() { this.$bus.$on("deptChange",dept=>{ @@ -282,6 +253,18 @@ export default { }); }, methods: { + fileNavChage(val){ + this.fileNav = val; + this.getWorkFileList(); + }, + // 获取传达文件列表 + getWorkFileList(){ + this.$api.workFile.getWorkFileList(this.fileNav).then(d=>{ + this.fileList = d.rows; + let _title = "传达文件（"+this.fileList.length+"）"; + this.fileTitle = _title; + }); + }, fmt(n){ n=""+n; return " ".substring(0,3-n.length)+n; @@ -335,8 +318,8 @@ export default { }) }, downloadFile(it){ - if(it && it.url){ - window.open(''+it.url); + if(it && it.filePath){ + window.open('/jhapi'+it.filePath); } }, //劳务人员概况 From c58f656f4daeccfadcdd8cfcbba3146bdb0f2240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 12 Aug 2023 00:32:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 4 +- src/api/workTrain/index.js | 12 ++++ src/pages/projectSafety.vue | 109 ++++++++++++++++++++++++++++-------- 3 files changed, 100 insertions(+), 25 deletions(-) create mode 100644 src/api/workTrain/index.js diff --git a/src/api/index.js b/src/api/index.js index f893313..5292a7d 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -4,11 +4,13 @@ import schedule from './schedule/index' import quarterlyAssess from './quarterlyAssess/index' import problemmodify from './problemmodify/index' import workFile from './workFile/index' +import workTrain from './workTrain/index' export default { project, dept, schedule, quarterlyAssess, problemmodify, - workFile + workFile, + workTrain } \ No newline at end of file diff --git a/src/api/workTrain/index.js b/src/api/workTrain/index.js new file mode 100644 index 0000000..3771496 --- /dev/null +++ b/src/api/workTrain/index.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +const getWorkTrainList=(trainType,deptId)=> { + return request({ + url: `bgscreen/workTrain/getWorkTrainList?trainType=${trainType}&deptId=${deptId}`, + method: 'get' + }) +} + +export default{ + getWorkTrainList +} \ No newline at end of file diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index 863aca4..dcff466 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -54,32 +54,52 @@ - -
-
-
专项培训
-
- {{it.id}} - {{it.title}} - + +
+
+
+ {{index+1}} + {{it.trainNatureName}} +
-
- +
+
-
参与人数：{{it.cnt}} 人
+
参与人数：{{it.trainParticipants}} 人
- 培训时间:{{it.start}}~{{it.end}} + 培训时间:{{it.beginDate}}~{{it.endDate}}
-
协作队伍:{{it.team}}
+
协作队伍:{{it.trainDeptNames}}
- + + +
+
+
+ {{index+1}} + {{it.trainNatureName}} + +
+
+
+ +
+
+
参与人数：{{it.trainParticipants}} 人
+
+ 培训时间:{{it.beginDate}}~{{it.endDate}} +
+
+
+
协作队伍:{{it.trainDeptNames}}
+
+
+
{ this.dept=dept; this.doDeptChane(); + this.getWorkTrainList(); + this.getEmergencyDrillList(); }); }, methods: { @@ -265,6 +287,26 @@ export default { this.fileTitle = _title; }); }, + // 获取专项培训列表 + getWorkTrainList(){ + let deptId = ''; + if(this.dept){ + deptId = this.dept.id; + } + this.$api.workTrain.getWorkTrainList(0,deptId).then(d=>{ + this.workTrainList = d.rows; + }); + }, + // 获取专项培训列表 + getEmergencyDrillList(){ + let deptId = ''; + if(this.dept){ + deptId = this.dept.id; + } + this.$api.workTrain.getWorkTrainList(1,deptId).then(d=>{ + this.emergencyDrillList = d.rows; + }); + }, fmt(n){ n=""+n; return " ".substring(0,3-n.length)+n; @@ -316,6 +358,13 @@ export default { }) this.elKey++; }) + }, + // 获取图片映射 + getProfileImage(url){ + if(url){ + return '/jhapi'+url; + } + return url; }, downloadFile(it){ if(it && it.filePath){ @@ -473,8 +522,20 @@ export default { max-height: calc(100% - 90px); margin-right: 12px; overflow-y: auto; - - + } + .train-list{ + max-height: calc(100% - 45px); + margin-right: 12px; + overflow-y: auto; + } + .train-img{ + width: 85px; + height: 60px; + } + .train-img-par{ + height: 60px; + overflow: hidden; + margin: 10px 5px 5px 5px; } } \ No newline at end of file From bfa69a7a720421cb7ea15d2d819ba8d56706eaff Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 13 Aug 2023 21:58:01 +0800 Subject: [PATCH 3/5] update code --- src/pages/progress/indexDlg3.vue | 40 ++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/src/pages/progress/indexDlg3.vue b/src/pages/progress/indexDlg3.vue index d2647ff..f8af35b 100644 --- a/src/pages/progress/indexDlg3.vue +++ b/src/pages/progress/indexDlg3.vue @@ -67,9 +67,9 @@ p-id="4998">
-
+
-
+
@@ -83,7 +83,8 @@
+ style="flex-grow: 1;max-height: 750px;min-height:750px;overflow: auto;width: calc(100% - 504px);margin-top:8px;display: inline-flex;align-items: center;"> +
+
@@ -159,15 +161,15 @@ export default { }, mounted() { - let objs = window.jhcaches?.progressProjects - if (objs && objs.length > 0) { - this.prjs = objs; - return; - } - this.$api.project.getProgressProjects().then(d => { - this.prjs = d.data || []; - window.jhcaches.progressProjects = this.prjs; - }); + // let objs = window.jhcaches?.progressProjects + // if (objs && objs.length > 0) { + // this.prjs = objs; + // return; + // } + // this.$api.project.getProgressProjects().then(d => { + // this.prjs = d.data || []; + // window.jhcaches.progressProjects = this.prjs; + // }); }, methods: { @@ -217,11 +219,15 @@ export default { hideScreenUlSel2() { this.showSel2 = false }, - showDialog(scheduleInfo, prjs) { - this.scheduleInfo = scheduleInfo; - this.localStorage2 = JSON.parse(localStorage.getItem("data2")) - this.dept2 = this.localStorage2.text; - this.show = true + showDialog(scheduleInfo, prjs,dept) { + //this.$api.project.getProgressProjects(dept.id).then(d => { + //this.prjs = d.data || []; + this.prjs=(prjs||[]).filter(d=>+d.progressVisible==0); + this.scheduleInfo = scheduleInfo; + this.localStorage2 = JSON.parse(localStorage.getItem("data2")) + this.dept2 = this.localStorage2.text; + this.show = true + //}); }, setScreenLiSel2(item) { this.dept2 = item.projectName From 540f95db4e610504cd249401c6d51481fcf6c1d3 Mon Sep 17 00:00:00 2001 From: haha Date: Sun, 13 Aug 2023 22:11:18 +0800 Subject: [PATCH 4/5] update code --- src/components/header.js | 2 +- src/pages/index.vue | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/header.js b/src/components/header.js index 8a3012f..e544500 100644 --- a/src/components/header.js +++ b/src/components/header.js @@ -182,7 +182,7 @@ Vue.component("screen-header", { this.data=(d?.data||[]).map(it=>{ it.text=it.projectName; return it; - }); + }).filter(it=>+it.progressVisible==0); this.$bus.$emit("loadProjects",this.data); if(this.data.length>0){ this.setScreenLiSel2(this.data[0],init); diff --git a/src/pages/index.vue b/src/pages/index.vue index 11fefd7..c8bff32 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -49,8 +49,8 @@
-
在岗人数
-
今日出勤
+
在岗人数
+
今日出勤
@@ -547,9 +547,9 @@ export default { this.elKey++; }, //劳务人员概况 - onWarningInfoNav(n, text) { + onWarningInfoNav(n) { this.infoNav = n - this.staffText = text + this.staffText = n==0?'在岗人数':'今日出勤' if (n == 0) { this.surveyUrl = 'images/survey_icon_4.png' this.laborPersonnelData = [ From 86a5119254197b6c8adb16235c3943ccbaf7f35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sun, 13 Aug 2023 22:12:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/favicon.ico | Bin 0 -> 16958 bytes src/pages/projectSafety.vue | 28 ++-- src/pages/woorktrain/indexDlg.vue | 211 ++++++++++++++++++++++++++++++ 3 files changed, 231 insertions(+), 8 deletions(-) create mode 100644 public/favicon.ico create mode 100644 src/pages/woorktrain/indexDlg.vue diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..af9875b0176cb75a6bcd90b03fd271ec7c51699f GIT binary patch literal 16958 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 literal 0 HcmV?d00001 diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue index dcff466..7b8b324 100644 --- a/src/pages/projectSafety.vue +++ b/src/pages/projectSafety.vue @@ -56,10 +56,10 @@
-
+
- {{index+1}} - {{it.trainNatureName}} + {{'0'+(index+1)}} + {{it.trainTitle}}
@@ -79,10 +79,10 @@
-
+
- {{index+1}} - {{it.trainNatureName}} + {{'0'+(index+1)}} + {{it.trainTitle}}
@@ -193,6 +193,7 @@
+
@@ -209,7 +210,12 @@ import '../components/staff-survey-chart' import '../components/idle-list-chart' import '../components/people-number' import '../components/people-number' +import woorktrainDlg from './woorktrain/indexDlg' + export default { + components:{ + woorktrainDlg + }, data() { return { elKey:0, @@ -275,6 +281,9 @@ export default { }); }, methods: { + doShowDlgTrain(it){ + this.$refs.workTrainDlg.showDialog(it) + }, fileNavChage(val){ this.fileNav = val; this.getWorkFileList(); @@ -290,7 +299,7 @@ export default { // 获取专项培训列表 getWorkTrainList(){ let deptId = ''; - if(this.dept){ + if(this.dept && this.dept.id!=0){ deptId = this.dept.id; } this.$api.workTrain.getWorkTrainList(0,deptId).then(d=>{ @@ -300,7 +309,7 @@ export default { // 获取专项培训列表 getEmergencyDrillList(){ let deptId = ''; - if(this.dept){ + if(this.dept && this.dept.id!=0){ deptId = this.dept.id; } this.$api.workTrain.getWorkTrainList(1,deptId).then(d=>{ @@ -523,6 +532,9 @@ export default { margin-right: 12px; overflow-y: auto; } + .transition-item{ + cursor: pointer; + } .train-list{ max-height: calc(100% - 45px); margin-right: 12px; diff --git a/src/pages/woorktrain/indexDlg.vue b/src/pages/woorktrain/indexDlg.vue new file mode 100644 index 0000000..f6e74dc --- /dev/null +++ b/src/pages/woorktrain/indexDlg.vue @@ -0,0 +1,211 @@ + + + + + +style lang="less"> +.my-dialog.progress-dlg3 { + .popup-project-introduction-min { + transform: translateY(100px); + } + + &.font-size-2 { + .popup-project-introduction-details { + .col-2 { + font-size: 32px; + line-height: 64px; + + .div-text { + line-height: 64px; + } + } + } + } + + &.font-size-1 { + .popup-project-introduction-details { + .col-2 { + font-size: 24px; + line-height: 48px; + + .div-text { + line-height: 48px; + } + } + } + } + + .font-size-tools { + position: absolute; + top: 18px; + right: 400px; + } + + .popup-project-introduction-details { + padding: 0px; + + &:hover { + .modify-btn { + display: flex; + } + } + + .quality-table { + padding: 0px; + + .prj-info-list { + padding: 0px; + } + } + + .modify-btn { + display: none; + position: absolute; + top: 450px; + z-index: 100; + cursor: pointer; + padding: 0px; + border-radius: 50%; + width: 100px; + height: 100px; + align-items: center; + justify-content: center; + + cursor: pointer; + + &:hover { + background-color: rgba(255, 255, 255, 0.2); + + svg { + * { + fill: #fff; + } + } + } + + &.btn-right { + right: 20px; + } + + &.btn-left { + left: 20px; + } + } + + .col-2 { + line-height: 30px; + + .div-text { + line-height: 30px; + } + } + } + + .head-title-select { + width: 300px; + padding-top: 0px; + } +} \ No newline at end of file