From f4e079fcf2987400e0e555a8c404cb8a96a1ee5c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 10 二月 2025 18:00:34 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/outpatient/index.vue             |    6 
 src/views/patient/physical/index.vue                   |   18 +-
 src/assets/styles/variables.scss                       |    4 
 vue.config.js                                          |    4 
 src/assets/styles/sidebar.scss                         |    3 
 src/views/patient/medtechnician/SpecializedService.vue |   16 
 src/api/AiCentre/SingleTask.js                         |  247 ++++++++++++++-------------
 src/views/patient/questionnaire/index.vue              |   18 +-
 src/views/patient/propaganda/QuestionnaireTask.vue     |    5 
 src/views/patient/propaganda/index.vue                 |   12 
 src/views/sfstatistics/analyse/index.vue               |   10 
 src/views/followvisit/record/detailpage/index.vue      |   10 
 src/views/sfstatistics/percentage/index.vue            |    2 
 src/store/getters.js                                   |    2 
 src/views/shortmessage/messagebank/index.vue           |    4 
 src/views/patient/propaganda/particty.vue              |    3 
 src/views/followvisit/discharge/index.vue              |  150 ++++++++++++---
 src/views/patient/ycquestionnaire/index.vue            |   18 +-
 18 files changed, 314 insertions(+), 218 deletions(-)

diff --git a/src/api/AiCentre/SingleTask.js b/src/api/AiCentre/SingleTask.js
index 7cb15f2..c94501b 100644
--- a/src/api/AiCentre/SingleTask.js
+++ b/src/api/AiCentre/SingleTask.js
@@ -11,129 +11,136 @@
 
 // 鍒犻櫎瀹f暀浠诲姟
 export function delhetaskinfo(Id) {
-    return request({
-      url: "/smartor/serviceSubtask/remove/" + Id,
-      method: "get",
-    });
-  }
-    // 鏌ヨ瀹f暀浠诲姟璇︽儏鍒楄〃
-    export function gethetaskinfo(Id) {
-    return request({
-      url: "/smartor/serviceSubtask/getInfo/" + Id,
-      method: "get",
-    });
-  }
+  return request({
+    url: "/smartor/serviceSubtask/remove/" + Id,
+    method: "get",
+  });
+}
+// 鏌ヨ瀹f暀浠诲姟璇︽儏鍒楄〃
+export function gethetaskinfo(Id) {
+  return request({
+    url: "/smartor/serviceSubtask/getInfo/" + Id,
+    method: "get",
+  });
+}
 // 鏂板妯℃澘
 export function addhetask(data) {
-    return request({
-      url: "/smartor/serviceSubtask/add",
-      method: "post",
-      data: data,
-    });
-  }
+  return request({
+    url: "/smartor/serviceSubtask/add",
+    method: "post",
+    data: data,
+  });
+}
 //   淇敼瀹f暀浠诲姟
