From d2b3192cd9bc7df4b56c25a86e7d71166e0cdb5d 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: Mon, 14 Aug 2023 00:15:33 +0800
Subject: [PATCH] =?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/pages/projectSafety.vue       |  13 ++-
 src/pages/woorktrain/indexDlg.vue | 178 +++++++++---------------------
 2 files changed, 61 insertions(+), 130 deletions(-)

diff --git a/src/pages/projectSafety.vue b/src/pages/projectSafety.vue
index 7b8b324..81b23eb 100644
--- a/src/pages/projectSafety.vue
+++ b/src/pages/projectSafety.vue
@@ -56,7 +56,7 @@
                 <el-col :span="6" >
                     <module-one-1-1 label="专项培训">
                         <div style="padding:10px" class="train-list scroll">
-                        <div v-for="(it,index) in workTrainList" :key="index" class="transition-item" @click="doShowDlgTrain(it)">
+                        <div v-for="(it,index) in workTrainList" :key="index" class="transition-item" @click="doShowDlgTrain(it,0)">
                         <div class="bottom-line2" style="line-height: 24px;margin-top: 8px;">
                             <span style="color:#59A0DC;display: inline-block;margin-right: 8px;">{{'0'+(index+1)}}</span>
                             <span style="font-weight: bold;color:#59A0DC;">{{it.trainTitle}}</span>
@@ -79,7 +79,7 @@
                     </module-one-1-1>  
                     <module-one-1-1 label="应急演练">
                         <div style="padding:10px" class="train-list scroll">
-                        <div v-for="(it,index) in emergencyDrillList" :key="index" class="transition-item" @click="doShowDlgTrain(it)">
+                        <div v-for="(it,index) in emergencyDrillList" :key="index" class="transition-item" @click="doShowDlgTrain(it,1)">
                         <div class="bottom-line2" style="line-height: 24px;margin-top: 8px;">
                             <span style="color:#59A0DC;display: inline-block;margin-right: 8px;">{{'0'+(index+1)}}</span>
                             <span style="font-weight: bold;color:#59A0DC;">{{it.trainTitle}}</span>
