From 30a30cc63f9872790a6fd3e2e6978518adbcdecb Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期四, 13 十一月 2025 16:45:36 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/discharge/ClickCall copy.vue      |    2 +-
 vue.config.js                                           |    5 +++--
 src/views/patient/patient/ExternalPatient.vue           |    8 ++++----
 src/views/followvisit/record/detailpage/index.vue       |   21 ++++++++++++---------
 src/views/knowledge/questionnaire/compilequer/index.vue |    4 ++--
 src/components/CallButton/index.vue                     |    2 +-
 src/views/patient/patient/AwaitingAdmission.vue         |   17 -----------------
 7 files changed, 23 insertions(+), 36 deletions(-)

diff --git a/src/components/CallButton/index.vue b/src/components/CallButton/index.vue
index bc17eea..c839632 100644
--- a/src/components/CallButton/index.vue
+++ b/src/components/CallButton/index.vue
@@ -163,7 +163,7 @@
         this.startCallsetState();
       } catch (error) {
         console.error("鑾峰彇鍒嗘満鍙峰け璐�:", error);
-        this.updateStatus("failed", "鑾峰彇鍒嗘満鍙峰け璐�");
+        // this.updateStatus("failed", "鑾峰彇鍒嗘満鍙峰け璐�");
       }
     },
     async startCallsetState() {
diff --git a/src/views/followvisit/discharge/ClickCall copy.vue b/src/views/followvisit/discharge/ClickCall copy.vue
index b922b0c..bb2b2e0 100644
--- a/src/views/followvisit/discharge/ClickCall copy.vue
+++ b/src/views/followvisit/discharge/ClickCall copy.vue
@@ -181,7 +181,7 @@
         this.startCallsetState();
       } catch (error) {
         console.error("鑾峰彇搴у腑鍙峰け璐�:", error);
-        this.updateStatus("failed", "鑾峰彇搴у腑鍙峰け璐�");
+        // this.updateStatus("failed", "鑾峰彇搴у腑鍙峰け璐�");
       }
     },
     //浣跨敤搴у腑鍙�
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 1113245..5c8ddc0 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -1190,21 +1190,21 @@
       selectedTag: "",
       tagOptions: [
         {
-          value: '0',
+          value: "0",
           label: "姝e父",
           type: "normal",
           color: "#7ff5e1",
           description: "鎮h�呮儏鍐垫甯革紝鏃犻渶鐗瑰埆鍏虫敞",
         },
         {
-          value: '1',
+          value: "1",
           label: "寮傚父",
           type: "abnormal",
           color: "#f75c5c",
           description: "鎮h�呭瓨鍦ㄥ紓甯告儏鍐碉紝闇�瑕侀噸鐐瑰叧娉�",
         },
         {
-          value: '2',
+          value: "2",
           label: "璀﹀憡",
           type: "warning",
           color: "#fbfb4a",
@@ -1609,11 +1609,15 @@
         var objs = item.svyTaskTemplateTargetoptions.find(
           (items) => items.optioncontent == item.scriptResult
         );
-        if (obj) {
-          if (objs.isabnormal) {
+
+        if (objs) {
+          if (excep != 1 && objs.isabnormal) {
             excep = objs.isabnormal;
+            this.selectedTag = objs.isabnormal;
           }
         }
+        console.log(excep, "excep");
+
         let obj = {
           asrtext: null,
           patid: this.patid,
@@ -1792,7 +1796,8 @@
     },
     yuyingetdetail() {
       const dataToSubmit = JSON.parse(JSON.stringify(this.tableDatatop));
-
+      console.log(dataToSubmit, "dataToSubmit");
+      return;
       dataToSubmit.forEach((item, index) => {
         // 瀵规嫹璐濈殑鏁版嵁杩涜鎿嶄綔锛屼笉褰卞搷鍘熷鐨� scriptResult 鏁扮粍
         item.scriptResult = item.scriptResult.join("&");
@@ -2101,8 +2106,6 @@
     },
     // 鏂板鐨勫垏鎹㈤�変腑/鍙栨秷閫変腑鏂规硶
     handleRadioToggle(questionItem, index, options, optionValue) {
-      console.log(questionItem, optionValue, 999);
-
       // 濡傛灉鐐瑰嚮鐨勬槸褰撳墠宸查�変腑鐨勯�夐」锛屽垯鍙栨秷閫変腑
       if (questionItem.scriptResult === optionValue) {
         questionItem.scriptResult = ""; // 娓呯┖閫変腑鍊�
@@ -2760,7 +2763,7 @@
   margin: 0 10px 20px 10px;
 
   /* 褰撶缉鏀炬瘮渚嬪ぇ浜�100%鎴栧睆骞曞搴﹁緝灏忔椂鏀逛负涓婁笅鎺掑垪 */
-  @media screen and  (min-resolution: 1.5dppx) {
+  @media screen and (min-resolution: 1.5dppx) {
     flex-direction: column;
 
     .call-action,
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 1e7b1a2..d52a3d0 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -719,9 +719,9 @@
                             <el-option
                               :value="2"
                               label="璀﹀憡"
-                              :style="{ color: '#fbfb4a' }"
+                              :style="{ color: '#FFBA00' }"
                             >
-                              <span style="color: #fbfb4a">鈼� 璀﹀憡</span>
+                              <span style="color: #FFBA00">鈼� 璀﹀憡</span>
                             </el-option>
                             <el-option
                               :value="1"
diff --git a/src/views/patient/patient/AwaitingAdmission.vue b/src/views/patient/patient/AwaitingAdmission.vue
index a4f82aa..f692a80 100644
--- a/src/views/patient/patient/AwaitingAdmission.vue
+++ b/src/views/patient/patient/AwaitingAdmission.vue
@@ -320,23 +320,6 @@
             width="120"
           />
           <el-table-column
-            label="鏄惁瀛樺湪浠诲姟"
-            align="center"
-            key="serverState"
-            prop="serverState"
-            width="100"
-          >
-            <template slot-scope="scope">
-              <span
-                :style="{
-                  color: scope.row.serverState == 1 ? 'green' : 'gray',
-                }"
-              >
-                {{ scope.row.serverState == 1 ? "鏄�" : "鏃�" }}
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column
             label="鎿嶄綔"
             fixed="right"
             align="center"
diff --git a/src/views/patient/patient/ExternalPatient.vue b/src/views/patient/patient/ExternalPatient.vue
index 92b4039..69e7a2d 100644
--- a/src/views/patient/patient/ExternalPatient.vue
+++ b/src/views/patient/patient/ExternalPatient.vue
@@ -384,7 +384,7 @@
         </el-row>
         <el-row v-if="!amendtag">
           <el-col :span="8">
-            <el-form-item label="姘戞棌" prop="name">
+            <el-form-item label="姘戞棌" prop="nation">
               <el-input
                 v-model="form.nation"
                 placeholder="璇疯緭鍏ユ皯鏃�"
@@ -393,7 +393,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="绫嶈疮" prop="age">
+            <el-form-item label="绫嶈疮" prop="nativePlace">
               <el-input
                 v-model="form.nativePlace"
                 placeholder="璇疯緭鍏ョ睄璐�"
@@ -414,7 +414,7 @@
 
         <el-row v-if="!amendtag">
           <el-col :span="12">
-            <el-form-item label="鍑虹敓鍦�" prop="idcardno">
+            <el-form-item label="鍑虹敓鍦�">
               <el-input
                 v-model="form.birthplace"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
@@ -422,7 +422,7 @@
               />
             </el-form-item> </el-col
           ><el-col :span="12">
-            <el-form-item label="灞呬綇鍦�" prop="idcardno">
+            <el-form-item label="灞呬綇鍦�">
               <el-input
                 v-model="form.placeOfResidence"
                 placeholder="鍥姐�佺渷銆佸湴甯傘�佸尯鍘裤�佽閬撶瓑璇︾粏淇℃伅"
diff --git a/vue.config.js b/vue.config.js
index 973c481..aaaa772 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -37,8 +37,9 @@
       [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.10:8094`,
-        target:`http://localhost:8095`,
+        // target: `http://192.168.100.10:8094`,//鐪佺珛鍚屽痉
+        target: `http://192.168.100.10: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