-  export function edithetask(data) {
-    return request({
-      url: "/smartor/serviceSubtask/edit",
-      method: "post",
-      data: data,
-    });
-  }
-  //   鑾峰彇鎮h�呬俊鎭�
-  export function getTaskpatient(data) {
-    return request({
-      url: "/smartor/patarchive/getPatientInfo",
-      method: "post",
-      data: data,
-    });
-  }
-  //   浠诲姟閫夊彇鎮h�呬俊鎭�
-  export function getTaskpatientQC(data) {
-    return request({
-      url: "/smartor/patarchive/getPatientInfoQC",
-      method: "post",
-      data: data,
-    });
-  }
-  // 鏂板鎴栦慨鏀逛换鍔�
-  export function Editsingletask(data) {
-    return request({
-      url: "/smartor/serviceSubtask/insertOrUpdateTask",
-      method: "post",
-      data: data,
-    });
-  }
-    // 鏂板鎴栦慨鏀瑰崟涓湇鍔�
-    export function Editsingletaskson(data) {
-      return request({
-        url: "/smartor/serviceSubtask/update",
-        method: "post",
-        data: data,
-      });
-    }
-  // 鍒犻櫎浠诲姟骞跺垹闄ゅ叧鑱旂殑鎮h�呮湇鍔�
-  export function delTaskInfo(taskid) {
-    return request({
-      url: "/smartor/servicetask/remove/"+taskid,
-      method: "get",
-    });
-  }
-    // 鏌ヨ浠诲姟鍒楄〃
-    export function getTasklist(data) {
-      return request({
-        url: "/smartor/servicetask/list",
-        method: "post",
-        data: data,
-      });
-    }
-    // 鏌ヨ浠诲姟璇︽儏
-    export function getTaskInfo(data) {
-      return request({
-        url: "/smartor/serviceSubtask/queryTaskByCondition",
-        method: "post",
-        data: data,
-      });
-    }
+export function edithetask(data) {
+  return request({
+    url: "/smartor/serviceSubtask/edit",
+    method: "post",
+    data: data,
+  });
+}
+//   鑾峰彇鎮h�呬俊鎭�
+export function getTaskpatient(data) {
+  return request({
+    url: "/smartor/patarchive/getPatientInfo",
+    method: "post",
+    data: data,
+  });
+}
+//   浠诲姟閫夊彇鎮h�呬俊鎭�
+export function getTaskpatientQC(data) {
+  return request({
+    url: "/smartor/patarchive/getPatientInfoQC",
+    method: "post",
+    data: data,
+  });
+}
+// 鏂板鎴栦慨鏀逛换鍔�
+export function Editsingletask(data) {
+  return request({
+    url: "/smartor/serviceSubtask/insertOrUpdateTask",
+    method: "post",
+    data: data,
+  });
+}
+// 鏂板鎴栦慨鏀瑰崟涓湇鍔�
+export function Editsingletaskson(data) {
+  return request({
+    url: "/smartor/serviceSubtask/update",
+    method: "post",
+    data: data,
+  });
+}
+// 鍒犻櫎浠诲姟骞跺垹闄ゅ叧鑱旂殑鎮h�呮湇鍔�
+export function delTaskInfo(taskid) {
+  return request({
+    url: "/smartor/servicetask/remove/" + taskid,
+    method: "get",
+  });
+}
+// 鏌ヨ浠诲姟鍒楄〃
+export function getTasklist(data) {
+  return request({
+    url: "/smartor/servicetask/list",
+    method: "post",
+    data: data,
+  });
+}
 
-    // 鏌ヨ闂ㄨ瘖鍑洪櫌鏈嶅姟鍒楄〃
-    export function getTaskservelist(data) {
-      return request({
-        url: "/smartor/serviceSubtask/patItem",
-        method: "post",
-        data: data,
-      });
-    }
-     // 浠诲姟绔嬪嵆鎵ц
-     export function GoheTaskSend(data) {
-      return request({
-        url: "/smartor/serviceSubtask/heTaskSend",
-        method: "post",
-        data: data,
-      });
-    }
+// 鏌ヨ浠诲姟璇︽儏
+export function getTaskInfo(data) {
+  return request({
+    url: "/smartor/serviceSubtask/queryTaskByCondition",
+    method: "post",
+    data: data,
+  });
+}
 
