From 09abeae851f72a25f105030e37c6a0c9f3189378 Mon Sep 17 00:00:00 2001
From: WXL (wul) <wl_5969728@163.com>
Date: 星期二, 07 七月 2026 14:54:57 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue          |   20 ++
 dist.zip                                          |    0 
 vue.config.js                                     |    2 
 随访7.6.zip                                         |    0 
 src/components/optionalModule/index.vue           |   11 
 src/utils/request.js                              |    1 
 /dev/null                                         |    0 
 src/views/login.vue                               |    2 
 src/views/followvisit/record/detailpage/index.vue |  265 +++++++++++++++++++++----------------
 src/views/sfstatistics/percentage/index.vue       |    5 
 随访7.7.zip                                         |    0 
 src/App.vue                                       |    4 
 src/views/followvisit/discharge/index.vue         |   55 +++++++
 src/views/outsideChainwtnew.vue                   |   19 +-
 14 files changed, 247 insertions(+), 137 deletions(-)

diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip" b/dist.zip
similarity index 93%
rename from "\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip"
rename to dist.zip
index 7e2236b..07b3666 100644
--- "a/\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip"
+++ b/dist.zip
Binary files differ
diff --git a/src/App.vue b/src/App.vue
index 83f295c..25aaecd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,13 +3,13 @@
     <router-view />
     <theme-picker />
     <!-- <Assistant v-if="routertf" /> -->
-    <Assistant
+    <!-- <Assistant
       v-if="Assvite"
       :initial-position="{ x: 50, y: 200 }"
       :auto-hide="false"
       :hide-delay="3000"
       primary-color="#1890ff"
-    />
+    /> -->
   </div>
 </template>
 
diff --git a/src/components/optionalModule/index.vue b/src/components/optionalModule/index.vue
index e5af730..d3762fe 100644
--- a/src/components/optionalModule/index.vue
+++ b/src/components/optionalModule/index.vue
@@ -55,8 +55,8 @@
               v-model="scopetype"
               placeholder="榛樿鍏ㄩ儴"
               :options="sourcetype"
-            filterable
-            clearable
+              filterable
+              clearable
               :props="{ expandTrigger: 'hover' }"
               @change="handleChange"
             ></el-cascader>
@@ -78,6 +78,7 @@
 
         <!-- 妯℃澘鍒楄〃 -->
         <el-table
+          v-loading="loading"
           :data="templateList"
           style="width: 100%"
           @row-click="handleSelectTemplate"
@@ -364,10 +365,10 @@
       ],
       // 鏌ヨ鍙傛暟
       queryParams: {
-        type: 1,
-        deptType: "1",
+        pageNum: 1,
+        pageSize: 10,
         svyname: "",
-        deptCode: "",
+        isenable: "",
       },
       total: 0,
 
diff --git a/src/utils/request.js b/src/utils/request.js
index f8c552b..2445631 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -111,7 +111,6 @@
         )
           .then(() => {
             console.log('閫夋嫨閲嶆柊鐧诲綍');
-
             this.$router.replace("/login");
           })
           .catch(() => {
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 0ed1b45..d5dbb08 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -373,6 +373,15 @@
           </template>
         </el-table-column>
         <el-table-column
+          label="褰撳墠鎵ц鏂瑰紡"
+          align="center"
+          key="currentPreachform"
+          prop="currentPreachform"
+          width="160"
+          :show-overflow-tooltip="true"
+        >
+        </el-table-column>
+        <el-table-column
           label="闅忚瀹屾垚鏃堕棿"
           sortable
           align="center"
@@ -395,16 +404,30 @@
           </template></el-table-column
         >
         <el-table-column
+          label="寮�濮嬮殢璁挎椂闂�"
+          width="146"
+          align="center"
+          key="longSendTime"
+          prop="longSendTime"
+          :render-header="Tooltipks"
+        >
+          <template slot-scope="scope">
+            <span>{{ formatTime(scope.row.longSendTime) }}</span>
+          </template></el-table-column
+        >
+        <el-table-column
           label="搴旈殢璁挎棩鏈�"
           width="146"
           align="center"
           key="visitTime"
           prop="visitTime"
+          :render-header="Tooltipy"
         >
           <template slot-scope="scope">
             <span>{{ formatTime(scope.row.visitTime) }}</span>
           </template></el-table-column
         >
+
         <!-- 鍘� -->
         <el-table-column
           label="涓绘不鍖荤敓"
@@ -1541,6 +1564,12 @@
               return item ? item.label : null;
             });
           }
