From 86d2ae88ea4ecff6a5eba478f9f4094ab683755d Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期日, 28 九月 2025 17:40:20 +0800
Subject: [PATCH] 测试完成

---
 vue.config.js                                      |    4 
 src/views/sfstatistics/percentage/satisfaction.vue |   83 +++++++++++++++++++++++++--
 src/views/patient/propaganda/particty.vue          |   31 ++++++++-
 src/views/patient/propaganda/QuestionnaireTask.vue |   16 +++++
 4 files changed, 118 insertions(+), 16 deletions(-)

diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index 84afbd6..06667b3 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -1038,7 +1038,7 @@
         pageNum: 1, //
         pageSize: 10,
       },
-      checkList: '',
+      checkList: "",
       selectedOrder: [],
       deliverytopqueryParams: {
         pageNum: 1, //
@@ -1694,6 +1694,20 @@
           { label: "绉戝", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
+      } else if (this.patientqueryParams.allhosp == 2) {
+        this.tableLabelhz = [
+          { label: "灏辫瘖鏃ユ湡", width: "150", prop: "admitdate" },
+          { label: "鎮h��", width: "", prop: "name" },
+          { label: "韬唤璇�", width: "200", prop: "idcardno" },
+          { label: "鐢佃瘽鍙风爜", width: "180", prop: "telcode" },
+          { label: "鎬у埆", width: "", prop: "sex" },
+          { label: "骞撮緞", width: "", prop: "age" },
+          { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
+          { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
+          { label: "鍖荤敓", width: "", prop: "drname" },
+          { label: "绉戝", width: "180", prop: "dept" },
+          { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
+        ];
       }
       if (this.allpids[0]) {
         this.patientqueryParams.pids = this.allpids;
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 67ffd2b..f52e5d2 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -1210,7 +1210,7 @@
       serviceType: null,
     };
   },
-  components: { SFtable, OptionalForm,SortCheckbox },
+  components: { SFtable, OptionalForm, SortCheckbox },
 
   created() {
     this.appraiselist = store.getters.appraiselist;
@@ -1463,7 +1463,7 @@
         this.leavehospitaldistrictcodes = [];
       }
       if (this.checkList) {
-        this.form.preachform = this.checkList.join(',');
+        this.form.preachform = this.checkList.join(",");
         this.form.preachformList = this.selectedOrder;
       } else {
         this.$modal.msgError("璇烽�夋嫨鏈嶅姟绫诲瀷");
@@ -1663,6 +1663,20 @@
           { label: "绉戝", width: "180", prop: "dept" },
           { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
         ];
+      } else if (this.patientqueryParams.allhosp == 2) {
+        this.tableLabelhz = [
+          { label: "灏辫瘖鏃ユ湡", width: "150", prop: "admitdate" },
+          { label: "鎮h��", width: "", prop: "name" },
+          { label: "韬唤璇�", width: "200", prop: "idcardno" },
+          { label: "鐢佃瘽鍙风爜", width: "180", prop: "telcode" },
+          { label: "鎬у埆", width: "", prop: "sex" },
+          { label: "骞撮緞", width: "", prop: "age" },
+          { label: "鍑洪櫌澶╂暟", width: "", prop: "endDay" },
+          { label: "璐d换鎶ゅ+", width: "", prop: "nurseName" },
+          { label: "鍖荤敓", width: "", prop: "drname" },
+          { label: "绉戝", width: "180", prop: "dept" },
+          { label: "鐥呭尯", width: "150", prop: "leavehospitaldistrictname" },
+        ];
       }
       if (this.allpids[0]) {
         this.patientqueryParams.pids = this.allpids;
@@ -1729,6 +1743,13 @@
           item.sfzh = item.idcardno;
           if (this.patientqueryParams.allhosp == 6) {
             item.patfrom = 1;
+          }
+          if (this.patientqueryParams.allhosp == 1) {
+            item.visittime = item.endtime;
+          } else if (this.patientqueryParams.allhosp == 4) {
+            item.visittime = item.starttime;
+          } else if (this.patientqueryParams.allhosp == 2) {
+            item.visittime = item.admitdate;
           }
           this.overallCase.push(item);
           this.form.patTaskRelevances.push(item);
@@ -1864,7 +1885,7 @@
               ? this.form.patTaskRelevances
               : [];
             this.overallCase = this.form.patTaskRelevances.concat();
-            this.checkList = this.form.preachform.split(',');
+            this.checkList = this.form.preachform.split(",");
             this.selectedOrder = this.form.preachformList;
 
             this.overallCase.forEach((item) => {
@@ -2209,8 +2230,8 @@
         }
       });
     },
-  checkSelectionChange(selectedValues, selectedOrder) {
-      this.selectedOrder = selectedValues ;
+    checkSelectionChange(selectedValues, selectedOrder) {
+      this.selectedOrder = selectedValues;
       console.log("褰撳墠閫変腑:", selectedValues);
       console.log("閫変腑椤哄簭:", selectedOrder);
     },
diff --git a/src/views/sfstatistics/percentage/satisfaction.vue b/src/views/sfstatistics/percentage/satisfaction.vue
index 99a6ba4..75de5a7 100644
--- a/src/views/sfstatistics/percentage/satisfaction.vue
+++ b/src/views/sfstatistics/percentage/satisfaction.vue
@@ -223,16 +223,11 @@
                 prop="joyTotal"
               >
                 <template slot-scope="scope">
-                  <el-button
-                    size="medium"
-                    type="text"
-                    @click="Seedetails(scope.row)"
-                    ><span class="button-zx"
+                  <span class="button-zx"
                       >{{
                         (Number(scope.row.joyTotal) * 100).toFixed(2)
                       }}%</span
-                    ></el-button
-                  >
+                    >
                 </template>
               </el-table-column>
               <el-table-column
@@ -246,7 +241,7 @@
                   <el-button
                     size="medium"
                     type="text"
-                    @click="Seedetails(scope.row)"
+                    @click="getinfo(scope.row)"
                     ><span class="button-zx"
                       ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span
                     ></el-button
@@ -514,6 +509,34 @@
         </div>
       </div>
     </el-dialog>
+    <!-- 鍗曠瀹ょ粺璁¤鎯� -->
+     <el-dialog :visible.sync="topicVisible" width="45%">
+      <div class="topicdia">
+        <div class="top-text">{{ topicvalue.name }}</div>
+        <div class="top-mintext">闅忚瀹屾垚鏁皗{ topicvalue.number }}</div>
+        <div style="overflow-x: hidden; overflow-y: auto; max-height: 65vh">
+          <div class="ttaabbcc" v-for="item in topiclist" :key="item.name">
+            <div class="describe">
+              绗瑊{ item.number }}棰橈細 {{ item.name }}?<span
+                >[{{ item.type == 1 ? "鍗曢�夐" : "澶氶�夐" }}]</span
+              >
+            </div>
+            <div>
+              <el-table :data="tableData" 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>
+            </div>
+          </div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="topicVisible = false">鍏� 闂�</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -601,6 +624,40 @@
         pn: 1,
         ps: 10,
       },