-    // 鑾峰彇浠诲姟妯℃澘璇︽儏
-  export function TaskTemplategetinfo(id) {
-    return request({
-      url: "/smartor/ivrTaskTemplate/getInfo/"+id,
-      method: "get",
-    });
-  }
-   // 浠诲姟妯℃澘鏂板淇敼
-   export function TaskTemplatecomit(data) {
-    return request({
-      url: "/smartor/ivrTaskTemplate/saveOrUpdateTempScript",
-      method: "post",
-      data: data,
-    });
-  }
-  // 浠诲姟鍙戦�侊紝鎵ц
-  export function TaskTemplateSendExecution(data) {
-    return request({
-      url: "/smartor/commonTask/taskSend",
-      method: "post",
-      data: data,
-    });
-  }
+// 鏌ヨ闂ㄨ瘖鍑洪櫌鏈嶅姟鍒楄〃
+export function getTaskservelist(data) {
+  return request({
+    url: "/smartor/serviceSubtask/patItem",
+    method: "post",
+    data: data,
+  });
+}
+// 蹇嵎鏌ヨ浠诲姟鍒楄〃
+export function buidegetTasklist(data) {
+  return request({
+    url: "/smartor/serviceSubtask/patItemByCondition",
+    method: "post",
+    data: data,
+  });
+}
+// 浠诲姟绔嬪嵆鎵ц
+export function GoheTaskSend(data) {
+  return request({
+    url: "/smartor/serviceSubtask/heTaskSend",
+    method: "post",
+    data: data,
+  });
+}
 
