From 6f1e7a63fa6afc261ba2247bf1d56f59dbb9f4c9 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 07 八月 2025 17:29:46 +0800
Subject: [PATCH] 测试完成

---
 src/views/index.vue                                            |  250 +++++++----
 /dev/null                                                      |    0 
 src/utils/sipService.js                                        |    8 
 src/views/patient/patient/hospital.vue                         |    7 
 src/views/shortmessage/healthinformation/index.vue             |    1 
 src/api/AiCentre/EChartsdata.js                                |    8 
 src/views/knowledge/education/compilequer/index.vue            |    2 
 src/views/patient/propaganda/Missioncreation.vue               |  183 +++++---
 src/views/shortmessage/healthinformation/compilequer/index.vue |  713 +++-------------------------------
 src/views/followvisit/discharge/index.vue                      |   14 
 10 files changed, 385 insertions(+), 801 deletions(-)

diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index b74678d..0000000
--- a/dist.zip
+++ /dev/null
Binary files differ
diff --git a/src/api/AiCentre/EChartsdata.js b/src/api/AiCentre/EChartsdata.js
index 94c3984..2b4d479 100644
--- a/src/api/AiCentre/EChartsdata.js
+++ b/src/api/AiCentre/EChartsdata.js
@@ -25,6 +25,14 @@
     data: data,
   });
 }
+// 棣栭〉涓儴鏁版嵁
+export function getServiceStatistics(data) {
+  return request({
+    url: "/smartor/serviceSubtask/getServiceStatistics",
+    method: "post",
+    data: data,
+  });
+}
 // 鏌ヨ鎮h�呬綇闄㈣褰曞垪琛�
 export function getechartsMedInhospList(data) {
   return request({
diff --git a/src/utils/sipService.js b/src/utils/sipService.js
index 57209b7..b93e184 100644
--- a/src/utils/sipService.js
+++ b/src/utils/sipService.js
@@ -20,8 +20,8 @@
         display_name: config.displayName,
         iceServers: [{ urls: "stun:stun.l.google.com:19302" }],
         register: true,
-        session_expires: 180,
-        sessionTimersExpires: 300,
+        session_expires: 900,
+        sessionTimersExpires: 600,
         extraHeaders: ["Min-SE: 120"],
         register_expires: 300,
         connection_recovery_min_interval: 2,
@@ -98,7 +98,7 @@
         this.setupAudio(this.currentSession);
 
       } catch (error) {
-        this.updateCallStatus("failed", `鍛煎彨澶辫触: ${error.message}`);
+        this.updateCallStatus("failed", `鍛煎彨澶辫触1: ${error.message}`);
         reject(error);
       }
     });
@@ -169,7 +169,7 @@
         errorMessage = `鍛煎彨澶辫触: ${e.cause || e.message}`;
     }
 
-    this.updateCallStatus("failed", errorMessage);
+    this.updateCallStatus("failed2", errorMessage);
     reject(new Error(errorMessage));
   }
 
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 24f7c2d..8c0f332 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -126,6 +126,12 @@
             placeholder="璇疯緭鍏ヤ富娌诲尰鐢�"
           ></el-input>
         </el-form-item>
+        <el-form-item label="缁忕鍖荤敓" prop="managementDoctor">
+          <el-input
+            v-model="topqueryParams.managementDoctor"
+            placeholder="璇疯緭鍏ヤ富娌诲尰鐢�"
+          ></el-input>
+        </el-form-item>
 
         <el-form-item label="鎮h�呰寖鍥�" prop="status">
           <el-cascader
@@ -437,6 +443,13 @@
           align="center"
           key="updateBy"
           prop="updateBy"
+          width="120"
+        />
+        <el-table-column
+          label="缁忕鍖荤敓"
+          align="center"
+          key="managementDoctor"
+          prop="managementDoctor"
           width="120"
         />
         <el-table-column
@@ -1397,6 +1410,7 @@
     affiliation() {
       this.topqueryParams.drcode = store.getters.hisUserId;
       this.topqueryParams.nurseId = store.getters.hisUserId;
+      this.topqueryParams.managementDoctor = store.getters.name;
       this.getList(1);
     },
     onthatday() {
diff --git a/src/views/index.vue b/src/views/index.vue
index 352aa61..d76be1a 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -105,13 +105,13 @@
                 ></el-radio-button>
               </el-radio-group>
             </div>
-            <!-- 涓棿echars -->
+            <!-- 涓儴绾挎�ф煴鐘跺浘 -->
             <div class="boxEchars">
               <div class="echars1" id="echars"></div>
             </div>
           </div>
         </el-col>
-        <!-- 涓棿鍜屽彸杈� -->
+        <!-- 鍙宠竟鍒楄〃 -->
         <el-col :span="4" class="aside">
           <div class="grid-content bg-purple" style="margin-top: -180px">
             <div class="title">
@@ -134,9 +134,7 @@
                 ></el-table-column>
 
                 <el-table-column prop="rc" class-name="rc">
-                  <template slot-scope="scope">
-                    {{ scope.row.rc }}娆�
-                  </template>
+                  <template slot-scope="scope"> {{ scope.row.rc }}娆� </template>
                 </el-table-column>
               </el-table>
             </div>
@@ -292,7 +290,7 @@
   getechartsListCountdata,
   getechartsMedOuthospList,
   getechartsMedInhospList,
-  getechartsandData,
+  getServiceStatistics,
   getDeptRanking,
 } from "@/api/AiCentre/index";
 import dayjs from "dayjs";
@@ -310,6 +308,11 @@
       lastHeight: window.innerHeight,
       radio1: "鏈�",
       ticketStatistics: {},
+      timeTypeMap: {
+        鍛�: "day",
+        鏈�: "month",
+        骞�: "year",
+      },
       DischargeData: {
         rs: "",
         rc: "",
@@ -352,7 +355,7 @@
     this.getgraphdata();
     this.getranking();
     this.$nextTick(function () {
-      this.getregionAmountCollect();
+      this.myEcharts2();
       this.getnodeCollect();
       this.getSkuTop();
     });
@@ -379,7 +382,7 @@
       this.getgraphdata();
       this.getranking();
       this.getTopdata();
-      this.getregionAmountCollect();
+      this.myEcharts2();
       this.getnodeCollect();
       this.getSkuTop();
     },
@@ -396,15 +399,15 @@
     },
     // top鎺掕
     async getSkuTop() {
-       let Rankingdata = {
+      let Rankingdata = {
         startDate: this.endatd,
         endDate: this.statd,
         cy: 1,
       };
       await getDeptRanking(Rankingdata).then((res) => {
         if (res.code == 200) {
-          this.SkuTop=res.rows.sort((a, b) => b.rc - a.rc);
-          console.log(this.SkuTop,'this.SkuTop');
+          this.SkuTop = res.rows.sort((a, b) => b.rc - a.rc);
+          console.log(this.SkuTop, "this.SkuTop");
         }
       });
 
@@ -451,26 +454,141 @@
         }
       });
     },
-    // 鑾峰彇灏辫瘖鏁伴噺
-    getranking() {
-
-    },
     // 鑾峰彇涓儴绾挎煴鍥炬暟鎹�
-    getgraphdata() {
-      let Outhospdata = {
+    getranking() {},
+
+    async getgraphdata() {
+      let params = {
         startDate: this.endatd,
         endDate: this.statd,
-        cy: 1,
+        timeType:
+          this.radio1 === "鍛�"
+            ? "day"
+            : this.radio1 === "鏈�"
+            ? "month"
+            : "year",
       };
-      let Inhospdata = {
-        startDate: this.endatd,
-        endDate: this.statd,
-        cy: 1,
+
+      try {
+        const res = await getServiceStatistics(params);
+        if (res.code === 200) {
+          this.processChartData(res.data);
+        }
+      } catch (error) {
+        console.error("鑾峰彇鍥捐〃鏁版嵁澶辫触:", error);
+      }
+    },
+    processChartData(data) {
+      // 鎸夋椂闂存帓搴忕‘淇濇暟鎹『搴忔纭�
+      const sortedData = [...data].sort(
+        (a, b) => new Date(a.timePeriod) - new Date(b.timePeriod)
+      );
+
+      const xAxisData = [];
+      const dischargeFollowData = [];
+      const outpatientFollowData = [];
+      const pmiData = [];
+      const pmoData = [];
+
+      sortedData.forEach((item) => {
+        // 鏍规嵁鏃堕棿绫诲瀷鏍煎紡鍖栨樉绀�
+        let timeLabel = item.timePeriod;
+        if (this.radio1 === "鍛�") {
+          timeLabel = dayjs(item.timePeriod).format("MM-DD");
+        } else if (this.radio1 === "鏈�") {
+          timeLabel = item.timePeriod.split("-")[1] + "鏈�";
+        } else {
+          timeLabel = item.timePeriod.split("-")[0] + "骞�";
+        }
+
+        xAxisData.push(timeLabel);
+        dischargeFollowData.push(item.dischargeFollowCount);
+        outpatientFollowData.push(item.outpatientFollowCount);
+        pmiData.push(item.pmiCount);
+        pmoData.push(item.pmoCount);
+      });
+
+      // 鏇存柊鍥捐〃
+      this.updateChart(
+        xAxisData,
+        dischargeFollowData,
+        outpatientFollowData,
+        pmiData,
+        pmoData
+      );
+    },
+    updateChart(
+      xAxisData,
+      dischargeFollowData,
+      outpatientFollowData,
+      pmiData,
+      pmoData
+    ) {
+      if (!this.myChart2) {
+        this.myEcharts2();
+        return;
+      }
+
+      // 璁$畻闅忚閲忕殑鏈�澶у��
+      const maxFollow = Math.max(
+        ...dischargeFollowData,
+        ...outpatientFollowData
+      );
+      // 璁$畻鏈嶅姟浜烘鐨勬渶澶у��
+      const maxService = Math.max(...pmiData, ...pmoData);
+
+      // 鍔ㄦ�佽绠梚nterval鍊�
+      const followInterval = this.calculateOptimalInterval(maxFollow);
+      const serviceInterval = this.calculateOptimalInterval(maxService);
+
+      const option = {
+        xAxis: {
+          data: xAxisData,
+        },
+        yAxis: [
+          {
+            interval: followInterval,
+            max: Math.ceil(maxFollow / followInterval) * followInterval,
+          },
+          {
+            interval: serviceInterval,
+            max: Math.ceil(maxService / serviceInterval) * serviceInterval,
+          },
+        ],
+        series: [
+          { data: dischargeFollowData },
+          { data: outpatientFollowData },
+          { data: pmiData },
+          { data: pmoData },
+        ],
       };
-      getechartsMedOuthospList(Outhospdata).then((res) => {});
-      getechartsMedInhospList(Inhospdata).then((res) => {});
+
+      this.myChart2.setOption(option);
     },
 
+    // 璁$畻鏈�浼樼殑interval鍊�
+    calculateOptimalInterval(maxValue) {
+      if (maxValue <= 0) return 50; // 榛樿鍊�
+
+      // 鏍规嵁鏈�澶у�艰绠楀悎閫傜殑闂撮殧
+      const magnitude = Math.pow(10, Math.floor(Math.log10(maxValue)));
+      const stepRatio = maxValue / magnitude;
+
+      let interval;
+      if (stepRatio > 5) {
+        interval = magnitude;
+      } else if (stepRatio > 2) {
+        interval = magnitude / 2;
+      } else {
+        interval = magnitude / 5;
+      }
+
+      // 纭繚interval鏄暣鏁�
+      interval = Math.round(interval);
+
+      // 闄愬埗鏈�灏忛棿闅�
+      return Math.max(interval, 50);
+    },
     // 鑾峰彇绾跨姸鍥炬椂闂�
     async getregionAmountCollect() {
       //getregionAmountCollect(1, this.endatd, this.statd);
@@ -480,11 +598,12 @@
       this.series = [123, 123, 223, 212, 432, 123, 442, 234];
       this.myEcharts2();
     },
-    // 绾挎�у浘
+    // 绾挎�у浘鍙婃煴鐘跺浘
     myEcharts2() {
       var echarts = require("echarts");
       var myChart2 = echarts.init(document.getElementById("echars"));
       this.myChart2 = myChart2;
+
       var option2 = {
         tooltip: {
           trigger: "axis",
@@ -504,30 +623,12 @@
           },
         },
         legend: {
-          data: [
-            "鍑洪櫌闅忚閲�",
-            "闂ㄨ瘖闅忚閲�",
-            // "鍦ㄩ櫌闅忚閲�",
-            // "闂ㄨ瘖澶嶈瘖閫氱煡",
-            "鍑洪櫌鏈嶅姟浜烘",
-            "闂ㄨ瘖鏈嶅姟浜烘",
-          ],
+          data: ["鍑洪櫌闅忚閲�", "闂ㄨ瘖闅忚閲�", "鍑洪櫌鏈嶅姟浜烘", "闂ㄨ瘖鏈嶅姟浜烘"],
         },
         xAxis: [
           {
             type: "category",
-            data: [
-              "涓�鏈�",
-              "浜屾湀",
-              "涓夋湀",
-              "鍥涙湀",
-              "浜旀湀",
-              "鍏湀",
-              "涓冩湀",
-              "鍏湀",
-              "涔濇湀",
-              "鍗佹湀",
-            ],
+            data: [], // 鍒濆涓虹┖锛屽皢閫氳繃API鏁版嵁濉厖
             axisPointer: {
               type: "shadow",
             },
@@ -538,18 +639,14 @@
             type: "value",
             name: "闅忚閲�",
             min: 0,
-            max: 250,
-            interval: 50,
             axisLabel: {
               formatter: "{value} 浜�",
             },
           },
           {
             type: "value",
-            name: "澶嶈瘖/璇勪及娆℃暟",
+            name: "鏈嶅姟浜烘",
             min: 0,
-            max: 250,
-            interval: 50,
             axisLabel: {
               formatter: "{value} 娆�",
             },
@@ -565,18 +662,8 @@
                 return value + " 浜�";
               },
             },
-            data: [120, 150, 165, 90, 140, 200, 130, 85, 175, 95, 110, 160],
+            data: [], // 鍒濆涓虹┖锛屽皢閫氳繃API鏁版嵁濉厖
           },
-          // {
-          //   name: "褰卞儚闅忚閲�",
-          //   type: "bar",
-          //   tooltip: {
-          //     valueFormatter: function (value) {
-          //       return value + " 浜�";
-          //     },
-          //   },
-          //   data: [102, 190, 135, 88, 175, 160, 83, 145, 200, 110, 97, 180],
-          // },
           {
             name: "闂ㄨ瘖闅忚閲�",
             type: "bar",
@@ -585,21 +672,8 @@
                 return value + " 浜�";
               },
             },
-            data: [145, 92, 178, 134, 167, 85, 199, 112, 156, 88, 120, 145],
+            data: [], // 鍒濆涓虹┖锛屽皢閫氳繃API鏁版嵁濉厖
           },
-
-          // {
-          //   name: "鍑洪櫌澶嶈瘖閫氱煡",
-          //   type: "line",
-          //   smooth: 0.3,
-          //   yAxisIndex: 1,
-          //   tooltip: {
-          //     valueFormatter: function (value) {
-          //       return value + " 娆�";
-          //     },
-          //   },
-          //   data: [45, 123, 78, 156, 89, 34, 199, 112, 67, 145, 88, 175],
-          // },
           {
             name: "鍑洪櫌鏈嶅姟浜烘",
             type: "line",
@@ -610,7 +684,7 @@
                 return value + " 娆�";
               },
             },
-            data: [102, 190, 135, 88, 175, 160, 83, 145, 200, 110, 97, 180],
+            data: [], // 鍒濆涓虹┖锛屽皢閫氳繃API鏁版嵁濉厖
           },
           {
             name: "闂ㄨ瘖鏈嶅姟浜烘",
@@ -622,29 +696,15 @@
                 return value + " 娆�";
               },
             },
-            data: [120, 150, 165, 90, 140, 200, 130, 85, 175, 95, 110, 160],
+            data: [], // 鍒濆涓虹┖锛屽皢閫氳繃API鏁版嵁濉厖
           },
         ],
       };