+      topiclist: [
+        {
+          name: "鎮ㄧ殑韬綋搴峰鎯呭喌濡備綍",
+          number: 1,
+          type: 1,
+        },
+        {
+          name: "鎮ㄧ殑楗鎯呭喌濡備綍",
+          number: 2,
+          type: 2,
+        },
+        {
+          name: "鎮ㄧ殑鎭㈠鎯呭喌濡備綍",
+          number: 3,
+          type: 1,
+        },
+      ],
+        tableData: [
+        {
+          date: "濂�",
+          name: 12,
+          address: "50%",
+        },
+        {
+          date: "涓�鑸�",
+          name: 2,
+          address: "6.2%",
+        },
+        {
+          date: "宸�",
+          name: 0,
+          address: "0%",
+        },
+      ],
       amendtag: false, //鏄惁淇敼绫诲埆
       lstamendtag: false, //鏄惁淇敼鏍囩
       scavisible: false, //鍒犻櫎寮规
@@ -641,6 +698,11 @@
       dialogFormVisible: false, //娣诲姞銆佷慨鏀圭被鍒脊妗�
       lstamendtagVisible: false, //娣诲姞銆佷慨鏀规爣绛惧脊妗�
       goQRCodeVisible: false, //浜岀淮鐮佸脊妗�
+      topicVisible: false, //鎺у埗鍗曢寮规
+      topicvalue: {
+        name: "楠ㄧ闅忚妯℃澘",
+        number: 222,
+      },
       sidecolumnval: "", //绫诲埆鎼滅储
       propss: { multiple: true },
       SeedetailsVisible: false,
@@ -822,6 +884,11 @@
         });
       }, 300);
     },
+    // 璋冭捣璇︽儏
+    getinfo(row) {
+      this.topicVisible = true;
+
+    },
     // 娣诲姞/淇敼鏍囩
     Maintenancetag() {
       if (this.lstamendtag) {
diff --git a/vue.config.js b/vue.config.js
index 2425e70..03f157c 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,9 +36,9 @@
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `https://www.health-y.cn/lssf`,
-        // target: `http://192.168.100.127:8095`,
+        target: `http://192.168.100.129:8095`,
         // target: `http://192.168.100.10:8096`,
-        target:`http://localhost:8095`,
+        // target:`http://localhost:8095`,
         // target:`http://35z1t16164.qicp.vip`,
         // target: `http://192.168.100.193:8095`,
         // target: `http://192.168.101.166:8093`,

--
Gitblit v1.9.3