-
+// 鑾峰彇浠诲姟妯℃澘璇︽儏
+export function TaskTemplategetinfo(id) {
+  return request({
+    url: "/smartor/ivrTaskTemplate/getInfo/" + id,
+    method: "get",
+  });
+}
+// 浠诲姟妯℃澘鏂板淇敼
+export function TaskTemplatecomit(data) {
+  return request({
+    url: "/smartor/ivrTaskTemplate/saveOrUpdateTempScript",
+    method: "post",
+    data: data,
+  });
+}
+// 浠诲姟鍙戦�侊紝鎵ц
+export function TaskTemplateSendExecution(data) {
+  return request({
+    url: "/smartor/commonTask/taskSend",
+    method: "post",
+    data: data,
+  });
+}
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index fdb8adb..c1008b8 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -92,7 +92,8 @@
     & .nest-menu .el-submenu>.el-submenu__title,
     & .el-submenu .el-menu-item {
       min-width: $base-sidebar-width !important;
-
+color: rgb(20, 99, 246);
+font-weight: 600;
       &:hover {
         background-color: rgba(0, 0, 0, 0.06) !important;
       }
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 8b81233..b6400d0 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -17,10 +17,10 @@
 $base-logo-title-color: #ffffff;
 
 $base-menu-light-color:rgba(0,0,0,.70);
-$base-menu-light-background:#ffffff;
+$base-menu-light-background:#59f97f;
 $base-logo-light-title-color: #001529;
 
-$base-sub-menu-background:#81bcec;
+$base-sub-menu-background:#99baed;
 $base-sub-menu-hover:#001528;
 
 // 鑷畾涔夋殫鑹茶彍鍗曢鏍�
diff --git a/src/store/getters.js b/src/store/getters.js
index 9a197fa..0c4af54 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -115,7 +115,7 @@
   serviceState: (state) => [
     {
       value: "1",
-      label: "琚鍙�",
+      label: "琛ㄥ崟宸查鍙�",
       raw: {
         cssClass: "",
         listClass: "",
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 85dbad0..bd506c2 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -26,7 +26,7 @@
           <div class="ysfleftvlue">
             <el-card shadow="hover">
               <div style="padding: 8px">
-                <span>宸插彂閫佹湭棰嗗彇</span>
+                <span>琛ㄥ崟宸插彂閫�</span>
                 <div
                   style="
                     text-align: center;
@@ -188,6 +188,19 @@
             </div>
           </div>
         </el-col>
+        <el-col :span="1.5">
+          <div class="documentf">
+            <div class="document">
+              <el-button
+                type="success"
+                plain
+                size="medium"
+                @click="buidegetTasklist()"
+                >寰呭姙鏈嶅姟</el-button
+              >
+            </div>
+          </div>
+        </el-col>
       </el-row>
       <el-table
         v-loading="loading"
@@ -221,35 +234,41 @@
           width="120"
         >
           <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" :content="scope.row.remark" placement="top-start">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              :content="scope.row.remark"
+              placement="top-start"
+            >
               <div v-if="scope.row.sendstate == 1">
-              <el-tag type="primary" :disable-transitions="false"
-                >琚鍙�</el-tag
-              >
-            </div>
-            <div v-if="scope.row.sendstate == 2">
-              <el-tag type="primary" :disable-transitions="false"
-                >寰呭彂閫�</el-tag
-              >
-            </div>
-            <div v-if="scope.row.sendstate == 3">
-              <el-tag type="success" :disable-transitions="false"
-                >宸插彂閫佹湭棰嗗彇</el-tag
-              >
-            </div>
-            <div v-if="scope.row.sendstate == 4">
-              <el-tag type="info" :disable-transitions="false">涓嶆墽琛�</el-tag>
-            </div>
-            <div v-if="scope.row.sendstate == 5">
-              <el-tag type="danger" :disable-transitions="false"
-                >鍙戦�佸け璐�</el-tag
-              >
-            </div>
-            <div v-if="scope.row.sendstate == 6">
-              <el-tag type="danger" :disable-transitions="false">宸插畬鎴�</el-tag>
-            </div>
-    </el-tooltip>
-
+                <el-tag type="primary" :disable-transitions="false"
+                  >琛ㄥ崟宸查鍙�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 2">
+                <el-tag type="primary" :disable-transitions="false"
+                  >寰呮墽琛�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 3">
+                <el-tag type="success" :disable-transitions="false"
+                  >琛ㄥ崟宸插彂閫�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 4">
+                <el-tag type="info" :disable-transitions="false">涓嶆墽琛�</el-tag>
+              </div>
+              <div v-if="scope.row.sendstate == 5">
+                <el-tag type="danger" :disable-transitions="false"
+                  >鍙戦�佸け璐�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.sendstate == 6">
+                <el-tag type="danger" :disable-transitions="false"
+                  >宸插畬鎴�</el-tag
+                >
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
         <!-- <el-table-column
@@ -638,7 +657,7 @@
   resetUserPwd,
   changeUserStatus,
 } from "@/api/system/user";
-import { getTaskservelist } from "@/api/AiCentre/index";
+import { getTaskservelist, buidegetTasklist } from "@/api/AiCentre/index";
 import Treeselect from "@riophae/vue-treeselect";
 import store from "@/store";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -739,7 +758,7 @@
           value: 0,
         },
         {
-          name: "寰呭彂閫�",
+          name: "寰呮墽琛�",
           value: 0,
         },
         {
@@ -748,7 +767,7 @@
         },
 
         // {
-        //   name: "宸插彂閫佹湭棰嗗彇",
+        //   name: "琛ㄥ崟宸插彂閫�",
         //   value: 0,
         // },
       ],
@@ -778,15 +797,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呮墽琛�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
         {
           value: 4,
@@ -909,6 +928,67 @@
         this.total = response.total;
       });
     },
