From d73a5a6488267d176e40f671ea86fd366295d3a4 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sat, 7 Oct 2023 22:44:13 +0800
Subject: [PATCH] update code

---
 src/pages/progress/indexDlg3.vue          | 34 +++++++++++++----------
 src/pages/quality/materialSealListDlg.vue | 11 ++++----
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/pages/progress/indexDlg3.vue b/src/pages/progress/indexDlg3.vue
index 58c9178..2ee1a09 100644
--- a/src/pages/progress/indexDlg3.vue
+++ b/src/pages/progress/indexDlg3.vue
@@ -93,38 +93,38 @@
                 <template v-if="scheduleInfo.plannedNode">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">计划节点</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.plannedNode }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.plannedNode)"></div>
                     </div>
                 </template>
                 <template v-if="scheduleInfo.actualNode">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">实际节点</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.actualNode }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.actualNode)"></div>
                     </div>
                 </template>
             <template v-if="scheduleInfo.dataTemplate!=4">
                 <template v-if="scheduleInfo.purchaseProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">融资、招采进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.purchaseProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.purchaseProgress)"></div>
                     </div>
                 </template>
                 <template v-if="scheduleInfo.designProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">报建、设计进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.designProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.designProgress)"></div>
                     </div>
                 </template>
                 <template v-if="scheduleInfo.constructionProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">施工进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.constructionProgress }}</pre></div>
+                        <div v-html="toPre(scheduleInfo.constructionProgress)"></div>
                     </div>
                 </template>
                 <template v-if="scheduleInfo.acceptanceProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">验收进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.acceptanceProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.acceptanceProgress)"></div>
                     </div>
                 </template>
             </template>
@@ -132,46 +132,46 @@
                 <template v-if="scheduleInfo.constructionProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">施工进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.constructionProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.constructionProgress)"></div>
                     </div>
                 </template>
                 <template v-if="scheduleInfo.acceptanceProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">验收进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.acceptanceProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.acceptanceProgress)"></div>
                     </div>
                 </template>
                 <template v-if="scheduleInfo.purchaseProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">结算进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.purchaseProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.purchaseProgress)"></div>
                     </div>
                 </template>
                 <template v-if="scheduleInfo.designProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">运维进展</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.designProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.designProgress)"></div>
                     </div>
                 </template>
             </template>
                 <template v-if="scheduleInfo.planForNextWeek">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">下周计划</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.planForNextWeek }}</pre></div>
+                        <div v-html="toPre(scheduleInfo.planForNextWeek)"></div>
                     </div>
                 </template>
 
                 <template v-if="scheduleInfo.existingProblem">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">存在问题</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.existingProblem }}</pre></div>
+                        <div v-html="toPre(scheduleInfo.existingProblem)"></div>
                     </div>
                 </template>
 
                 <template v-if="scheduleInfo.problemProgress">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">问题推进情况</span></div>
                     <div class="div-text ">
-                        <div><pre>{{ scheduleInfo.problemProgress }}</pre></div>
+                        <div  v-html="toPre(scheduleInfo.problemProgress)"></div>
                     </div>
                 </template>
 
@@ -232,7 +232,13 @@ export default {
         
     },
 
-    methods: {        
+    methods: {     
+        toPre(html){
+            if(html){
+                return html.replace(/\n/g,'<br/>');
+            }
+            return "";
+        },
         doPreivew(url){
             this.$refs.ip.showDialog(url);
         },
diff --git a/src/pages/quality/materialSealListDlg.vue b/src/pages/quality/materialSealListDlg.vue
index 08f8e63..b38a3ca 100644
--- a/src/pages/quality/materialSealListDlg.vue
+++ b/src/pages/quality/materialSealListDlg.vue
@@ -2,8 +2,8 @@
     <MyDialog v-if="show" v-model="show" width="1600px" height="850px" class="JhbigscreenMaterialSealListDlg">
         <template slot="title">材料封样</template>
         <el-table :data="tableData" class="mytable" height="700" style="width: 100%;background: transparent;">
-            <el-table-column label="项目名称" align="center" prop="projectName" width="200" />
-            <el-table-column label="单位名称" align="center" prop="deptName" width="180"/>
+            <el-table-column label="项目名称" align="center" prop="projectName" />
+            <el-table-column label="单位名称" align="center" prop="deptName" />
             <el-table-column label="封样主图" align="center" prop="mainImage" width="220">
                 <template slot-scope="scope">
                     <el-image ref="preview" style="width: 200px; height: 100px" :src="scope.row.mainImage + '.min.jpg'"
@@ -11,11 +11,11 @@
                 </template>
             </el-table-column>
 
-            <el-table-column label="封样名称" align="center" prop="materialName" width="180" />
-            <el-table-column label="使用部位" align="center" prop="usePosition" width="150" />
+            <el-table-column label="封样名称" align="center" prop="materialName"  />
+            <el-table-column label="使用部位" align="center" prop="usePosition"  />
             <el-table-column label="指定品牌" align="center" prop="contractBrand" width="120" />
             <el-table-column label="拟用品牌" align="center" prop="useBrand" width="120" />
-            <el-table-column label="封样时间" align="center" prop="sealDate" width="180">
+            <el-table-column label="封样时间" align="center" prop="sealDate" >
                 <template slot-scope="scope">
                     <span>{{ scope.row.sealDate | formatDateTime }}</span>
                 </template>
@@ -157,6 +157,7 @@ export default {
     }
     .a-download{
         color:#fff;
+        text-decoration:none;
         margin-left:12px;
         .el-icon-download{
             color: #409EFF;