+          if (item.currentPreachform) {
+            item.currentPreachform = this.checkboxlist.find(
+              (item) => item.value == item.currentPreachform
+            )?.value;
+            console.log(item.currentPreachform, "mi");
+          }
         });
 
         this.total = response.total;
@@ -1576,6 +1605,32 @@
         this.getList(1);
       }
     },
+    Tooltipy(h, { column }) {
+      return h(
+        "el-tooltip",
+        {
+          props: {
+            content: "浠诲姟閰嶇疆澶氱琛ュ伩绫诲瀷鏃讹紝鏈�鏂版墽琛岀被鍨嬬殑搴旈殢璁挎椂闂�",
+            placement: "top",
+            effect: "dark",
+          },
+        },
+        [h("span", column.label)]
+      );
+    },
+    Tooltipks(h, { column }) {
+      return h(
+        "el-tooltip",
+        {
+          props: {
+            content: "浠诲姟瀛樺湪澶氱琛ュ伩绫诲瀷鏃剁殑棣栨搴旈殢璁挎椂闂�",
+            placement: "top",
+            effect: "dark",
+          },
+        },
+        [h("span", column.label)]
+      );
+    },
     // 鏃堕棿
     getEndOfDay() {
       const date = new Date(); // 鍒涘缓涓�涓〃绀哄綋鍓嶆椂闂寸殑Date瀵硅薄
diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue
index 9d0f20f..7a81969 100644
--- a/src/views/followvisit/record/detailpage/index.vue
+++ b/src/views/followvisit/record/detailpage/index.vue
@@ -365,7 +365,7 @@
                   <div class="title">
                     {{ taskname ? taskname : "闂嵎" }}
                     <span style="margin-left: 50px">
-                      <el-button type="primary" round @click="smsSubTask">
+                      <el-button type="primary" round @click="smsSubTask" v-if="orgname != '鐪佺珛鍚屽痉缈犺嫅闄㈠尯'">
                         闂嵎鐭俊鎺ㄩ��
                       </el-button>
                     </span>
@@ -684,7 +684,7 @@
                   type="primary"
                   round
                   @click="sendAgain"
-                  v-if="(form.isVisitAgain != 2) & (visitAgain == 2)"
+                  v-if="(form.isVisitAgain == 1) & (visitAgain == 2)"
                 >
                   鍐嶆闅忚
                 </el-button>
@@ -929,6 +929,13 @@
                   >
                     鏆備笉澶勭悊
                   </el-button>
+                   <el-button
+                    plain
+                    type="success"
+                    @click="Editsingletaskson('6')"
+                  >
+                    宸查潰璁�
+                  </el-button>
                   <el-button
                     plain
                     type="success"
@@ -946,7 +953,7 @@
                   <el-button plain type="info" @click="Editsingletaskson('5')">
                     浜哄伐闅忚
                   </el-button>
-                  <el-button type="primary" round @click="sendAgainmsg">
+                  <el-button type="primary" round @click="sendAgainmsg" v-if="orgname != '鐪佺珛鍚屽痉缈犺嫅闄㈠尯'">
                     鐭俊鍙戦��
                   </el-button>
                 </div>
@@ -1082,51 +1089,37 @@
       </div>
     </el-dialog>
     <el-dialog
-      title="鎮h�呭啀娆¢殢璁�"
-      v-dialogDrags
-      :visible.sync="dialogFormVisible"
-    >
-      <el-form ref="zcform" :rules="zcrules" :model="form" label-width="80px">
+  title="鎮h�呭啀娆¢殢璁�"
+  v-dialogDrags
+  :visible.sync="dialogFormVisible"
+  width="700px"
+>
+  <el-form ref="zcform" :rules="zcrules" :model="form" label-width="80px">
+    <!-- 鍩虹鏈嶅姟淇℃伅 - 榛樿鎶樺彔 -->
+    <el-collapse v-model="activeNames" @change="handleCollapseChange">
+      <el-collapse-item title="鍩虹鏈嶅姟淇℃伅" name="basic">
         <el-form-item label="浠诲姟鍚嶇О">
-          <el-input
-            style="width: 400px"
-            disabled
-            v-model="form.taskName"
-          ></el-input>
+          <el-input style="width: 100%" disabled v-model="form.taskName"></el-input>
         </el-form-item>
         <el-form-item label="鎮h�呭悕绉�">
-          <el-input
-            style="width: 400px"
-            disabled
-            v-model="form.sendname"
-          ></el-input>
+          <el-input style="width: 100%" disabled v-model="form.sendname"></el-input>
         </el-form-item>
         <el-form-item label="骞撮緞">
-          <el-input style="width: 400px" disabled v-model="form.age"></el-input>
+          <el-input style="width: 100%" disabled v-model="form.age"></el-input>
         </el-form-item>
         <el-form-item label="绉戝">
-          <el-input
-            style="width: 400px"
-            disabled
-            v-model="form.deptname"
-          ></el-input>
+          <el-input style="width: 100%" disabled v-model="form.deptname"></el-input>
         </el-form-item>
         <el-form-item label="鐥呭尯">
-          <el-input
-            style="width: 400px"
-            disabled
-            v-model="form.leavehospitaldistrictname"
-          ></el-input>
+          <el-input style="width: 100%" disabled v-model="form.leavehospitaldistrictname"></el-input>
         </el-form-item>
         <el-form-item label="鍑洪櫌鏃堕棿">
-          <el-input
-            style="width: 400px"
-            disabled
-            v-model="form.endtime"
-          ></el-input>
+          <el-input style="width: 100%" disabled v-model="form.endtime"></el-input>
         </el-form-item>
-        <div class="headline">涓婃闅忚</div>
-        <el-divider></el-divider>
+      </el-collapse-item>
+
+      <!-- 涓婃闅忚淇℃伅 - 榛樿鎶樺彔 -->
+      <el-collapse-item title="涓婃闅忚" name="last">
         <el-row>
           <el-col :span="12">
             <el-form-item label="闅忚鏂瑰紡">
@@ -1138,6 +1131,7 @@
                 disabled
                 placeholder="璇烽�夋嫨闅忚鏂瑰紡"
                 class="custom-disabled"
+                style="width: 90%"
               >
                 <el-option
                   v-for="item in options"
@@ -1159,11 +1153,11 @@
                 align="right"
                 v-model="form.date2"
                 class="custom-disabled"
+                style="width: 95%"
               ></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-form-item label="闅忚璁板綍">
           <el-input
             class="custom-disabled"
@@ -1172,8 +1166,10 @@
             v-model="form.remark2"
           ></el-input>
         </el-form-item>
-        <div class="headline">涓嬫闅忚</div>
-        <el-divider></el-divider>
+      </el-collapse-item>
+
+      <!-- 涓嬫闅忚淇℃伅 - 榛樿灞曞紑 -->
+      <el-collapse-item title="涓嬫闅忚" name="next">
         <el-row>
           <el-col :span="12">
             <el-form-item label="闅忚鏂瑰紡" prop="visitType">
@@ -1184,6 +1180,7 @@
                 default-first-option
                 @change="visitChange"
                 placeholder="璇烽�夋嫨闅忚鏂瑰紡(渚濆嚭闄㈡椂闂磋绠�)"
+                style="width: 90%"
               >
                 <el-option
                   v-for="item in options"
@@ -1204,6 +1201,7 @@
                 align="right"
                 v-model="form.date1"
                 class="custom-disabled"
+                style="width: 92%"
                 value-format="yyyy-MM-dd hh:mm:ss"
                 @change="checkFollowupDate"
               ></el-date-picker>
@@ -1216,18 +1214,17 @@
             <el-radio label="2">闅忚涓績闅忚</el-radio>
           </el-radio-group>
         </el-form-item>
-
         <el-form-item label="闅忚璁板綍" :required="form.resource == '2'">
           <el-input type="textarea" v-model="form.remark"></el-input>
         </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="warning" @click="dialogFormVisible = false"
-          >鍙� 娑�</el-button
-        >
-        <el-button type="primary" @click="setupsubtask">纭鍒涘缓鏈嶅姟</el-button>
-      </div>
-    </el-dialog>
+      </el-collapse-item>
+    </el-collapse>
+  </el-form>
+  <div slot="footer" class="dialog-footer">
+    <el-button type="warning" @click="dialogFormVisible = false">鍙� 娑�</el-button>
+    <el-button type="primary" @click="setupsubtask">纭鍒涘缓鏈嶅姟</el-button>
+  </div>
+</el-dialog>
     <div class="main-content" v-if="orgname == '鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�'">
       <!-- <el-button @click="CaldialogVisible = true">鎵撳紑寮规</el-button> -->
 
@@ -1364,6 +1361,7 @@
     };
     return {
       visitAgain: 1,
+      activeNames: ['next'], // 鍙睍寮�"涓嬫闅忚"锛屽叾浠栭兘鎶樺彔
       userid: "",
       defaultKey: false, //鏄惁鍙粯璁ゅ~鎶�
       currentPhoneNumber: "",
@@ -1710,6 +1708,9 @@
         return "scriptTopic-dev"; // 姝e父 - 榛樿鏍峰紡
       }
     },