+    buidegetTasklist(type) {
+      if (this.topqueryParams.searchscope == 3) {
+        this.topqueryParams.leaveldeptcodes = store.getters.belongDepts.map(
+          (obj) => obj.deptCode
+        );
+        this.topqueryParams.leavehospitaldistrictcodes =
+          store.getters.belongWards.map((obj) => obj.districtCode);
+      }
+      // 鎺ュ彈寮傚父璺宠浆
+      if (this.errtype) {
+        this.topqueryParams.leavehospitaldistrictcodes.push(
+          this.leavehospitaldistrictcode
+        );
+      }
+      let obj = {
+        pageNum: 1,
+        pageSize: 10,
+        leavehospitaldistrictcodes: this.topqueryParams.leavehospitaldistrictcodes,
+        sendstates: [2, 3],
+        leaveldeptcodes: this.topqueryParams.leaveldeptcodes,
+      };
+      buidegetTasklist(obj).then((response) => {
+        this.userList = response.rows[0].serviceSubtaskList;
+        this.total = response.total;
+        if (refresh) {
+          this.cardlist[0].value =
+            Number(response.rows[0].wzx) + Number(response.rows[0].ysf);
+          this.cardlist[1].value = response.rows[0].wzx;
+          this.cardlist[2].value = response.rows[0].ysf;
+          this.ycvalue = response.rows[0].yc;
+          this.cardlist[3].value = response.rows[0].fssb;
+          this.cardlist[4].value = response.rows[0].dfs;
+          this.cardlist[5].value = response.rows[0].yfs2;
+          this.yfsvalue = response.rows[0].yfs;
+        }
+        this.loading = false;
+        this.userList.forEach((item) => {
+          let idArray = null;
+          if (item.endtime) {
+            item.endDay = this.daysBetween(item.endtime);
+          }
+
+          if (item.preachform) {
+            if (item.endtime) {
+              item.preachformson = item.preachform;
+              idArray = item.preachform.split(",");
+            }
+
+            item.preachform = idArray.map((value) => {
+              // 鏌ユ壘id瀵瑰簲鐨勫璞�
+              const item = this.checkboxlist.find(
+                (item) => item.value == value
+              );
+              // 濡傛灉鎵惧埌瀵瑰簲鐨刬d锛岃繑鍥瀕abel鍊硷紝鍚﹀垯杩斿洖null
+              return item ? item.label : null;
+            });
+          }
+        });
+        this.total = response.total;
+      });
+    },
     // 鏌ョ湅闂ㄨ瘖闅忚璇︽儏
     Referencequestion(row) {
       this.previewVisible = true;
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index ae3ac46..e5a5e8a 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -624,15 +624,15 @@
       topicoptions: [
       {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呮墽琛�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
       ],
       serviceState:[],
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index ffb92a7..acd20aa 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -35,17 +35,17 @@
             <template slot-scope="scope">
               <div v-if="scope.row.sendstate == 1">
                 <el-tag type="primary" :disable-transitions="false"
-                  >琚鍙�</el-tag
+                  >琛ㄥ崟宸查鍙�</el-tag
                 >
               </div>
               <div v-if="scope.row.sendstate == 2">
                 <el-tag type="primary" :disable-transitions="false"
-                  >寰呭彂閫�</el-tag
+                  >寰呮墽琛�</el-tag
                 >
               </div>
               <div v-if="scope.row.sendstate == 3">
                 <el-tag type="success" :disable-transitions="false"
-                  >宸插彂閫佹湭棰嗗彇</el-tag
+                  >琛ㄥ崟宸插彂閫�</el-tag
                 >
               </div>
               <div v-if="scope.row.sendstate == 4">
@@ -55,7 +55,9 @@
                 <el-tag type="danger" :disable-transitions="false"
                   >鍙戦�佸け璐�</el-tag
                 >
-              </div>
+              </div><div v-if="scope.row.sendstate == 6">
+              <el-tag type="success" :disable-transitions="false">宸插畬鎴�</el-tag>
+            </div>
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/views/patient/medtechnician/SpecializedService.vue b/src/views/patient/medtechnician/SpecializedService.vue
index 128c475..996e241 100644
--- a/src/views/patient/medtechnician/SpecializedService.vue
+++ b/src/views/patient/medtechnician/SpecializedService.vue
@@ -189,17 +189,17 @@
           <template slot-scope="scope">
             <div v-if="scope.row.sendstate == 1">
               <el-tag type="primary" :disable-transitions="false"
-                >琚鍙�</el-tag
+                >琛ㄥ崟宸查鍙�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 2">
               <el-tag type="primary" :disable-transitions="false"
-                >寰呭彂閫�</el-tag
+                >寰呮墽琛�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 3">
               <el-tag type="success" :disable-transitions="false"
-                >宸插彂閫佹湭棰嗗彇</el-tag
+                >琛ㄥ崟宸插彂閫�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 4">
@@ -703,11 +703,11 @@
           value: 0,
         },
         {
-          name: "琚鍙�",
+          name: "琛ㄥ崟宸查鍙�",
           value: 0,
         },
         {
-          name: "宸插彂閫佹湭棰嗗彇",
+          name: "琛ㄥ崟宸插彂閫�",
           value: 0,
         },
       ],
