From b8ee668eaace5d422ebb27a200c3b178b82e2a6d Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 23 八月 2022 22:55:03 +0800
Subject: [PATCH] 1.提交

---
 src/views/zzmx/gylx.vue |   61 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index ae213e7..5c9d1aa 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -72,15 +72,26 @@
             prop="description"
             label="宸ヨ壓璺嚎鎻忚堪"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.description">{{ row.description }}</div>
+              <div v-else>/</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="enable"
             label="浣跨敤鐘舵��"
             sortable="custom"
           >
             <template slot-scope="{row}">
-              <div v-if="row.enable==='Y'">鏄�</div>
-              <div v-if="row.enable==='N'">鍚�</div>
+              <div v-if="row.enable==='Y'">
+                <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+                鏄�
+              </div>
+              <div v-if="row.enable==='N'">
+                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+                鍚�
+              </div>
             </template>
           </el-table-column>
           <el-table-column
@@ -102,7 +113,11 @@
             <template slot-scope="{row}">
               <div class="operationClass">
                 <el-tooltip class="item" effect="dark" content="棰勮" placement="top">
-                  <i class="el-icon-view" style="margin-right:15px;cursor: pointer;color:#42b983  " @click="edit('edit',row)" />
+                  <i
+                    class="el-icon-view"
+                    style="margin-right:15px;cursor: pointer;color:#42b983  "
+                    @click="edit('edit',row)"
+                  />
                 </el-tooltip>
                 <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
                   <i class="el-icon-delete" @click="del(row)" />
@@ -161,7 +176,12 @@
             </el-select>
           </el-form-item>
           <el-form-item label="宸ヨ壓鎻忚堪" prop="description">
-            <el-input v-model="dialogForm.description" :disabled="operation==='edit'" type="textarea" style="width: 220px" />
+            <el-input
+              v-model="dialogForm.description"
+              :disabled="operation==='edit'"
+              type="textarea"
+              style="width: 220px"
+            />
           </el-form-item>
         </div>
         <el-form-item label="宸ヨ壓璁剧疆" prop="Data" style="margin-top: 30px">
@@ -178,7 +198,7 @@
                     zIndex:tag.label===selectedName?0:2
                   }"
                 >
-                  {{ index+1 }}
+                  {{ index + 1 }}
                 </div>
 
                 <!--                <el-tooltip-->
@@ -368,7 +388,7 @@
       }
     },
     // 宸ヨ壓璁剧疆 涓嬫媺鑾峰彇鎵�鏈�
-    async  getStepSelectArr() {
+    async getStepSelectArr() {
       const { data: res } = await StepSelect()
       this.routeArr = res
     },
@@ -498,7 +518,13 @@
       if (this.clickSelected === '' || this.clickSelected === this.dynamicTags.length) {
         seq = this.dynamicTags.length + 1
         this.dynamicTags.push(
-          { editDisabled: true, seq: seq, stepname: '', effect: 'light', stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq)) }
+          {
+            editDisabled: true,
+            seq: seq,
+            stepname: '',
+            effect: 'light',
+            stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq))
+          }
         )
       } else {
         // 2.绗簩绉嶆儏鍐�   褰撻�変腑鏌愪釜tag   灏嗗湪tag鍚庨潰娣诲姞
@@ -565,7 +591,7 @@
       this.getStepSelectArr()
     },
     // 宸ヨ壓璺嚎棰勮
-    async  edit(operation, row) {
+    async edit(operation, row) {
       this.operation = operation
       this.dialogVisible = true
 
@@ -751,8 +777,9 @@
   border-radius: 0;
   color: $main_color;
 }
+
 ::v-deep .el-button--success:disabled {
-  background-color:#eeeeee;
+  background-color: #eeeeee;
   color: $main_color;
 }
 
@@ -786,8 +813,8 @@
   white-space: nowrap;
 }
 
-.autocompleteClass{
-  .el-autocomplete-suggestion li{
+.autocompleteClass {
+  .el-autocomplete-suggestion li {
     //color: red;
   }
 }
@@ -796,11 +823,12 @@
 <!--鍏叡椤甸潰鏍峰紡-->
 <style lang="scss" scoped>
 $main_color: #42b983;
-.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
   color: $main_color;
   cursor: pointer;
 }
-.el-icon-edit-outline{
+
+.el-icon-edit-outline {
   margin-right: 15px;
 }
 
@@ -861,8 +889,8 @@
   background-color: #f8f8fa;
 }
 
-::v-deep .el-table__body .el-table__row.hover-row td{
-  background-color: #eaecef ;
+::v-deep .el-table__body .el-table__row.hover-row td {
+  background-color: #eaecef;
 }
 
 ::v-deep .el-form--inline .el-form-item__label {
@@ -878,6 +906,7 @@
 .body ::v-deep .el-form-item {
   margin-bottom: 0;
 }
+
 .userDialogVisible ::v-deep .el-form-item {
   margin-bottom: 0;
 }

--
Gitblit v1.9.3