+    handleCollapseChange(val) {
+    console.log('鎶樺彔闈㈡澘鐘舵�佸彉鍖�:', val);
+  },
     getconfigKey() {
       getconfigKey("default.value.icon").then((res) => {
         if (res.msg) {
@@ -1793,7 +1794,9 @@
               item.scriptResult = item.scriptResult;
             } else if (item.scriptResultId && item.scriptType == 2) {
               console.log(item.scriptResult, "item.scriptResult");
-              item.scriptResult = item.scriptResult.split("&");
+              item.scriptResult = item.scriptResult
+                ? item.scriptResult.split("&")
+                : [];
               item.isoption = 3;
             } else if (!item.scriptResultId && item.scriptType == 2) {
               item.scriptResult = [];
@@ -2033,37 +2036,38 @@
           this.Editsingletasksonyic(this.serviceStates);
           const orgName = localStorage.getItem("orgname");
 
-          if (
-            this.form.isVisitAgain != 1 ||
-            orgName == "涓芥按甯備腑鍖婚櫌" ||
-            this.visitAgain == 1
-          ) {
+          if (this.form.isVisitAgain != 1 || this.visitAgain == 1) {
             this.Torouter();
             return;
           }
-          // this.$modal
-          //   .confirm(
-          //     '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮h�咃細"' +
-          //       this.userform.name +
-          //       '"鍐嶆闅忚锛�',
-          //     "纭",
-          //     {
-          //       confirmButtonText: "纭畾",
-          //       cancelButtonText: "鍙栨秷",
-          //       showCancelButton: true,
-          //       dangerouslyUseHTMLString: true,
-          //       confirmButtonClass: "custom-confirm-button", // 鑷畾涔夌‘璁ゆ寜閽殑绫诲悕
-          //       cancelButtonClass: "custom-cancel-button", // 鑷畾涔夊彇娑堟寜閽殑绫诲悕
-          //     }
-          //   )
-          //   .then(() => {
-          //     document.querySelector("#app").scrollTo(0, 0);
-          //     this.formtidy();
-          //     this.dialogFormVisible = true;
-          //   })
-          //   .catch(() => {
-          //     this.Torouter();
-          //   });
+          if (
+            orgName == "鏅畞鐣叉棌鑷不鍘夸汉姘戝尰闄�" ||
+            orgName == "缂欎簯绗簩浜烘皯鍖婚櫌"
+          ) {
+            this.$modal
+              .confirm(
+                '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮h�咃細"' +
+                  this.userform.name +
+                  '"鍐嶆闅忚锛�',
+                "纭",
+                {
+                  confirmButtonText: "纭畾",
+                  cancelButtonText: "鍙栨秷",
+                  showCancelButton: true,
+                  dangerouslyUseHTMLString: true,
+                  confirmButtonClass: "custom-confirm-button", // 鑷畾涔夌‘璁ゆ寜閽殑绫诲悕
+                  cancelButtonClass: "custom-cancel-button", // 鑷畾涔夊彇娑堟寜閽殑绫诲悕
+                }
+              )
+              .then(() => {
+                document.querySelector("#app").scrollTo(0, 0);
+                this.formtidy();
+                this.dialogFormVisible = true;
+              })
+              .catch(() => {
+                this.Torouter();
+              });
+          }
         }
       });
     },
@@ -2315,42 +2319,43 @@
       const orgName = localStorage.getItem("orgname");
       console.log(orgName, "orgName");
 
-      if (
-        this.form.isVisitAgain != 1 ||
-        orgName == "涓芥按甯備腑鍖婚櫌" ||
-        this.visitAgain == 1
-      ) {
-        this.Torouter();
-        return;
-      }
       savequestiondetail(obj).then((res) => {
         if (res.code == 200) {
           this.$modal.msgSuccess("鏈嶅姟淇濆瓨鎴愬姛");
-          this.Torouter();
+          // this.Torouter();
+          if (
+            this.form.isVisitAgain != 1 ||
+            orgName == "涓芥按甯備腑鍖婚櫌" ||
+            this.visitAgain == 1
+          ) {
+            console.log("c4");
 
-          //   this.$modal
-          //     .confirm(
-          //       '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮h�咃細"' +
-          //         this.userform.name +
-          //         '"鍐嶆闅忚锛�',
-          //       "纭",
-          //       {
-          //         confirmButtonText: "纭畾",
-          //         cancelButtonText: "鍙栨秷",
-          //         showCancelButton: true,
-          //         dangerouslyUseHTMLString: true,
-          //         confirmButtonClass: "custom-confirm-button", // 鑷畾涔夌‘璁ゆ寜閽殑绫诲悕
-          //         cancelButtonClass: "custom-cancel-button", // 鑷畾涔夊彇娑堟寜閽殑绫诲悕
-          //       }
-          //     )
-          //     .then(() => {
-          //       document.querySelector("#app").scrollTo(0, 0);
-          //       this.formtidy();
-          //       this.dialogFormVisible = true;
-          //     })
-          //     .catch(() => {
-          //       this.Torouter();
-          //     });
+            this.Torouter();
+            return;
+          }
+          this.$modal
+            .confirm(
+              '浠诲姟淇濆瓨鎴愬姛鏄惁閽堝鎮h�咃細"' +
+                this.userform.name +
+                '"鍐嶆闅忚锛�',
+              "纭",
+              {
+                confirmButtonText: "纭畾",
+                cancelButtonText: "鍙栨秷",
+                showCancelButton: true,
+                dangerouslyUseHTMLString: true,
+                confirmButtonClass: "custom-confirm-button", // 鑷畾涔夌‘璁ゆ寜閽殑绫诲悕
+                cancelButtonClass: "custom-cancel-button", // 鑷畾涔夊彇娑堟寜閽殑绫诲悕
+              }
+            )
+            .then(() => {
+              document.querySelector("#app").scrollTo(0, 0);
+              this.formtidy();
+              this.dialogFormVisible = true;
+            })
+            .catch(() => {
+              this.Torouter();
+            });
         }
       });
     },