-      myChart2.on("updateAxisPointer", function (event) {
-        const xAxisInfo = event.axesInfo[0];
-        if (xAxisInfo) {
-          const dimension = xAxisInfo.value + 1;
-          myChart2.setOption({
-            series: {
-              id: "pie",
-              label: {
-                formatter: "{b}: {@[" + dimension + "]} ",
-              },
-              encode: {
-                value: dimension,
-                tooltip: dimension,
-              },
-            },
-          });
-        }
-      });
+
       myChart2.setOption(option2);
+
+      // 鍒濆鍔犺浇鏁版嵁
+      this.getgraphdata();
     },
     // 楗肩姸鍥�
     myPieChart() {
diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue
index 1060bfa..59ebeef 100644
--- a/src/views/knowledge/education/compilequer/index.vue
+++ b/src/views/knowledge/education/compilequer/index.vue
@@ -703,7 +703,7 @@
         });
       }
       // 瀹f暀鍒嗙被
-      getheLibraryAssort({}).then((res) => {
+      getheLibraryAssort({ hetype: 1 }).then((res) => {
         this.sortlist = res.rows;
         console.log(this.sortlist);
       });
diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue
index 0d21849..de94d9e 100644
--- a/src/views/patient/patient/hospital.vue
+++ b/src/views/patient/patient/hospital.vue
@@ -268,6 +268,13 @@
             width="120"
           />
           <el-table-column
+            label="缁忕鍖荤敓"
+            align="center"
+            key="managementDoctor"
+            prop="managementDoctor"
+            width="120"
+          />
+          <el-table-column
             label="涓绘不鍖荤敓"
             align="center"
             key="drname"
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 9ba7fa4..e272911 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -124,7 +124,7 @@
                       </el-select> </el-form-item
                   ></el-col>
                 </el-row>
-                    <el-form-item label="鎵ц鍛ㄦ湡" prop="longTask">
+                <el-form-item label="鎵ц鍛ㄦ湡" prop="longTask">
                   <el-radio-group v-model="form.longTask">
                     <el-radio :label="0">鑷畾涔夊懆鏈�</el-radio>
                     <el-radio :label="1">闀挎湡浠诲姟</el-radio>
@@ -147,7 +147,10 @@
                     <el-radio :label="2">鍗冲埢鍙戦��</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item label="鎵ц鏃ユ湡锛�" v-if="form.sendType == 1&& !form.longTask">
+                <el-form-item
+                  label="鎵ц鏃ユ湡锛�"
+                  v-if="form.sendType == 1 && !form.longTask"
+                >
                   <el-date-picker
                     v-model="daytime"
                     @change="changeTimeday"
@@ -160,7 +163,10 @@
                   </el-date-picker>
                 </el-form-item>
 
-                <el-form-item label="鎵ц鏃堕棿鐐癸細" v-if="form.sendType == 3&& !form.longTask">
+                <el-form-item
+                  label="鎵ц鏃堕棿鐐癸細"
+                  v-if="form.sendType == 3 && !form.longTask"
+                >
                   <div style="display: flex">
                     <div style="margin-right: 10px">
                       <el-date-picker
@@ -175,7 +181,10 @@
                   </div>
                 </el-form-item>
 
-                <el-form-item label="鎵ц鏃堕棿娈碉細" v-if="form.sendType == 1&& !form.longTask">
+                <el-form-item
+                  label="鎵ц鏃堕棿娈碉細"
+                  v-if="form.sendType == 1 && !form.longTask"
+                >
                   <div style="display: flex">
                     <div style="margin-right: 10px">
                       <span style="font-size: 18px; margin-right: 10px">鈶�</span>
@@ -406,7 +415,6 @@
                         icon="el-icon-upload2"
                         size="medium"
                         @click="handleImport"
-
                         >瀵煎叆</el-button
                       >
                     </el-col>
@@ -530,11 +538,19 @@
     <!-- 妯℃澘棰勮 -->
     <el-dialog title="妯℃澘棰勮" :visible.sync="previewtf" width="60%">
       <div class="preview-left">
-        <!-- 鍗曢�� -->
-        <div v-html="htmlRichText"></div>
+        <!-- 鏍规嵁妯℃澘绫诲瀷鏄剧ず涓嶅悓鍐呭 -->
+        <div v-if="currentTemplateType == '2'">
+          <!-- 閫氱煡妯℃澘鍙樉绀虹函鏂囨湰鍐呭 -->
+          <div style="white-space: pre-wrap; font-size: 16px; line-height: 1.6">
+            {{ plainTextContent }}
+          </div>
+        </div>
+        <div v-else>
+          <!-- 鍏朵粬绫诲瀷妯℃澘鏄剧ず瀵屾枃鏈唴瀹� -->
+          <div v-html="htmlRichText"></div>
+        </div>
       </div>
       <span slot="footer" class="dialog-footer">
-        <!-- <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button> -->
         <el-button type="primary" @click="previewFn">纭浣跨敤</el-button>
       </span>
     </el-dialog>
@@ -606,13 +622,16 @@
 
         <el-table :data="uploadingData" style="width: 100%">
           <el-table-column prop="serial" label="鎮h�卛d"> </el-table-column>
-          <el-table-column prop="name" label="濮撳悕"
-          width="100"> </el-table-column>
-          <el-table-column prop="sex" label="鎬у埆"width="100"> </el-table-column>
-          <el-table-column prop="idcardno" width="300" label="璇佷欢鍙风爜"> </el-table-column>
+          <el-table-column prop="name" label="濮撳悕" width="100">
+          </el-table-column>
+          <el-table-column prop="sex" label="鎬у埆" width="100">
+          </el-table-column>
+          <el-table-column prop="idcardno" width="300" label="璇佷欢鍙风爜">
+          </el-table-column>
           <el-table-column prop="goday" label="鍑虹敓鏃ユ湡"> </el-table-column>
-          <el-table-column prop="telcode" width="200" label="鑱旂郴鏂瑰紡"> </el-table-column>
-          <el-table-column prop="createTime"  width="200" label="鍒涘缓鏃ユ湡">
+          <el-table-column prop="telcode" width="200" label="鑱旂郴鏂瑰紡">
+          </el-table-column>
+          <el-table-column prop="createTime" width="200" label="鍒涘缓鏃ユ湡">
           </el-table-column>
         </el-table>
         <!-- <pagination
@@ -653,26 +672,20 @@
               <el-form-item label="瀹f暀鍚嶇О">
                 <el-input v-model="topqueryParams.preachname"></el-input>
               </el-form-item>
-              <el-form-item label="瀹f暀鍒嗙被" prop="region">
+              <el-form-item label="瀹f暀绫诲瀷" prop="region">
                 <el-select
-                  v-model="topqueryParams.assortid"
+                  v-model="topqueryParams.hetype"
                   size="medium"
                   filterable
                   placeholder="璇烽�夋嫨鍒嗙被"
                 >
-                  <el-option-group
-                    v-for="group in sortlist"
-                    :key="group.id"
-                    :label="group.assortname"
+                  <el-option
+                    v-for="item in heLibraryAssortList"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
                   >
-                    <el-option
-                      v-for="item in group.heLibraryAssortList"
-                      :key="item.id"
-                      :label="item.assortname"
-                      :value="item.id"
-                    >
-                    </el-option>
-                  </el-option-group>
+                  </el-option>
                 </el-select>
               </el-form-item>
 
@@ -767,6 +780,8 @@
     return {
       title: "瀹f暀鍐呭鍒楄〃",
       currenttype: 1, //1瀹f暀2闂ㄨ瘖3鍑洪櫌4澶嶈瘖5浣撴6闂嵎
+      currentTemplateType: "", // 褰撳墠妯℃澘绫诲瀷
+      plainTextContent: "", // 绾枃鏈唴瀹�
       id: "", //
       previewid: "", //浠诲姟妯℃澘浼犻�抜d
       libName: "",
@@ -816,7 +831,7 @@
       tableLabelxj: [
         { label: "鍒涘缓浜�", width: "", prop: "createBy" },
         { label: "瀹f暀鍚嶇О", width: "180", prop: "preachname" },
-        { label: "瀹f暀鎻忚堪", width: "180", prop: "preachcontent" },
+        { label: "瀹f暀鍐呭", width: "180", prop: "preachcontent" },
         // { label: "瀹f暀褰㈠紡", width: "", prop: "playType" },
         { label: "閫傜敤鏂瑰紡", width: "", prop: "suitway" },
         { label: "淇敼鏃ユ湡", width: "", prop: "uploadTime" },
@@ -930,6 +945,10 @@
       ],
       variableListTime: [],
       sortlist: [],
+      heLibraryAssortList: [
+        { id: 1, value: "瀹f暀" },
+        { id: 2, value: "閫氱煡" },
+      ],
       tasktopic: null, //鏂板绫诲瀷
       SelectPatientslist: [],
       form: {
@@ -939,7 +958,10 @@
         templatename: "",
         templateid: null,
         libtemplateid: null,
-        kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙f偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹f暀璧勮銆�",
+        kcb:
+          "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸" +
+          localStorage.getItem("orgname") +
+          "鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙f偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹f暀璧勮銆�",
         jsy: "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈瀹f暀鍐呭灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       },
       taskoptions: [
@@ -1104,7 +1126,7 @@
     submitForm(formName) {
       this.form.preachform = this.checkList.join(",");
       // this.formatFn(1);
-      if (!this.form.patTaskRelevances[0]) {
+      if (!this.form.patTaskRelevances[0]&&this.form.longTask==0) {
         this.$modal.msgError("璇烽�夋嫨鐥呬汉");
         return;
       }
@@ -1122,7 +1144,7 @@
         this.form.isoperation = 2;
       } else {
         this.form.isoperation = 1;
-        this.form.sendState=1;
+        this.form.sendState = 1;
       }
       if (!this.form.type) {
         this.form.type = this.$route.query.type;
@@ -1150,28 +1172,33 @@
     // ----------------------琛ㄦ牸瀛愮粍浠朵簨浠�
     // 閫夋嫨妯℃澘骞堕瑙�
     selectfn(row, type) {
-      // 妯℃澘鎯呭喌涓嬭幏鍙栨ā鏉夸俊鎭�
       this.libName = row.preachname;
       this.htmlRichText = null;
       this.libId = row.id;
-      console.log(row, "row");
       this.Tasktemplate = row;
+
+      // 璁剧疆褰撳墠妯℃澘绫诲瀷
+      this.currentTemplateType = row.hetype || "1"; // 榛樿涓哄鏁欑被鍨�
+
       this.previewtf = true;
       this.previewid = row.svyid;
-      console.log(this.questionList, "questionList");
-      // this.Variablehandling(row.svyLibScripts, 1);
-      console.log(row.htmlRichText);
-      axios
-        .get(row.htmlRichText)
-        .then((response) => {
-          console.log(response.data, "鏁版嵁"); // 杈撳嚭鑾峰彇鍒扮殑鏂囦欢鍐呭
-          this.htmlRichText = response.data;
-          this.htmlRichText = this.addStyleToImages(this.htmlRichText);
-        })
-        .catch((error) => {
-          this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�");
-          console.error("Failed to fetch file:", error);
-        });
+
+      if (this.currentTemplateType == "2") {
+        // 濡傛灉鏄�氱煡妯℃澘锛岃幏鍙栫函鏂囨湰鍐呭
+        this.plainTextContent = row.preachcontent;
+      } else {
+        // 鍏朵粬绫诲瀷妯℃澘鑾峰彇瀵屾枃鏈唴瀹�
+        axios
+          .get(row.htmlRichText)
+          .then((response) => {
+            this.htmlRichText = response.data;
+            this.htmlRichText = this.addStyleToImages(this.htmlRichText);
+          })
+          .catch((error) => {
+            this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�");
+            console.error("Failed to fetch file:", error);
+          });
+      }
     },
     // 棰勮妯℃澘
     previewfnm() {
@@ -1182,16 +1209,24 @@
         this.Tasktemplate = res.rows[0];
         this.previewtf = true;
         this.previewid = res.rows[0].svyid;
-        axios
-          .get(res.rows[0].htmlRichText)
-          .then((response) => {
-            this.htmlRichText = response.data;
-            this.htmlRichText = this.addStyleToImages(this.htmlRichText);
-          })
-          .catch((error) => {
-            this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�");
-            console.error("Failed to fetch file:", error);
-          });
+        this.currentTemplateType = res.rows[0].hetype || "1"; // 榛樿涓哄鏁欑被鍨�
+
+        if (this.currentTemplateType == "2") {
+          // 濡傛灉鏄�氱煡妯℃澘锛岃幏鍙栫函鏂囨湰鍐呭
+          this.plainTextContent = res.rows[0].preachcontent;
+        } else {
+          // 鍏朵粬绫诲瀷妯℃澘鑾峰彇瀵屾枃鏈唴瀹�
+          axios
+            .get(res.rows[0].htmlRichText)
+            .then((response) => {
+              this.htmlRichText = response.data;
+              this.htmlRichText = this.addStyleToImages(this.htmlRichText);
+            })
+            .catch((error) => {
+              this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�");
+              console.error("Failed to fetch file:", error);
+            });
+        }
       });
     },
     addStyleToImages(html) {
@@ -1274,7 +1309,7 @@
     handleExport() {},
 
     // 閫夋嫨鎮h�呰〃鏁版嵁
-    handleSelectionChange(selection,type) {
+    handleSelectionChange(selection, type) {
       console.log("澶氶�夋偅鑰�");
       this.SelectPatientslist = selection;
       this.multiple = !selection.length;
@@ -1289,8 +1324,8 @@
             item.sfzh = item.idcardno;
           }
           if (type) {
-            item.hospType=type
-          }else{
+            item.hospType = type;
+          } else {
             item.hospType = this.patientqueryParams.allhosp;
           }
           this.overallCase.push(item);
@@ -1368,7 +1403,10 @@
         templateid: null,
         libtemplateid: null,
         serviceType: Number(this.$route.query.serviceType),
-        kcb: "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸"+localStorage.getItem("orgname")+"鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙f偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瀹屾垚杩欎唤闅忚闂嵎銆�",
+        kcb:
+          "浜茬埍鐨勬偅鑰�-瀹跺睘锛屾垜浠槸" +
+          localStorage.getItem("orgname") +
+          "鐨勫尰鎶や汉鍛橈紝涓轰簡鏇村ソ鍦颁簡瑙f偍鐨勫悍澶嶆儏鍐碉紝璇锋偍鎶戒竴鐐瑰疂璐垫椂闂达紝瑙傜湅杩欎唤瀹f暀璧勮銆�",
         jsy: "鐢熸椿涓婅鍔抽�哥粨鍚堬紝娉ㄦ剰浼戞伅鍜岃惀鍏伙紝閫傚綋閿荤偧锛屾垝鐑熼檺閰掞紝淇濇寔蹇冩儏鑸掔晠锛屽畾鏈熷璇娿�傞偅鏈鍥炶灏卞埌杩欓噷锛岀鎮ㄨ韩浣撳仴搴凤紒",
       };
 
@@ -1601,9 +1639,9 @@
         this.$refs.upload.submit();
         this.dractive++;
       } else if (this.dractive == 2) {
-        this.handleSelectionChange(this.uploadingData,4);
+        this.handleSelectionChange(this.uploadingData, 4);
         this.upload.open = false;
-        this.dractive = 1
+        this.dractive = 1;
       }
     },
 
@@ -1754,6 +1792,23 @@
     }
   }
 }
+/* 鏂板鏍峰紡 */
+.preview-left {
+  padding: 20px;
+  max-height: 70vh;
+  overflow-y: auto;
+}
+
+/* 绾枃鏈唴瀹规牱寮� */
+.plain-text-content {
+  white-space: pre-wrap;
+  font-size: 16px;
+  line-height: 1.6;
+  padding: 15px;
+  background: #f9f9f9;
+  border-radius: 4px;
+}
+
 .download {
   text-align: center;
   .el-upload__tip {
diff --git a/src/views/shortmessage/healthinformation/compilequer/index.vue b/src/views/shortmessage/healthinformation/compilequer/index.vue
index f872f3b..8a6e6ef 100644
--- a/src/views/shortmessage/healthinformation/compilequer/index.vue
+++ b/src/views/shortmessage/healthinformation/compilequer/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="Questionnairemanagement">
+  <div class="NotificationManagement">
     <!-- 宸︿晶鏍� -->
     <div class="sidecolumn">
       <el-steps finish-status="success" :active="Editprogress" simple>
@@ -10,13 +10,6 @@
             >
           </template>
         </el-step>
-        <el-step>
-          <template slot="title">
-            <span style="cursor: pointer" @click="Editprogress = 2"
-              >閫氱煡鍐呭</span
-            >
-          </template>
-        </el-step>
       </el-steps>
     </div>
     <!-- 鍙充晶鏁版嵁 -->
@@ -24,6 +17,7 @@
       <!-- 鍩烘湰淇℃伅 -->
       <div v-if="Editprogress == 1">
         <div class="leftvlue-jbxx">鍩烘湰淇℃伅</div>
+        <el-divider></el-divider>
         <el-form
           :model="ruleForm"
           :rules="rules"
@@ -58,20 +52,20 @@
             <el-col :span="12"> </el-col>
           </el-row>
           <el-form-item label="閫氱煡鏍囬" prop="preachname">
-            <div style="width: 30%">
+            <div style="width: 60%">
               <el-input
                 v-model="ruleForm.preachname"
                 placeholder="璇疯緭鍏ユ爣棰�"
               ></el-input>
             </div>
           </el-form-item>
-          <el-form-item label="閫氱煡鎻忚堪" prop="preachcontent">
-            <div style="width: 60%">
+          <el-form-item label="閫氱煡鍐呭" prop="preachcontent">
+            <div style="width: 80%">
               <el-input
                 type="textarea"
-                :rows="2"
+                :rows="5"
                 v-model="ruleForm.preachcontent"
-                placeholder="璇疯緭鍏ユ弿杩�"
+                placeholder="璇疯緭鍏ラ�氱煡鍐呭"
               ></el-input>
             </div>
           </el-form-item>
@@ -109,21 +103,6 @@
             </div>
           </el-form-item>
 
-          <el-form-item label="鏂囦欢" prop="sickness">
-            <div style="width: 40%">
-              <el-upload
-                class="upload-demo"
-                action="https://jsonplaceholder.typicode.com/posts/"
-                :on-change="handleChange"
-                :file-list="fileList"
-              >
-                <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
-                <div slot="tip" class="el-upload__tip">
-                  鍙兘涓婁紶jpg/png/xsl鏂囦欢锛屼笖涓嶈秴杩�50mb
-                </div>
-              </el-upload>
-            </div>
-          </el-form-item>
           <el-form-item label="鏍囩" prop="desc">
             <div class="xinz-inf">
               <el-tag
@@ -142,6 +121,7 @@
                 @change="handleInputConfirm"
                 filterable
                 remote
+                allow-create
                 reserve-keyword
                 default-first-option
                 :remote-method="remoteMethodtag"
@@ -175,53 +155,23 @@
             ></el-col>
             <el-col :span="9">
               <el-form-item label="鍙敤鐘舵��" prop="region">
-                <el-select
-                  v-model="ruleForm.isavailable"
-                  size="medium"
-                  filterable
-                  placeholder="璇烽�夋嫨鍒嗙被"
-                >
-                  <el-option
-                    class="ruleFormaa"
-                    v-for="item in usable"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
+                <el-radio-group v-model="ruleForm.isAvailable">
+                  <el-radio
+                    v-for="(item, index) in usable"
+                    :label="item.value"
+                    >{{ item.label }}</el-radio
                   >
-                  </el-option>
-                </el-select> </el-form-item
-            ></el-col>
+                </el-radio-group>
+              </el-form-item></el-col
+            >
           </el-row>
-          <el-form-item label="閫氱煡鏂瑰紡" prop="region">
-            <el-select
-              v-model="ruleForm.suitway"
-              size="medium"
-              multiple
-              filterable
-              placeholder="璇烽�夋嫨鍒嗙被"
-            >
-              <el-option
-                class="ruleFormaa"
-                v-for="item in mode"
-                :key="item.label"
-                :label="item.label"
-                :value="item.label"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <!-- <el-form-item label="閫傜敤鐤剧梾" prop="region">
-            <el-button type="warning" @click="$refs.child.handleAddpatient()"
-              >娣诲姞鐤剧梾</el-button
-            >
-          </el-form-item> -->
           <el-form-item label="閫傜敤闄㈠尯" prop="region">
             <el-select
               v-model="ruleForm.campus"
               size="medium"
               multiple
               filterable
-              placeholder="璇烽�夋嫨鍒嗙被"
+              placeholder="璇烽�夋嫨闄㈠尯"
             >
               <el-option
                 class="ruleFormaa"
@@ -248,105 +198,12 @@
             </el-cascader>
           </el-form-item>
           <el-form-item>
-            <el-button type="success" @click="nextstep('ruleForm')"
-              >涓嬩竴姝�</el-button
-            >
             <el-button type="success" @click="Departmenttreatment('ruleForm')"
               >淇濆瓨</el-button
             >
             <el-button type="info" @click="closeFm('ruleForm')">鍏抽棴</el-button>
           </el-form-item>
         </el-form>
-      </div>
-      <!-- 閫氱煡鍐呭 -->
-      <div v-if="Editprogress == 2">
-        <el-row :gutter="20">
-          <el-col :span="4"><div class="leftvlue-jbxx">閫氱煡鍐呭</div></el-col>
-        </el-row>
-
-        <div>
-          <el-form
-            :model="ruleForm"
-            :rules="rules"
-            ref="ruleForm"
-            label-width="100px"
-            class="demo-ruleForm"
-          >
-            <el-row gutter="20">
-              <el-col :span="12">
-                <el-form-item label="璧勬枡褰㈠紡" prop="region">
-                  <el-select
-                    v-model="ruleForm.shape"
-                    placeholder="璇烽�夋嫨鍐呭褰㈠紡"
-                  >
-                    <el-option
-                      v-for="item in xjxsoptions"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <div>
-                  <el-button @click="laststep('ruleForm')">涓婁竴姝�</el-button>
-                  <el-button
-                    type="success"
-                    @click="Departmenttreatment('ruleForm')"
-                    >淇濆瓨</el-button
-                  >
-                  <el-button
-                    type="warning"
-                    @click="Departmenttreatment('ruleForm')"
-                    >鍙﹀瓨鏂扮増鏈�</el-button
-                  >
-                  <el-button type="info" @click="closeFm('ruleForm')"
-                    >鍏抽棴</el-button
-                  >
-                </div></el-col
-              >
-            </el-row>
-          </el-form>
-        </div>
-        <div>
-          <el-upload
-            class="upload-demo"
-            :action="uploadImgUrlword"
-            :on-success="uploadEditorSuccessword"
-            :on-error="uploadEditorErrorword"
-            :before-upload="beforeEditorUploadword"
-            :headers="headers"
-          >
-            <el-button size="small" type="primary">word鏂囦欢涓婁紶</el-button>
-          </el-upload>
-          <div id="quillEditorQiniu">
-            <!-- 鍩轰簬elementUi鐨勪笂浼犵粍浠� el-upload begin-->
-            <el-upload
-              class="avatar-uploader"
-              :action="uploadImgUrl"
-              :accept="'image/*,video/*'"
-              :show-file-list="false"
-              :on-success="uploadEditorSuccess"
-              :on-error="uploadEditorError"
-              :before-upload="beforeEditorUpload"
-              :headers="headers"
-            >
-            </el-upload>
-            <!-- 鍩轰簬elementUi鐨勪笂浼犵粍浠� el-upload end-->
-            <quill-editor
-              class="editor"
-              v-model="content"
-              ref="customQuillEditor"
-              :options="editorOption"
-              @blur="onEditorBlur"
-              @focus="onEditorFocus"
-              @change="onEditorChange"
-            >
-            </quill-editor>
-          </div>
-        </div>
       </div>
     </div>
     <!-- 娣诲姞閫傜敤鐤剧梾绐楀彛 -->
@@ -361,9 +218,7 @@
 </template>
 
 <script>
-import { quillEditor } from "vue-quill-editor";
 import axios from "axios";
-
 import {
   getheLibraryAssort,
   delheLibraryAssort,
@@ -379,115 +234,33 @@
   illnesslistget,
   getillness,
 } from "@/api/AiCentre/index";
-import OptionalForm from "@/components/OptionalForm"; //姝e垯缁勪欢
-
+import OptionalForm from "@/components/OptionalForm";
 import { listDept } from "@/api/system/dept";
-// import * as Quill from "quill";
-import Quill from "quill";
 import { listtag } from "@/api/system/label";
 import store from "@/store";
-
-// 杩欓噷寮曞叆淇敼杩囩殑video妯″潡骞舵敞鍐�
-import Video from "./video";
-Quill.register(Video, true);
-//鑾峰彇鐧诲綍token锛屽紩鍏ユ枃浠讹紝濡傛灉鍙槸绠�鍗曟祴璇曪紝娌℃湁涓婁紶鏂囦欢鏄惁鐧诲綍鐨勯檺鍒剁殑璇濓紝
-//杩欎釜token鍙互涓嶇敤鑾峰彇锛屾枃浠跺彲浠ヤ笉寮曞叆锛屾妸涓婇潰瀵瑰簲鐨勪笂浼犳枃浠舵惡甯﹁姹傚ご  :headers="headers" 杩欎釜浠g爜鍒犳帀鍗冲彲
 import { getToken } from "@/utils/auth";
-const toolbarOptions = [
-  ["bold", "italic", "underline", "strike"], // toggled buttons
-  ["blockquote", "code-block"],
-
-  [{ header: 1 }, { header: 2 }], // custom button values
-  [{ list: "ordered" }, { list: "bullet" }],
-  [{ script: "sub" }, { script: "super" }], // superscript/subscript
-  [{ indent: "-1" }, { indent: "+1" }], // outdent/indent
-  [{ direction: "rtl" }], // text direction
-
-  [{ size: ["small", false, "large", "huge"] }], // custom dropdown
-  [{ header: [1, 2, 3, 4, 5, 6, false] }],
-
-  [{ color: [] }, { background: [] }], // dropdown with defaults from theme
-  [{ font: [] }],
-  [{ align: [] }],
-  ["link", "image", "video"],
-  ["clean"], // remove formatting button
-];
 
 export default {
+  name: "NotificationManagement",
   components: { OptionalForm },
   data() {
     return {
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload",
-      uploadImgUrlword: process.env.VUE_APP_BASE_API + "/common/uploadShow",
-      uploadUrlPath: "娌℃湁鏂囦欢涓婁紶",
-      quillUpdateImg: false,
-      fileList: [
-        {
-          name: "food.jpeg",
-          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
-        {
-          name: "food2.jpeg",
-          url: "https://fuss10.elemecdn.com/3/63/4e7f3a15429bfda99bce42a18cdd1jpeg.jpeg?imageMogr2/thumbnail/360x360/format/webp/quality/100",
-        },
-      ],
-      content: "", //鏈�缁堜繚瀛樼殑鍐呭
-      fileName: "", //鏂囦欢鍚�
       dynamicTags: [],
       inputVisible: false,
       illnessVisible: false,
-      dialogVisiblepatient: false, //閫傜敤鐤剧梾绐楀彛
+      dialogVisiblepatient: false,
       inputValue: "",
-      // 瀵屾枃鏈�
-      editorOption: {
-        placeholder: "浣犳兂璇翠粈涔堬紵",
-        modules: {
-          imageResize: {
-            displayStyles: {
-              backgroundColor: "black",
-              border: "none",
-              color: "white",
-            },
-            modules: ["Resize", "DisplaySize", "Toolbar"],
-          },
-          toolbar: {
-            container: toolbarOptions, // 宸ュ叿鏍�
-            handlers: {
-              image: function (value) {
-                if (value) {
-                  document
-                    .querySelector("#quillEditorQiniu .avatar-uploader input")
-                    .click();
-                } else {
-                  this.quill.format("image", false);
-                }
-              },
-              video: function (value) {
-                if (value) {
-                  document
-                    .querySelector("#quillEditorQiniu .avatar-uploader input")
-                    .click();
-                } else {
-                  this.quill.format("video", false);
-                }
-              },
-            },
-          },
-        },
-      },
-
-      sidecolumnrabs: "left", //鏂瑰悜
-      Editprogress: 1, //缂栬緫杩涘害
-      currentVersion: "1.2.3", //褰撳墠鐗堟湰
-      loading: false, // 閬僵灞�
-      drawer: false, //鎺у埗灞曞紑
-      radio: "false", //鍗曢�夐閫変腑
-      radios: [], //澶氶�夐閫変腑
-      radioas: "", //濉┖棰樼瓟妗�
-      // 鎬绘潯鏁�
+      sidecolumnrabs: "left",
+      Editprogress: 1,
+      currentVersion: "1.2.3",
+      loading: false,
+      drawer: false,
+      radio: "false",
+      radios: [],
+      radioas: "",
       total: 1,
       hetype: "",
       id: null,
@@ -513,42 +286,24 @@
       deptList: [],
       tempDetpRelevanceslist: [],
       props: { multiple: true, value: "deptId", label: "deptName" },
-      xjxsoptions: [
-        {
-          value: "1",
-          label: "鍥炬枃",
-        },
-        {
-          value: "2",
-          label: "瑙嗛",
-        },
-        {
-          value: "3",
-          label: "闊抽",
-        },
-      ],
-      valssu: [
-        {
-          idd: 1,
-          wssd: "浣犳渶杩戞�庝箞鏍�",
-          sdadd: ["sss", "ssccss", "ssaas", "ss"],
-        },
-      ],
-      addvalue: "娣诲姞棰樼洰",
-
       variablelist: [
         { variatename: "濮撳悕", variate: "${name}", default: 1 },
         { variatename: "鐢佃瘽", variate: "${phone}", default: 1 },
         { variatename: "鐥呮儏", variate: "${illness}", default: 1 },
       ],
-      // 鏌ヨ鍙傛暟
       queryParams: {
         pageNum: 1,
         pageSize: 10,
       },
     };
   },
-
+  activated() {
+    if (this.id != this.$route.query.id) {
+      this.gettabList();
+      this.getList();
+      this.illnessUpdate();
+    }
+  },
   created() {
     this.gettabList();
     this.getList();
@@ -559,18 +314,7 @@
     this.precedencetype = store.getters.precedencetype;
     this.courtyardlist = store.getters.courtyardlist;
   },
-  watch: {
-    content(newVal, oldVal) {
-      //this.$emit('input', newVal);
-      console.log(newVal, "A");
-      console.log(oldVal, "B");
-    },
-  },
-
   methods: {
-    processElement(element) {
-      return { ...element, isoperation: null };
-    },
     // 鑾峰彇椤甸潰鏁版嵁
     getList() {
       this.loading = true;
@@ -579,16 +323,13 @@
       if (this.id) {
         getlibraryinfo({ id: this.id }).then((res) => {
           this.ruleForm = res.data[0];
-          this.ruleForm.campus = this.ruleForm.campus.split(",");
+          if (this.ruleForm.campus)
+            this.ruleForm.campus = this.ruleForm.campus.split(",");
           this.dynamicTags = res.data[0].heLibraryTagList.map(
             this.processElement
           );
-          this.Getmissioncontent(this.ruleForm.richText);
           if (this.ruleForm.deptNames) {
             this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames);
-          }
-          if (this.ruleForm.suitway) {
-            this.ruleForm.suitway = this.ruleForm.suitway.split(",");
           }
           this.variablelist = this.ruleForm.otherdata
             ? JSON.parse(this.ruleForm.otherdata)
@@ -598,51 +339,46 @@
       // 閫氱煡鍒嗙被
       getheLibraryAssort({ hetype: 2 }).then((res) => {
         this.sortlist = res.rows;
-        console.log(this.sortlist);
       });
       // 閮ㄩ棬
       listDept(this.queryParams).then((response) => {
         this.deptList = this.handleTree(response.data, "deptId");
       });
-      this.loading = false;
     },
-
+    processElement(element) {
+      return { ...element, isoperation: null };
+    },
     submitForm(formName) {
       let tgs = [];
       this.dynamicTags.forEach((item) => {
         tgs.push(item.tagname);
       });
-      this.ruleForm.campus = this.ruleForm.campus.join(",");
+      if (this.ruleForm.campus) {
+        this.ruleForm.campus = this.ruleForm.campus.join(",");
+      }
       this.ruleForm.labelInfo = tgs.length != 0 ? tgs.join(", ") : "";
       this.ruleForm.otherdata = JSON.stringify(this.variablelist);
-      this.ruleForm.hetype = 2;
-      console.log(22);
-      this.ruleForm.suitway =
-        this.ruleForm.suitway.length != 0
-          ? this.ruleForm.suitway.join(",")
-          : "";
+      this.ruleForm.hetype = 2; // 閫氱煡绫诲瀷
 
-      addrichText({
-        content: this.content,
-        fileName: this.fileName ? this.fileName : "娴嬭瘯.html",
-      }).then((res) => {
-        this.ruleForm.richText = res.msg;
-        if (this.id) {
-          this.ruleForm.isoperation = 2;
-          compilelibrary(this.ruleForm).then((res) => {
+      if (this.id) {
+        this.ruleForm.isoperation = 2;
+        compilelibrary(this.ruleForm).then((res) => {
+          if (res.code == 200) {
             this.$modal.msgSuccess("缂栬緫鎴愬姛");
             this.confirmillness();
             this.$router.go(-1);
-          });
-        } else {
-          this.ruleForm.isoperation = 1;
-          compilelibrary(this.ruleForm).then((res) => {
+          }
+        });
+      } else {
+        this.ruleForm.isoperation = 1;
+        compilelibrary(this.ruleForm).then((res) => {
+          if (res.code == 200) {
             this.$modal.msgSuccess("鏂板鎴愬姛");
             this.confirmillness(res.data);
             this.$router.go(-1);
-          });
-        }
-      });
+          }
+        });
+      }
     },
     // 淇濆瓨鐤剧梾
     confirmillness(guid) {
@@ -650,7 +386,6 @@
         if (guid) {
           item.outid = guid;
         } else {
-          console.log(this.ruleForm);
           item.outid = this.ruleForm.id;
         }
         item.icd10name = item.icdname;
@@ -662,20 +397,6 @@
       });
       this.illnessVisible = false;
       this.$modal.msgSuccess("缂栬緫鎴愬姛");
-    },
-    getFileNameFromPath(path) {
-      const parts = path.split("/");
-      return parts[parts.length - 1];
-    },
-    // 涓嬩竴姝�
-    nextstep() {
-      if (this.Editprogress <= 1) {
-        return this.Editprogress++;
-      }
-    },
-    // 涓婁竴姝�
-    laststep() {
-      this.Editprogress = this.Editprogress - 1;
     },
     // 鍏抽棴
     closeFm() {
@@ -707,7 +428,6 @@
         );
         if (!condition) {
           listDept({ deptId: item }).then((res) => {
-            console.log("dept");
             res.data[0].type = 2;
             this.ruleForm.tempDetpRelevances.push(res.data[0]);
           });
@@ -724,12 +444,7 @@
       setTimeout(() => {
         this.submitForm();
       }, 1000);
-      // this.submitForm();
     },
-    // 淇濆瓨棰樼洰淇℃伅
-    Saveproblem() {},
-    /** 鏌ヨ棰樼洰鍒楄〃 */
-
     // 鏂板鍙橀噺
     addvariable() {
       this.variablelist.push({
@@ -741,16 +456,12 @@
     delvariable(item) {
       const index = this.variablelist.indexOf(item);
       if (index !== -1) {
-        this.variablelist.splice(index, 1); // 浠庣储寮曚綅缃垹闄や竴涓厓绱�
+        this.variablelist.splice(index, 1);
       } else {
         console.log("鏈壘鍒拌瀵硅薄");
       }
     },
-    // 鎺у埗鏂囦欢
-    handleChange(file, fileList) {
-      this.fileList = fileList.slice(-3);
-    },
-    // 鏍囩-----------------
+    // 鏍囩鐩稿叧鏂规硶
     gettabList() {
       const tagqueryParams = {
         pageNum: 1,
@@ -762,11 +473,9 @@
       });
     },
     handleClosetag(tag) {
-      console.log(tag);
       const lindex = this.ruleForm.heLibraryTagList.findIndex(
         (item) => item.tagname == tag.tagname
       );
-      console.log(lindex);
       this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
       this.ruleForm.heLibraryTagList[lindex].isoperation = 3;
     },
@@ -812,7 +521,7 @@
     showInput() {
       this.inputVisible = true;
     },
-    // 鐤剧梾-----------------------
+    // 鐤剧梾鐩稿叧鏂规硶
     illnessUpdate() {
       if (this.id) {
         getillness({ outid: this.$route.query.id, type: 6 }).then((res) => {
@@ -823,9 +532,6 @@
         });
       }
     },
-
-    // --------------------------
-
     // 棰勮妯℃澘
     PreviewTemplate() {
       this.drawer = true;
@@ -833,129 +539,12 @@
     resetForm(formName) {
       this.$refs[formName].resetFields();
     },
-
-    //涓婁紶鍥剧墖涔嬪墠async
-    beforeEditorUpload(res, file) {
-      //鏄剧ず涓婁紶鍔ㄧ敾
-      this.quillUpdateImg = true;
-      //  const res1 = await uploadImage()
-      // console.log(res1,'=====');
-      // this.$emit('before',res, file)
-      console.log(res);
-      console.log(file);
-    },
-    // 涓婁紶鍥剧墖鎴愬姛
-    uploadEditorSuccess(res, file) {
-      console.log("涓婁紶鎴愬姛");
-      // this.$emit('upload',res, file)
-      console.log(res, file);
-      //鎷兼帴鍑轰笂浼犵殑鍥剧墖鍦ㄦ湇鍔″櫒鐨勫畬鏁村湴鍧�
-      let imgUrl = res.url;
-      let type = imgUrl.substring(imgUrl.lastIndexOf(".") + 1);
-      console.log(type);
-      // 鑾峰彇瀵屾枃鏈粍浠跺疄渚�
-      let quill = this.$refs.customQuillEditor.quill;
-      // 鑾峰彇鍏夋爣鎵�鍦ㄤ綅缃�
-      let length = quill.getSelection().index;
-      // 鎻掑叆鍥剧墖||瑙嗛  res.info涓烘湇鍔″櫒杩斿洖鐨勫浘鐗囧湴鍧�
-      if (type == "mp4" || type == "MP4") {
-        window.jsValue = imgUrl;
-        quill.insertEmbed(length, "video", imgUrl);
-      } else {
-        quill.insertEmbed(length, "image", imgUrl);
-      }
-      // 璋冩暣鍏夋爣鍒版渶鍚�
-      quill.setSelection(length + 1);
-      //鍙栨秷涓婁紶鍔ㄧ敾
-      this.quillUpdateImg = false;
-    },
-    // 澶卞幓鐒︾偣浜嬩欢
-    onEditorBlur(e) {
-      console.log("onEditorBlur: ", e);
-    },
-    // 鑾峰緱鐒︾偣浜嬩欢
-    onEditorFocus(e) {
-      console.log("onEditorFocus: ", e);
-    },
-    // 鍐呭鏀瑰彉浜嬩欢
-    onEditorChange(e) {
-      console.log("onEditorChange: ", e);
-    },
-    // 涓婁紶(鏂囦欢)鍥剧墖澶辫触
-    uploadEditorError(res, file) {
-      console.log(res, "word");
-      console.log(file, "word");
-      //椤甸潰鎻愮ず
-      this.$message.error("涓婁紶鍥剧墖澶辫触");
-      //鍙栨秷涓婁紶鍔ㄧ敾
-      this.quillUpdateImg = false;
-    },
-    //涓婁紶缁勪欢杩斿洖鐨勭粨鏋�
-    uploadResult: function (res) {
-      this.uploadUrlPath = res;
-    },
-    // 涓婁紶(鏂囦欢)鍥剧墖澶辫触
-    uploadEditorErrorword(res, file) {
-      console.log(res);
-      console.log(file);
-      //椤甸潰鎻愮ず
-      this.$message.error("涓婁紶鍥剧墖澶辫触");
-      //鍙栨秷涓婁紶鍔ㄧ敾
-      this.quillUpdateImg = false;
-    },
-    //涓婁紶鍥剧墖涔嬪墠async
-    beforeEditorUploadword(res, file) {
-      //鏄剧ず涓婁紶鍔ㄧ敾
-      this.quillUpdateImg = true;
-      //  const res1 = await uploadImage()
-      // console.log(res1,'=====');
-      // this.$emit('before',res, file)
-      console.log(res);
-      console.log(file);
-    },
-    // 涓婁紶鍥剧墖鎴愬姛
-    uploadEditorSuccessword(res, file) {
-      console.log("涓婁紶鎴愬姛");
-      const data = null;
-      console.log(res, file, "word");
-      axios
-        .get(res.url)
-        .then((response) => {
-          console.log(response.data, "鏁版嵁"); // 杈撳嚭鑾峰彇鍒扮殑鏂囦欢鍐呭
-          this.content = response.data;
-          this.texturl = res.url;
-          this.fileName = this.getFileNameFromPath(res.url);
-        })
-        .catch((error) => {
-          console.error("Failed to fetch file:", error);
-        });
-    },
-    Getmissioncontent(url) {
-      axios
-        .get(url)
-        .then((response) => {
-          console.log(response.data, "鏁版嵁"); // 杈撳嚭鑾峰彇鍒扮殑鏂囦欢鍐呭
-          this.content = response.data;
-          this.fileName = this.getFileNameFromPath(res.url);
-        })
-        .catch((error) => {
-          console.error("Failed to fetch file:", error);
-        });
-    },
   },
 };
 </script>
 
 <style lang="scss" scoped>
-.Questionnairemanagement {
-  // display: flex;
-}
 .sidecolumn {
-  // width: 300px;
-  // min-height: 100vh;
-  // text-align: center;
-  //   display: flex;
-  //   margin-top: 20px;
   margin: 20px;
   margin-bottom: 0;
   padding: 20px;
@@ -964,47 +553,34 @@
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
 }
+
 .leftvlue {
-  //   display: flex;
-  //   flex: 1;
   margin: 20px;
   padding: 30px;
   background: #ffff;
   border: 1px solid #dcdfe6;
   -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
     0 0 6px 0 rgba(0, 0, 0, 0.04);
-  .mulsz {
-    font-size: 20px;
-  }
+
   .leftvlue-jbxx {
-    margin-bottom: 50px;
-    font-size: 20px;
-    span {
-      position: absolute;
-      right: 80px;
-    }
-  }
-  .demo-cascader {
-    margin-right: 20px;
-  }
-  .PreviewTemplate {
-    color: #02a7f0;
-    cursor: pointer;
-    font-size: 20px;
-    margin: 0 20px;
+    font-size: 24px;
+    height: 30px;
+    border-left: 3px solid #41a1be;
+    padding-left: 3px;
   }
 }
+
 .xinz-inf {
   font-size: 18px;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-
   line-height: 48px;
 
   .el-tag + .el-tag {
     margin-left: 10px;
   }
+
   .button-new-tag {
     margin-left: 10px;
     height: 32px;
@@ -1012,176 +588,41 @@
     padding-top: 0;
     padding-bottom: 0;
   }
+
   .input-new-tag {
     width: 90px;
     margin-left: 10px;
     vertical-align: bottom;
   }
 }
-.preview-left {
-  margin: 20px;
-  //   margin: 20px;
-  padding: 30px;
-  background: #ffff;
-  border: 1px solid #dcdfe6;
-  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
-    0 0 6px 0 rgba(0, 0, 0, 0.04);
-  .topic-dev {
-    margin-bottom: 25px;
-    font-size: 20px !important;
-    .dev-text {
-      margin-bottom: 10px;
-    }
-  }
-}
-.addtopic {
-  margin-top: 30px;
-}
-.presentation {
-  margin: 20px 0;
-  display: flex;
-  .presentation-left {
-    width: 50%;
-    height: 500px;
-    .button-textxg {
-      color: #024df0;
-    }
-    .button-textsc {
-      color: #f52727;
-    }
-  }
-  .presentation-right {
-    width: 50%;
-    height: 500px;
-    padding: 20px;
-    font-size: 18px;
-    border: 1px solid #909091;
-    span {
-      padding: 0 35px;
-      margin-right: 10px;
-      border-bottom: 1px solid #909091;
-    }
-    .headline {
-      font-size: 20px;
-      border-left: 3px solid #41a1be;
-      padding-left: 5px;
-      margin: 15px 0;
-    }
-  }
-}
-::v-deep .addtopic-input {
-  input {
-    background: #02a7f0;
-    color: #edf1f7;
-    width: 150px;
-  }
-}
-::v-deep.el-step.is-vertical .el-step__title {
+
+::v-deep .el-step.is-vertical .el-step__title {
   font-size: 25px;
 }
+
 ::v-deep.el-input--medium {
   font-size: 18px !important;
 }
-::v-deep.ruleFormaa.el-select {
-  display: inline-block;
-  position: relative;
-  width: 700px;
-}
-.el-select__tags {
+
+::v-deep.el-select__tags {
   font-size: 20px;
   max-width: 888px !important;
 }
+
 ::v-deep.el-radio__inner {
   width: 22px;
   height: 22px;
 }
-// ::v-deep.topic-dev.el-radio__label {
-//   font-size: 24px;
-// }
+
 ::v-deep.el-radio-group {
   span {
     font-size: 24px;
   }
 }
+
 ::v-deep.el-checkbox-group {
   span {
     font-size: 24px;
   }
-}
-.editor {
-  line-height: normal !important;
-  height: 600px;
-  margin-bottom: 80px;
-}
-.ql-snow .ql-tooltip[data-mode="link"]::before {
-  content: "璇疯緭鍏ラ摼鎺ュ湴鍧�:";
-}
-.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
-  border-right: 0px;
-  content: "淇濆瓨";
-  padding-right: 0px;
-}
-
-.ql-snow .ql-tooltip[data-mode="video"]::before {
-  content: "璇疯緭鍏ヨ棰戝湴鍧�:";
-}
-
-.ql-snow .ql-picker.ql-size .ql-picker-label::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item::before {
-  content: "14px";
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="small"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="small"]::before {
-  content: "10px";
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="large"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="large"]::before {
-  content: "18px";
-}
-.ql-snow .ql-picker.ql-size .ql-picker-label[data-value="huge"]::before,
-.ql-snow .ql-picker.ql-size .ql-picker-item[data-value="huge"]::before {
-  content: "32px";
-}
-
-.ql-snow .ql-picker.ql-header .ql-picker-label::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item::before {
-  content: "鏂囨湰";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
-  content: "鏍囬1";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
-  content: "鏍囬2";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
-  content: "鏍囬3";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
-  content: "鏍囬4";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
-  content: "鏍囬5";
-}
-.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
-.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
-  content: "鏍囬6";
-}
-
-.ql-snow .ql-picker.ql-font .ql-picker-label::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item::before {
-  content: "鏍囧噯瀛椾綋";
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="serif"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="serif"]::before {
-  content: "琛嚎瀛椾綋";
-}
-.ql-snow .ql-picker.ql-font .ql-picker-label[data-value="monospace"]::before,
-.ql-snow .ql-picker.ql-font .ql-picker-item[data-value="monospace"]::before {
-  content: "绛夊瀛椾綋";
 }
 </style>
diff --git a/src/views/shortmessage/healthinformation/index.vue b/src/views/shortmessage/healthinformation/index.vue
index ee7d665..009fdf7 100644
--- a/src/views/shortmessage/healthinformation/index.vue
+++ b/src/views/shortmessage/healthinformation/index.vue
@@ -141,7 +141,6 @@
                   icon="el-icon-plus"
                   size="medium"
                   @click="handleAdd"
-                  v-hasPermi="['system:user:add']"
                   >鏂板</el-button
                 >
               </el-col>

--
Gitblit v1.9.3