From e201a35edc4cf3cf56c3995f8ceefbaa08c8151f Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Fri, 17 Feb 2023 14:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/articlelist/index.vue |  4 ++++
 src/views/blacklist/index.vue   | 12 +++++++-----
 vue.config.js                   |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/articlelist/index.vue b/src/views/articlelist/index.vue
index be8fafa..4ebf7bf 100644
--- a/src/views/articlelist/index.vue
+++ b/src/views/articlelist/index.vue
@@ -86,6 +86,8 @@ export default {
             editDisplay: false,
             viewDisplay: false,
             search: true,
+            startPlaceholder: '开始日期',
+            endPlaceholder: '结束日期',
           },
           {
             label: "内容",
@@ -185,6 +187,7 @@ export default {
     },
     rowSave(row, done, loading) {
       row.createDept = this.userInfo.dept_id;
+      row.content = encodeURIComponent(row.content);
       add(row).then(() => {
         this.onLoad(this.page);
         this.$message({
@@ -215,6 +218,7 @@ export default {
     addPublish() {
       let param = this.form;
       param.createDept = this.userInfo.dept_id;
+      param.content = encodeURIComponent(param.content);
       queryArticleDetail(this.userInfo.dept_id).then(res => {
         if (JSON.stringify(res.data.data) != '{}') {
           //一个医院只可以发布一条
diff --git a/src/views/blacklist/index.vue b/src/views/blacklist/index.vue
index 83c0c59..c4418c9 100644
--- a/src/views/blacklist/index.vue
+++ b/src/views/blacklist/index.vue
@@ -5,11 +5,11 @@
       @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
       @refresh-change="refreshChange" @on-load="onLoad">
       <template slot-scope="{row}" slot="menu">
-        <el-button type="text" icon="el-icon-circle-plus-outline" size="small" @click="handleCancel">取消黑名单
+        <el-button type="text" icon="el-icon-delete" size="small" @click="handleCancel(row)">取消黑名单
         </el-button>
       </template>
       <template slot-scope="{row}" slot="status">
-        <el-tag size="small">{{ row.status == 1 ? '已拉黑' : '已取消' }}</el-tag>
+        <el-tag size="small" type="danger">已拉黑</el-tag>
       </template>
     </avue-crud>
   </basic-container>
@@ -46,7 +46,7 @@ export default {
         column: [
           {
             label: "体检人姓名",
-            prop: "title",
+            prop: "cupName",
           },
           {
             label: "身份证号码",
@@ -56,7 +56,7 @@ export default {
           },
           {
             label: "联系方式",
-            prop: "content",
+            prop: "cupPhone",
           },
           {
             label: "预约时间",
@@ -67,10 +67,12 @@ export default {
             searchRange: true,
             search: true,
             hide: true,
+            startPlaceholder: '开始日期',
+            endPlaceholder: '结束日期',
           },
           {
             label: "预约时间",
-            prop: "releaseTime",
+            prop: "apmTime",
             type: "date",
             format: "yyyy-MM-dd hh:mm:ss",
             valueFormat: "yyyy-MM-dd hh:mm:ss",
diff --git a/vue.config.js b/vue.config.js
index 86364b9..bd2df6e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,7 @@ module.exports = {
     proxy: {
       "/api": {
         //本地服务接口地址
-        target: "http://192.168.1.3",
+        target: "http://192.168.1.3:8088",
         //远程演示服务地址,可用于直接启动项目
         // target: 'https://saber.bladex.vip/api',
         ws: true,