@@ -2640,15 +2645,26 @@
       if (document.activeElement) {
         document.activeElement.blur();
       }
+      let selectedOptionObj = null;
+      if (this.Voicetype) {
+        console.log('Voicetype');
 
-      // 鎵惧埌琚�変腑鐨勯�夐」瀵硅薄
-      const selectedOptionObj = options.find(
-        (item) => item.optioncontent == selectedOption
-      );
+        selectedOptionObj = options.find(
+          (item) => item.targetvalue == selectedOption
+        );
+      } else {
+        // 鎵惧埌琚�変腑鐨勯�夐」瀵硅薄
+        selectedOptionObj = options.find(
+          (item) => item.optioncontent == selectedOption
+        );
+      }
 
+      console.log(this.tableDatatop, "this.tableDatatop");
+      console.log(selectedOptionObj, "selectedOptionObj");
       // 澶勭悊寮傚父鐘舵�侀珮浜�
       this.tableDatatop[questionIndex].isabnormal =
         selectedOptionObj.isabnormal;
+
       // 澶勭悊闄勫姞杈撳叆妗嗘樉绀�
 
       this.tableDatatop[questionIndex].showAppendInput =
@@ -4021,4 +4037,27 @@
   color: #66b1ff;
   transform: scale(1.1);
 }