@@ -762,15 +762,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呮墽琛�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
         {
           value: 4,
diff --git a/src/views/patient/physical/index.vue b/src/views/patient/physical/index.vue
index 0518e42..5532a90 100644
--- a/src/views/patient/physical/index.vue
+++ b/src/views/patient/physical/index.vue
@@ -26,7 +26,7 @@
           <div class="ysfleftvlue">
             <el-card shadow="hover">
               <div style="padding: 8px">
-                <span>宸插彂閫佹湭棰嗗彇</span>
+                <span>琛ㄥ崟宸插彂閫�</span>
                 <div
                   style="
                     text-align: center;
@@ -223,17 +223,17 @@
           <template slot-scope="scope">
             <div v-if="scope.row.sendstate == 1">
               <el-tag type="primary" :disable-transitions="false"
-                >琚鍙�</el-tag
+                >琛ㄥ崟宸查鍙�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 2">
               <el-tag type="primary" :disable-transitions="false"
-                >寰呭彂閫�</el-tag
+                >寰呮墽琛�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 3">
               <el-tag type="success" :disable-transitions="false"
-                >宸插彂閫佹湭棰嗗彇</el-tag
+                >琛ㄥ崟宸插彂閫�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 4">
@@ -736,7 +736,7 @@
           value: 0,
         },
         {
-          name: "寰呭彂閫�",
+          name: "寰呮墽琛�",
           value: 0,
         },
         {
@@ -745,7 +745,7 @@
         },
 
         // {
-        //   name: "宸插彂閫佹湭棰嗗彇",
+        //   name: "琛ㄥ崟宸插彂閫�",
         //   value: 0,
         // },
       ],
@@ -775,15 +775,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呮墽琛�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
         {
           value: 4,
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 606be89..25e65e6 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -489,7 +489,7 @@
             <!-- 閫夋嫨鎮h�呭垪琛� -->
             <SFtable
               ref="multipleTable"
-              @handleUpdate="handleUpdate"
+
               @handleSelectionChange="handleSelectionChange"
               :currentList="patientuserList"
               :tableLabel="tableLabelhz"
@@ -1556,6 +1556,9 @@
           item.deptName = item.dept;
           item.admindate = item.inhosptime;
           item.sfzh = item.idcardno;
+          if (this.patientqueryParams.allhosp==6) {
+          item.patfrom = 1;
+          }
           this.overallCase.push(item);
           this.form.patTaskRelevances.push(item);
         }
diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue
index 87dc142..e403f2f 100644
--- a/src/views/patient/propaganda/index.vue
+++ b/src/views/patient/propaganda/index.vue
@@ -176,17 +176,17 @@
           <template slot-scope="scope">
             <div v-if="scope.row.sendstate == 1">
               <el-tag type="primary" :disable-transitions="false"
-                >琚鍙�</el-tag
+                >琛ㄥ崟宸查鍙�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 2">
               <el-tag type="primary" :disable-transitions="false"
-                >寰呭彂閫�</el-tag
+                >寰呮墽琛�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 3">
               <el-tag type="success" :disable-transitions="false"
-                >宸插彂閫佹湭棰嗗彇</el-tag
+                >琛ㄥ崟宸插彂閫�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 4">
@@ -731,15 +731,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呮墽琛�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
         {
           value: 4,
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 9a7b19f..fc43508 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -1604,6 +1604,9 @@
           item.deptName = item.dept;
           item.admindate = item.inhosptime;
           item.sfzh = item.idcardno;
+          if (this.patientqueryParams.allhosp==6) {
+          item.patfrom = 1;
+          }
           this.overallCase.push(item);
           this.form.patTaskRelevances.push(item);
         }
