From 1635126d31ae7c82210d57c5b6445e1733477623 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 06 八月 2022 10:50:33 +0800
Subject: [PATCH] 1.添加图标

---
 src/icons/svg/circleNo.svg  |    2 ++
 src/views/jcsz/yhqd.vue     |    4 ++--
 src/views/jcsz/jsqd.vue     |    9 +++++++--
 src/views/sbgl/sbqd.vue     |    4 ++--
 src/icons/svg/circleYes.svg |    2 ++
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/icons/svg/circleNo.svg b/src/icons/svg/circleNo.svg
new file mode 100644
index 0000000..4dfb49a
--- /dev/null
+++ b/src/icons/svg/circleNo.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1659753886721" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6957" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M512 0C229.23 0 0 229.23 0 512s229.23 512 512 512 512-229.23 512-512S794.77 0 512 0z m44 256v339.492c0 24.301-19.7 44-44 44s-44-19.699-44-44V256c0-24.3 19.7-44 44-44s44 19.7 44 44z m-44 428c35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64-35.346 0-64-28.654-64-64 0-35.346 28.654-64 64-64z" p-id="6958" fill="#b4b5b9"></path></svg>
\ No newline at end of file
diff --git a/src/icons/svg/circleYes.svg b/src/icons/svg/circleYes.svg
new file mode 100644
index 0000000..2285395
--- /dev/null
+++ b/src/icons/svg/circleYes.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1659753742300" class="icon" viewBox="0 0 1098 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4630" xmlns:xlink="http://www.w3.org/1999/xlink" width="137.25" height="128"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M476.808045 0.000043C213.401753 0.106685-0.031993 213.68973 0 477.074693S213.551052 953.98938 476.94668 954.021373s476.957344-213.412417 477.085315-476.808045A477.010665 477.010665 0 0 0 476.808045 0.000043z m273.761252 353.369671L441.861388 661.853674a43.1901 43.1901 0 0 1-62.023117 0L202.214984 484.251715a43.864079 43.864079 0 1 1 62.033781-62.033782l147.21959 147.21959 277.89897-276.86454a43.861946 43.861946 0 1 1 62.023117 62.033781z m0 0" p-id="4631" fill="#42b983"></path></svg>
\ No newline at end of file
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 206278f..3ffa1a8 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -102,11 +102,16 @@
             label="鍒涘缓浜哄憳"
             sortable="custom"
             width="110"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.lm_user===null">/</div>
+              <div v-else>{{ row.lm_user }}</div>
+            </template>
+          </el-table-column>
           <el-table-column
             prop="lm_date"
             label="鍒涘缓鏃堕棿"
-            min-width="160"
+            width="160"
             sortable="custom"
           />
           <el-table-column
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 573a413..bac0ffe 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -166,8 +166,8 @@
             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
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 78e86d7..0d57e02 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -153,8 +153,8 @@
             width="120"
           >
             <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

--
Gitblit v1.9.3