diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000..af9875b Binary files /dev/null and b/public/favicon.ico differ 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