diff --git a/src/views/patient/questionnaire/index.vue b/src/views/patient/questionnaire/index.vue
index fd3ba16..0231e0a 100644
--- a/src/views/patient/questionnaire/index.vue
+++ b/src/views/patient/questionnaire/index.vue
@@ -26,7 +26,7 @@
           <div class="ysfleftvlue">
             <el-card shadow="hover">
               <div style="padding: 8px">
-                <span>宸插彂閫佹湭棰嗗彇</span>
+                <span>琛ㄥ崟宸插彂閫�</span>
                 <div
                   style="
                     text-align: center;
@@ -223,17 +223,17 @@
           <template slot-scope="scope">
             <div v-if="scope.row.sendstate == 1">
               <el-tag type="primary" :disable-transitions="false"
-                >琚鍙�</el-tag
+                >琛ㄥ崟宸查鍙�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 2">
               <el-tag type="primary" :disable-transitions="false"
-                >寰呭彂閫�</el-tag
+                >寰呮墽琛�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 3">
               <el-tag type="success" :disable-transitions="false"
-                >宸插彂閫佹湭棰嗗彇</el-tag
+                >琛ㄥ崟宸插彂閫�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 4">
@@ -736,7 +736,7 @@
           value: 0,
         },
         {
-          name: "寰呭彂閫�",
+          name: "寰呮墽琛�",
           value: 0,
         },
         {
@@ -745,7 +745,7 @@
         },
 
         // {
-        //   name: "宸插彂閫佹湭棰嗗彇",
+        //   name: "琛ㄥ崟宸插彂閫�",
         //   value: 0,
         // },
       ],
@@ -775,15 +775,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呮墽琛�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
         {
           value: 4,
diff --git a/src/views/patient/ycquestionnaire/index.vue b/src/views/patient/ycquestionnaire/index.vue
index 3c211f2..9a62f9a 100644
--- a/src/views/patient/ycquestionnaire/index.vue
+++ b/src/views/patient/ycquestionnaire/index.vue
@@ -26,7 +26,7 @@
           <div class="ysfleftvlue">
             <el-card shadow="hover">
               <div style="padding: 8px">
-                <span>宸插彂閫佹湭棰嗗彇</span>
+                <span>琛ㄥ崟宸插彂閫�</span>
                 <div
                   style="
                     text-align: center;
@@ -223,17 +223,17 @@
           <template slot-scope="scope">
             <div v-if="scope.row.sendstate == 1">
               <el-tag type="primary" :disable-transitions="false"
-                >琚鍙�</el-tag
+                >琛ㄥ崟宸查鍙�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 2">
               <el-tag type="primary" :disable-transitions="false"
-                >寰呭彂閫�</el-tag
+                >寰呮墽琛�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 3">
               <el-tag type="success" :disable-transitions="false"
-                >宸插彂閫佹湭棰嗗彇</el-tag
+                >琛ㄥ崟宸插彂閫�</el-tag
               >
             </div>
             <div v-if="scope.row.sendstate == 4">
@@ -736,7 +736,7 @@
           value: 0,
         },
         {
-          name: "寰呭彂閫�",
+          name: "寰呮墽琛�",
           value: 0,
         },
         {
@@ -745,7 +745,7 @@
         },
 
         // {
-        //   name: "宸插彂閫佹湭棰嗗彇",
+        //   name: "琛ㄥ崟宸插彂閫�",
         //   value: 0,
         // },
       ],