+/* 璋冩暣鎶樺彔闈㈡澘鏍峰紡 */
+.el-collapse {
+  border-top: none;
+}
+
+.el-collapse-item__header {
+  font-size: 16px;
+  font-weight: bold;
+  background-color: #f5f7fa;
+  padding-left: 15px;
+  border-radius: 4px;
+  margin-bottom: 5px;
+}
+
+.el-collapse-item__wrap {
+  border-bottom: none;
+}
+
+.el-collapse-item__content {
+  padding: 20px 15px;
+  background-color: #fff;
+}
+
 </style>
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index aafd22e..d5409b2 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -184,8 +184,26 @@
           key="longTask"
           prop="longTask"
         >
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <span>{{ scope.row.longTask ? "闀挎湡浠诲姟" : "闈為暱鏈�" }}</span>
+          </template> -->
+           <template slot-scope="scope">
+
+              <div v-if="scope.row.longTask == 0">
+                <el-tag type="primary" :disable-transitions="false"
+                  >鑷畾涔夊懆鏈熶换鍔�</el-tag
+                >
+              </div>
+              <div v-if="scope.row.longTask == 1">
+                <el-tag type="success" :disable-transitions="false"
+                  >闀挎湡浠诲姟</el-tag
+                >
+              </div>
+              <div v-if="scope.row.longTask == 2">
+                <el-tag type="success" :disable-transitions="false"
+                  >鍥哄畾浠诲姟</el-tag
+                >
+              </div>
           </template>
         </el-table-column>
 