@@ -281,7 +281,14 @@ export default {
             });
         },
         methods: {
-            doShowDlgTrain(it){
+            doShowDlgTrain(it,type){
+                if(type=="0"){
+                    it.title = "专项培训";
+                    it.typeTitle = "培训"; 
+                }else{
+                    it.title = "应急演练";
+                    it.typeTitle = "演练"; 
+                }
                 this.$refs.workTrainDlg.showDialog(it)
             },
             fileNavChage(val){
diff --git a/src/pages/woorktrain/indexDlg.vue b/src/pages/woorktrain/indexDlg.vue
index f6e74dc..3bb6a42 100644
--- a/src/pages/woorktrain/indexDlg.vue
+++ b/src/pages/woorktrain/indexDlg.vue
@@ -1,12 +1,12 @@
 <template>
-    <MyDialog v-if="show" v-model="show" width="1200px" height="550px" class="worktrain-dlg">
+    <MyDialog v-if="show" v-model="show" width="1000px" height="450px" class="worktrain-dlg">
         <template slot="title">{{title}}</template>
-        <div class="col-2 scroll" style="max-height: 750px;overflow: auto;padding: 12px 0px;">
-            <div class="prj-info-list" v-if="data && JSON.stringify(data) != '{}'">
-            <div class="col-1" style="width:500px;padding-top:12px;">
-                <el-carousel height="500px" v-if="data && data.mainImage && data.mainImage.length > 0">
-                    <div style="display: flex;align-items: center;justify-content: center;height: 500px;width:500px;">
-                        <img :src="$apiPath + data.mainImage" style="width:100%">
+        <div style="display: block;height: 450px;">
+        <div class="prj-info-list" v-if="data && JSON.stringify(data) != '{}'">
+            <div class="col-1" style="width:400px;display: inline-block;">
+                <el-carousel height="400px" v-if="data && data.mainImage && data.mainImage.length > 0">
+                    <div style="width: 100%;align-items: center;justify-content: center;height: 400px;margin-top: 10px;">
+                        <img :src="$apiPath + data.mainImage" style="width: 400px;height: 350px;">
                     </div>
                 </el-carousel>
                 <div v-else style="text-align: center;margin-top: 140px;">
@@ -15,52 +15,48 @@
                 </div>
             </div>
             <div class="col-2 scroll"
-                style="flex-grow: 1;overflow: auto;width: calc(100% - 505px);margin-top:8px;">
-                <template v-if="scheduleInfo.plannedNode">
-                    <div><img src="images/title_icon.png"><span class="sp-lbl">计划节点</span></div>
+                style="flex-grow: 1;max-height: 450px;min-height:450px;overflow: auto;width: calc(100% - 430px);align-items: center;float:right;margin-top: 10px;">
+                <div>
+                <template v-if="data.projectName">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">项目名称</span></div>
                     <div class="div-text ">
-                        <div>{{ scheduleInfo.plannedNode }}</div>
+                        <div>{{ data.projectName }}</div>
                     </div>
                 </template>
-                <template v-if="scheduleInfo.actualNode">
-                    <div><img src="images/title_icon.png"><span class="sp-lbl">实际节点</span></div>
+                <template v-if="data.trainNatureName">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">{{data.typeTitle+'类型'}}</span></div>
                     <div class="div-text ">
-                        <div>{{ scheduleInfo.actualNode }}</div>
+                        <div>{{ data.trainNatureName }}</div>
                     </div>
                 </template>
-                <template v-if="scheduleInfo.purchaseProgress">
-                    <div><img src="images/title_icon.png"><span class="sp-lbl">融资、招采进展</span></div>
+                <template v-if="data.trainTitle">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">{{data.typeTitle+'标题'}}</span></div>
                     <div class="div-text ">
-                        <div>{{ scheduleInfo.purchaseProgress }}</div>
+                        <div>{{ data.trainTitle }}</div>
                     </div>
                 </template>
-                <template v-if="scheduleInfo.designProgress">
-                    <div><img src="images/title_icon.png"><span class="sp-lbl">报建、设计进展</span></div>
+                <template v-if="data.trainParticipants">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">参与人数</span></div>
                     <div class="div-text ">
-                        <div>{{ scheduleInfo.designProgress }}</div>
+                        <div>{{ data.trainParticipants +' 人'}}</div>
                     </div>
                 </template>
-                <template v-if="scheduleInfo.constructionProgress">
-                    <div><img src="images/title_icon.png"><span class="sp-lbl">施工进展</span></div>
+                <template v-if="data.beginDate && data.endDate">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">{{data.typeTitle+'时间'}}</span></div>
                     <div class="div-text ">
-                        <div>{{ scheduleInfo.constructionProgress }}</div>
+                        <div>{{ data.beginDate }} ~ {{ data.endDate }}</div>
                     </div>
                 </template>
-                <template v-if="scheduleInfo.acceptanceProgress">
-                    <div><img src="images/title_icon.png"><span class="sp-lbl">验收进展</span></div>
+                <template v-if="data.trainContent">
+                    <div><img src="images/title_icon.png"><span class="sp-lbl">{{data.typeTitle+'内容'}}</span></div>
                     <div class="div-text ">
-                        <div>{{ scheduleInfo.acceptanceProgress }}</div>
-                    </div>
-                </template>
-                <template v-if="scheduleInfo.planForNextWeek">
-                    <div><img src="images/title_icon.png"><span class="sp-lbl">下周计划</span></div>
-                    <div class="div-text ">
-                        <div>{{ scheduleInfo.planForNextWeek }}</div>
+                        <div>{{ data.trainContent }}</div>
                     </div>
                 </template>
+                </div>
             </div>
         </div>
-        <div v-else style="text-align: center;padding-top: 150px;min-height: 500px;">
+        <div v-else style="text-align: center;padding-top: 150px;min-height: 350px;">
             <img src="images/nodata.png" style="width: 240px;">
             <div style="text-align: center;">暂无数据</div>
         </div>
@@ -79,6 +75,7 @@ export default {
     data() {
         return {
             title:'',
+            TypeTitle:'',
             data: null,
             show: false
         };
@@ -93,6 +90,7 @@ export default {
         showDialog(it) {
             this.data = it;
             this.title = it.title;
+            this.TypeTitle = it.TypeTitle;
             this.show = true;
         }
     },
@@ -106,106 +104,32 @@ export default {
     }
 }
 </style>
-style lang="less">
-.my-dialog.progress-dlg3 {
+<style lang="less">
+.my-dialog.worktrain-dlg {
     .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;
+        top: 25px;
     }
-
-    .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;
-            }
-        }
+    .quality-table{
+        padding: 0px !important;
     }
-
-    .head-title-select {
-        width: 300px;
-        padding-top: 0px;
+    .sp-lbl {
+        display: inline-block;
+        color: aquamarine;
     }
-}</style>
\ No newline at end of file
+    .div-text{
+        color: #B8C9EE;
+        line-height: 30px;
+        padding-left: 20px;
+    }
+    .col-2 img{
+        width: 12px;
+        height: 12px;
+    }
+}
+
+</style>
\ No newline at end of file