@@ -775,15 +775,15 @@
       topicoptions: [
         {
           value: 1,
-          label: "琚鍙�",
+          label: "琛ㄥ崟宸查鍙�",
         },
         {
           value: 2,
-          label: "寰呭彂閫�",
+          label: "寰呮墽琛�",
         },
         {
           value: 3,
-          label: "宸插彂閫佹湭棰嗗彇",
+          label: "琛ㄥ崟宸插彂閫�",
         },
         {
           value: 4,
diff --git a/src/views/sfstatistics/analyse/index.vue b/src/views/sfstatistics/analyse/index.vue
index 2313919..c4b52eb 100644
--- a/src/views/sfstatistics/analyse/index.vue
+++ b/src/views/sfstatistics/analyse/index.vue
@@ -4,7 +4,7 @@
       <div class="title-top">鏌ヨ鏉′欢</div>
       <div class="value">
         <el-form ref="form" :model="form" label-width="120px">
-          <el-form-item label="閫夋嫨鎸囨爣绫诲瀷">
+          <el-form-item label="閫夋嫨鎸囨爣鍚嶇О">
             <el-select v-model="value" filterable placeholder="璇烽�夋嫨">
               <el-option
                 v-for="item in options"
@@ -20,10 +20,10 @@
     </div>
     <div class="formindex">
       <el-table :data="tableData" border style="width: 100%">
-        <el-table-column prop="date" label="鎸囨爣绫诲瀷"> </el-table-column>
-        <el-table-column prop="name" label="鎸囨爣鍚嶇О"> </el-table-column>
-        <el-table-column prop="address" label="鍑虹幇娆℃暟"> </el-table-column>
-        <el-table-column prop="times" label="鎸囨爣绫诲瀷鍑虹幇娆℃暟">
+        <el-table-column prop="date" label="鎸囨爣鍚嶇О"> </el-table-column>
+        <el-table-column prop="name" label="鍗曢」鍚嶇О"> </el-table-column>
+        <el-table-column prop="address" label="鍗曢」鍑虹幇娆℃暟"> </el-table-column>
+        <el-table-column prop="times" label="鎸囨爣鍑虹幇娆℃暟">
         </el-table-column>
         <el-table-column prop="proportion" label="鍗犳瘮"> </el-table-column>
       </el-table>
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index f312d4f..2640598 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -240,7 +240,7 @@
               >
               </el-table-column
               ><el-table-column
-                label="寰呭彂閫�"
+                label="寰呮墽琛�"
                 align="center"
                 key="dfsCount"
                 prop="dfsCount"
diff --git a/src/views/shortmessage/messagebank/index.vue b/src/views/shortmessage/messagebank/index.vue
index 00a10f8..6adb4cb 100644
--- a/src/views/shortmessage/messagebank/index.vue
+++ b/src/views/shortmessage/messagebank/index.vue
@@ -37,7 +37,7 @@
           :class="classestag == 4 ? 'state-lines' : 'state-line'"
           @click="awaitfn"
         >
-          <div class="value-left"><i class="el-icon-s-help" />寰呭彂閫�</div>
+          <div class="value-left"><i class="el-icon-s-help" />寰呮墽琛�</div>
           <div class="quantityd">22</div>
         </div>
       </div>
@@ -770,7 +770,7 @@
     losefn() {
       this.classestag = 3;
     },
-    // 鍒囨崲寰呭彂閫佺被鍒�
+    // 鍒囨崲寰呮墽琛岀被鍒�
     awaitfn() {
       this.classestag = 4;
     },
diff --git a/vue.config.js b/vue.config.js
index 88f4eee..1708384 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -38,10 +38,10 @@
         // target: `http://192.168.2.13:8095`,
         // target: `http://10.202.20.185:8095`,
         // target: `http://192.168.100.184:8095`,
-        target:`http://localhost:8095`,
+        // target:`http://localhost:8095`,
         // target: `http://192.168.101.135:8095`,
         // target: `http://192.168.101.166:8093`,
-        // target: `http://192.168.191.181:8095`,
+        target: `http://192.168.191.181:8095`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

--
Gitblit v1.9.3