diff --git a/src/views/login.vue b/src/views/login.vue
index a464131..eaafca4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -128,7 +128,7 @@
         password: [
           { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
         ],
-        orgid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
+        campusid: [{ required: true, trigger: "blur", message: "璇烽�夋嫨闄㈠尯" }],
       },
       loading: false,
       // 楠岃瘉鐮佸紑鍏�
diff --git a/src/views/outsideChainwtnew.vue b/src/views/outsideChainwtnew.vue
index 6125e1c..4080709 100644
--- a/src/views/outsideChainwtnew.vue
+++ b/src/views/outsideChainwtnew.vue
@@ -500,6 +500,7 @@
       console.log(url, "url");
       // let url = 'http://218.108.11.22:8093/sf/003';
       // let urlid = this.extractLastSegmentFromUrl(url);
+      console.log("妫掓2");
 
       geturlinfo(url).then((res) => {
         if (res.code == 200) {
@@ -1033,15 +1034,16 @@
   margin: 12px 0;
   padding: 0 4px;
 }
-// 淇敼 options-group 鐨勬牱寮�
-.options-group {
+::v-deep .el-radio-group.options-group,
+::v-deep .el-checkbox-group.options-group {
   display: grid;
-  grid-template-columns: repeat(2, 1fr); // 鏀逛负涓ゅ垪缃戞牸
+  grid-template-columns: repeat(2, 1fr);
   gap: 10px;
   width: 100%;
 }
-// 閽堝澶氶�夌殑 checkbox-group 涔熷簲鐢ㄥ悓鏍风殑缃戞牸甯冨眬
-:deep(.el-checkbox-group) {
+
+// 鍚屾牱澶勭悊澶氶�夌殑鎯呭喌
+::v-deep .el-checkbox-group {
   display: grid;
   grid-template-columns: repeat(2, 1fr);
   gap: 10px;
@@ -1099,12 +1101,7 @@
   white-space: normal;
   line-height: 1.4;
 }
-// 鍦ㄥ皬灞忓箷涓婅皟鏁翠负鍗曞垪
-@media (max-width: 300px) {
-  .options-group {
-    grid-template-columns: 1fr; // 瓒呭皬灞忓箷鎭㈠鍗曞垪
-  }
-}
+
 .abnormal-indicator {
   color: #f56c6c;
   font-weight: bold;
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index ca39454..d8e3072 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -239,9 +239,10 @@
         serviceType: [2],
         dateRange: this.getLastMonthRange(),
         dateRangecy: [],
-        statisticaltype: 1,
+        statisticaltype:
+          localStorage.getItem("orgname") == "缂欎簯鍘夸汉姘戝尰闄�" ? 2 : 1,
         leavehospitaldistrictcodes: ["all"],
-        deptcodes: [],
+        deptcodes: ["all"],
       },
       pickerOptions: {
         shortcuts: [
diff --git a/vue.config.js b/vue.config.js
index e51e9e4..fe4bda0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -44,7 +44,7 @@
         // target:`http://35z1t16164.qicp.vip`,
         // target: `http://192.168.100.172:8095`,
         // target: `http://192.168.100.10:8089`,//鍗楀崕
-        // target: `http://192.168.191.181:8095`,
+        // target: `https://9.208.38.93:8092/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
diff --git "a/\345\244\226\351\223\276.zip" "b/\345\244\226\351\223\276.zip"
deleted file mode 100644
index 7970190..0000000
--- "a/\345\244\226\351\223\276.zip"
+++ /dev/null
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip" "b/\351\232\217\350\256\2777.6.zip"
similarity index 93%
copy from "\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip"
copy to "\351\232\217\350\256\2777.6.zip"
index 7e2236b..97686ff 100644
--- "a/\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip"
+++ "b/\351\232\217\350\256\2777.6.zip"
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip" "b/\351\232\217\350\256\2777.7.zip"
similarity index 93%
copy from "\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip"
copy to "\351\232\217\350\256\2777.7.zip"
index 7e2236b..ff30da1 100644
--- "a/\351\232\217\350\256\277\351\200\232\347\224\2507.1.zip"
+++ "b/\351\232\217\350\256\2777.7.zip"
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\250 \0502\051.zip" "b/\351\232\217\350\256\277\351\200\232\347\224\250 \0502\051.zip"
deleted file mode 100644
index 0bf4c55..0000000
--- "a/\351\232\217\350\256\277\351\200\232\347\224\250 \0502\051.zip"
+++ /dev/null
Binary files differ
diff --git "a/\351\232\217\350\256\277\351\200\232\347\224\250.zip" "b/\351\232\217\350\256\277\351\200\232\347\224\250.zip"
deleted file mode 100644
index 46644cf..0000000
--- "a/\351\232\217\350\256\277\351\200\232\347\224\250.zip"
+++ /dev/null
Binary files differ

--
Gitblit v1.9.3