From a346cfbcb03a303dca252d910d2181f00e7adc20 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 03 九月 2024 10:39:10 +0800
Subject: [PATCH] 测试完成

---
 src/views/followvisit/tasklist/index.vue           |   46 +++--
 src/views/repositoryai/verbaltrick/index.vue       |   32 ++-
 src/views/followvisit/outpatient/index.vue         |    6 
 src/views/outsideChainxj.vue                       |   14 
 dist.zip                                           |    0 
 vue.config.js                                      |    6 
 src/api/AiCentre/SingleTask.js                     |    4 
 src/views/knowledge/questionbank/index.vue         |   17 +
 src/api/system/dept.js                             |    2 
 src/views/index copy.vue                           |    5 
 src/views/patient/propaganda/QuestionnaireTask.vue |    6 
 src/views/outsideChainwt.vue                       |  180 ++++++++++++++------
 src/views/knowledge/questionnaire/index.vue        |   17 +
 src/views/outsideChain.vue                         |  100 +++++++---
 src/views/patient/propaganda/Missioncreation.vue   |    4 
 src/views/patient/propaganda/particty.vue          |    9 
 src/api/AiCentre/Homeimage.js                      |   25 ++
 src/api/AiCentre/external.js                       |   30 +++
 src/views/followvisit/discharge/index.vue          |    4 
 src/views/repositoryai/templateku/index.vue        |    9 
 20 files changed, 358 insertions(+), 158 deletions(-)

diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..c5f51d0
--- /dev/null
+++ b/dist.zip
Binary files differ
diff --git a/src/api/AiCentre/Homeimage.js b/src/api/AiCentre/Homeimage.js
new file mode 100644
index 0000000..20ab458
--- /dev/null
+++ b/src/api/AiCentre/Homeimage.js
@@ -0,0 +1,25 @@
+import request from "@/utils/request";
+
+// 鍩虹鏁版嵁
+export function getTopstatistics(data) {
+  return request({
+    url: "/smartor/extemplate/list",
+    method: "post",
+    data: data,
+  });
+}
+
+// 鎷垮彇涓儴鏁版嵁澶у浘
+export function getCentraldata(Id) {
+  return request({
+    url: "/smartor/extemplate/remove/" + Id,
+    method: "get",
+  });
+}
+// 鎷垮彇涓儴鏁版嵁澶у浘
+export function getMissiondata(Id) {
+  return request({
+    url: "/smartor/extemplate/remove/" + Id,
+    method: "get",
+  });
+}
diff --git a/src/api/AiCentre/SingleTask.js b/src/api/AiCentre/SingleTask.js
index 3b89b35..6273f1f 100644
--- a/src/api/AiCentre/SingleTask.js
+++ b/src/api/AiCentre/SingleTask.js
@@ -56,9 +56,9 @@
     });
   }
   // 鍒犻櫎浠诲姟骞跺垹闄ゅ叧鑱旂殑鎮h�呮湇鍔�
-  export function delTaskInfo(data) {
+  export function delTaskInfo(taskid) {
     return request({
-      url: "/smartor/servicetask/remove/"+id,
+      url: "/smartor/servicetask/remove/"+taskid,
       method: "get",
     });
   }
diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js
index 39afd8d..d81eb34 100644
--- a/src/api/AiCentre/external.js
+++ b/src/api/AiCentre/external.js
@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 澶栭摼鑾峰彇闅忚鎴栭棶鍗疯鎯�
+// 澶栭摼鑾峰彇闅忚
 export function getExternalfollowup(data) {
   return request({
     url: "/smartor/servicetask/getScriptInfoByCondition",
@@ -9,7 +9,7 @@
     data: data
   });
 }
-// 鎻愪氦闂嵎銆侀殢璁�
+// 鎻愪氦銆侀殢璁�
 export function SetsaveQuestionAnswer(data) {
   return request({
     // url: "/smartor/ivrtaskcalldetail/saveQuestionAnswer",
@@ -18,3 +18,29 @@
     data: data
   });
 }
+
+
+// 缂撳瓨闂嵎
+export function Cachequestionnaire(data) {
+  return request({
+    url: "/smartor/subtaskAnswer/saveQuestionCache",
+    method: "post",
+    data: data
+  });
+}
+// 鎷跨紦瀛橀棶鍗�
+export function getCachequestionnaire(data) {
+  return request({
+    url: "/smartor/subtaskAnswer/getQuestionCache",
+    method: "post",
+    data: data
+  });
+}
+// 鎻愪氦闂嵎
+export function Submitaquestionnaire(data) {
+  return request({
+    url: "/smartor/subtaskAnswer/saveQuestionAnswer",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index d2f933f..3698704 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -20,7 +20,7 @@
 // 鏌ヨ閮ㄩ棬璇︾粏
 export function getDept(deptId) {
   return request({
-    url: '/system/dept/getInfo' + deptId,
+    url: '/system/dept/getInfo/' + deptId,
     method: 'get'
   })
 }
diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue
index 67bdf09..0fc2f84 100644
--- a/src/views/followvisit/discharge/index.vue
+++ b/src/views/followvisit/discharge/index.vue
@@ -799,9 +799,9 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.$router.push({
-        path: "/followvisit/particty",
+        path: "/followvisit/QuestionnaireTask",
         query: {
-          type: 3,
+          type: 2,
           serviceType: 2,
         },
       });
diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue
index 873a6c8..9e1be79 100644
--- a/src/views/followvisit/outpatient/index.vue
+++ b/src/views/followvisit/outpatient/index.vue
@@ -240,7 +240,7 @@
         />
 
         <el-table-column
-          label="闅忚鏂瑰紡锛堥渶璋冩暣鏍煎紡锛�"
+          label="闅忚鏂瑰紡"
           align="center"
           key="serviceform"
           prop="serviceform"
@@ -788,9 +788,9 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.$router.push({
-        path: "/followvisit/particty",
+        path: "/followvisit/QuestionnaireTask",
         query: {
-          type: 3,
+          type: 2,
           serviceType: 3,
         },
       });
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index ab4f5d7..5f91eea 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -622,6 +622,9 @@
   },
   watch: {},
   created() {
+    this.tasktopic = this.$route.query.tasktopic
+      ? this.$route.query.tasktopic
+      : this.tasktopic;
     this.getList();
     this.getConfigKey("sys.user.initPassword").then((response) => {
       this.initPassword = response.msg;
@@ -639,22 +642,22 @@
     getList() {
       this.loading = true;
       let type = this.$route.query.type;
-      this.tasktopic = this.$route.query.tasktopic
-        ? this.$route.query.tasktopic
-        : this.tasktopic;
+
       this.topqueryParams.serviceType = Number(this.tasktopic);
       this.topqueryParams.type = Number(this.type);
-      if (this.tasktopic == 1 || this.tasktopic == 7 || this.tasktopic == 6) {
+      if (
+        this.tasktopic == 2 ||
+        this.tasktopic == 3 ||
+        this.tasktopic == 1 ||
+        this.tasktopic == 7 ||
+        this.tasktopic == 6
+      ) {
         this.topqueryParams.type = 2;
         this.TaskOperation.taskType = 2;
       } else if (this.tasktopic == 4 || this.tasktopic == 8) {
         this.topqueryParams.type = 3;
         this.TaskOperation.taskType = 3;
-      } else if (
-        this.tasktopic == 2 ||
-        this.tasktopic == 3 ||
-        this.tasktopic == 5
-      ) {
+      } else if (this.tasktopic == 5) {
         this.topqueryParams.type = 1;
         this.TaskOperation.taskType = 1;
       }
@@ -807,7 +810,15 @@
       }
     },
     // 鍒犻櫎浠诲姟
-    deletefn() {},
+    deletefn(row) {
+      delTaskInfo(row.taskid).then((res) => {
+        console.log(2);
+        if (res.code == 200) {
+          this.getList();
+          this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+        }
+      });
+    },
     // 浠诲姟鍙戣捣
     sponsor(row) {
       console.log(row, "浠诲姟淇℃伅");
@@ -903,22 +914,21 @@
       this.$modal
         .confirm("鏄惁渚濈収褰撳墠浠诲姟鍒涘缓鏂颁换鍔★紵")
         .then(() => {
-          if (
-            this.tasktopic == 2 ||
-            this.tasktopic == 3 ||
-            this.tasktopic == 4 ||
-            this.tasktopic == 5
-          ) {
+          if (this.tasktopic == 5) {
             this.$router.push({
               path: "/followvisit/particty",
               query: { type: 1, id: row.taskid, nhh: 1 },
             });
-          } else if (this.tasktopic == 6) {
+          } else if (
+            this.tasktopic == 2 ||
+            this.tasktopic == 3 ||
+            this.tasktopic == 6
+          ) {
             this.$router.push({
               path: "/followvisit/QuestionnaireTask",
               query: { type: 2, id: row.taskid, nhh: 1 },
             });
-          } else if (this.tasktopic == 1) {
+          } else if (this.tasktopic == 8 || this.tasktopic == 4) {
             this.$router.push({
               path: "/followvisit/Missioncreation",
               query: { type: 3, id: row.taskid, nhh: 1 },
diff --git a/src/views/index copy.vue b/src/views/index copy.vue
index cf19982..4809975 100644
--- a/src/views/index copy.vue
+++ b/src/views/index copy.vue
@@ -118,8 +118,7 @@
         <el-col :span="4" class="aside">
           <div class="grid-content bg-purple" style="margin-top: -180px">
             <div class="title">
-              鍋ュ悍瀹f暀
-              <span>{{ endatd }} ~ {{ statd }}</span>
+              娑堟伅鍒楄〃
             </div>
             <div style="max-height: 690px; width: 100%; overflow: auto">
               <el-table style="width: 100%" :data="SkuTop">
@@ -137,7 +136,7 @@
                 ></el-table-column>
                 <el-table-column prop="count" class-name="count">
                   <template slot-scope="scope">
-                    {{ scope.row.count }}娆�
+                    {{ scope.row.count }}
                   </template>
                 </el-table-column>
               </el-table>
diff --git a/src/views/knowledge/questionbank/index.vue b/src/views/knowledge/questionbank/index.vue
index 84182cd..bb92c61 100644
--- a/src/views/knowledge/questionbank/index.vue
+++ b/src/views/knowledge/questionbank/index.vue
@@ -4,7 +4,7 @@
     <div class="sidecolumn">
       <div class="sidecolumn-top">
         <div class="top-wj">闂绫诲瀷</div>
-        <div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
+        <div class="top-tj" @click="Newcategory">+娣诲姞</div>
       </div>
       <div class="center-ss">
         <el-input
@@ -498,7 +498,7 @@
       userList: [],
       // 寮瑰嚭灞傛爣棰�
       tag: "",
-      title: "",
+      title: "鏂板绫诲埆",
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
       // 鏃ユ湡鑼冨洿
@@ -519,6 +519,8 @@
       indexid: null,
       inputValue: "",
       radio: "涓诲垎绫�",
+      zufon: true,
+      zifon: true,
       inputVisible: false,
       illnessVisible: false, //鎸囨爣鐤剧梾寮规
       deptOptions: [],
@@ -725,12 +727,23 @@
       this.dialogFormVisible = true;
       if (!b.pid) {
         this.radio = "涓诲垎绫�";
+        this.title = "淇敼涓诲垎绫�";
+        this.zufon = false;
       } else {
         this.radio = "瀛愬垎绫�";
+        this.title = "淇敼瀛愬垎绫�";
+        this.zifon = false;
       }
       this.classifyform = b;
       this.dialogFormVisible = true;
     },
+    Newcategory(){
+      this.classifyform= {}, //绫诲埆琛ㄥ崟
+      this.radio = "涓诲垎绫�";
+     this.dialogFormVisible = true
+     this.zifon = true;
+      this.zufon = true;
+    },
 
     // 绛涢�夎妭鐐�
     filterNode(value, data) {
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index 7866a88..51cef71 100644
--- a/src/views/knowledge/questionnaire/index.vue
+++ b/src/views/knowledge/questionnaire/index.vue
@@ -4,7 +4,7 @@
     <div class="sidecolumn">
       <div class="sidecolumn-top">
         <div class="top-wj">闂嵎绫诲瀷</div>
-        <div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
+        <div class="top-tj" @click="Newcategory">+娣诲姞</div>
       </div>
       <div class="center-ss">
         <el-input
@@ -525,7 +525,7 @@
       roleOptions: [],
       // 琛ㄥ崟鍙傛暟
       form: {},
-
+      title: "鏂板绫诲埆",
       sidecolumnform: {}, //娣诲姞绫诲埆琛ㄥ崟
       goQRCodeVisible: false, //浜岀淮鐮佸脊妗�
       sidecolumnval: "", //绫诲埆鎼滅储
@@ -539,6 +539,8 @@
       indexid: null,
       inputValue: "",
       radio: "涓诲垎绫�",
+      zufon: true,
+      zifon: true,
       inputVisible: false,
       illnessVisible: false, //鎸囨爣鐤剧梾寮规
       deptOptions: [],
@@ -817,12 +819,23 @@
       this.dialogFormVisible = true;
       if (!b.pid) {
         this.radio = "涓诲垎绫�";
+        this.title = "淇敼涓诲垎绫�";
+        this.zufon = false;
       } else {
         this.radio = "瀛愬垎绫�";
+        this.title = "淇敼瀛愬垎绫�";
+        this.zifon = false;
       }
       this.classifyform = b;
       this.dialogFormVisible = true;
     },
+    Newcategory(){
+      this.classifyform= {}, //绫诲埆琛ㄥ崟
+      this.radio = "涓诲垎绫�";
+     this.dialogFormVisible = true
+     this.zifon = true;
+      this.zufon = true;
+    },
 
     // 绛涢�夎妭鐐�
     filterNode(value, data) {
diff --git a/src/views/outsideChain.vue b/src/views/outsideChain.vue
index 1066fa3..fe4909e 100644
--- a/src/views/outsideChain.vue
+++ b/src/views/outsideChain.vue
@@ -9,27 +9,59 @@
           v-for="(item, index) in questionList"
           :key="item.aaa"
         >
-          <div class="dev-text">
-            {{ index + 1 }}銆�<span>{{ item.scriptContent }}</span>
+          <div
+            class="scriptTopic-dev"
+            :key="item.sort"
+            v-if="item.scriptType == 1"
+          >
+            <div class="dev-text">
+              {{ item.sort }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-radio-group v-model="item.remark">
+                <el-radio
+                  v-for="(items, index) in item.svyLibTemplateTargetoptions"
+                  :key="index"
+                  :label="index"
+                  >{{ items.optioncontent }}</el-radio
+                >
+              </el-radio-group>
+            </div>
           </div>
-
-          <div class="dev-xx" v-if="item.valueType == 1">
-            <el-radio-group v-model="item.asrtext">
-              <el-radio
-                v-for="(items, index) in item.ivrLibaScriptTargetoptionList"
-                :key="items.id"
-                :label="items.targetvalue"
-                >{{ items.targetvalue }}</el-radio
-              >
-            </el-radio-group>
+          <!-- 澶氶�� -->
+          <div
+            class="scriptTopic-dev"
+            :key="item.sort"
+            v-if="item.scriptType == 2"
+          >
+            <div class="dev-text">
+              {{ item.sort }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-checkbox-group v-model="qremark">
+                <el-checkbox
+                  v-for="(items, index) in item.svyLibTemplateTargetoptions"
+                  :key="index"
+                  :label="index"
+                >
+                  {{ items.optioncontent }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </div>
           </div>
-          <div v-else>
-            <el-input
-              type="textarea"
-              placeholder="璇疯緭鍏ュ唴瀹�"
-              v-model.sync="item.asrtext"
-              :rows="2"
-            />
+          <!-- 濉┖ -->
+          <div
+            class="scriptTopic-dev"
+            :key="item.sort"
+            v-if="item.scriptType == 4"
+          >
+            <div class="dev-text">
+              {{ item.sort }}銆乕闂瓟]<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-input placeholder="璇疯緭鍏ョ瓟妗�" v-model="radioas" clearable>
+              </el-input>
+            </div>
           </div>
         </div>
       </div>
@@ -74,32 +106,32 @@
   methods: {
     // 鑾峰彇鏁版嵁
     getQuestionnaire() {
-      let taskid = this.$route.query.param1;
-      let patid = this.$route.query.param2;
+      this.taskid = this.$route.query.param1;
+      this.patid = this.$route.query.param2;
       let taskname = this.$route.query.param3;
       let routertf = this.$route.query.param5;
 
-      console.log(taskid, "taskid");
-      console.log(patid, "patid");
-      console.log(taskname, "taskname");
-      console.log(routertf, "routertf");
+      // console.log(taskid, "taskid");
+      // console.log(patid, "patid");
+      // console.log(taskname, "taskname");
+      // console.log(routertf, "routertf");
       // let taskid =
       //   "OFp7tn/B6x7IzKJetvGWHdSWBj7msRlnlj6am9dyuHTH6sEt4uBbVCUXs5kcF/e4O2W6vqHf2Bz9K3/evbYDmw==";
       // let patid =
       //   "CVk0j8O86AeCqhV5WPsBBYDg9fec0wDoDlP9imYK4wDBNIkxywZzMJEGlPagOxnq6qr2WYZo0U8MUGWRGnq8ZA==";
-      this.taskid = this.decrypt(taskid);
-      this.patid = this.decrypt(patid);
+      // 瑙e瘑
+      // this.taskid = this.decrypt(taskid);
+      // this.patid = this.decrypt(patid);
 
       // this.taskid = taskid;
       // this.patid = patid;
-      console.log(this.taskid, "this.taskid");
-      console.log(this.patid, "this.patid");
+
 
       this.$modal.msgSuccess("鐢ㄦ埛id涓�" + this.patid);
       this.$modal.msgSuccess("浠诲姟id涓�" + this.taskid);
-      let taskids = this.encrypt(this.taskid);
-      let patids = this.encrypt(this.patid);
-      getExternalfollowup({ param1: taskids, param2: patids }).then((res) => {
+      // let taskids = this.encrypt(this.taskid);
+      // let patids = this.encrypt(this.patid);
+      getExternalfollowup({ param1: this.taskid, param2: this.patid }).then((res) => {
         if (res.code == 200) {
           this.questionList = res.rows;
         }
@@ -123,8 +155,8 @@
       // 鎻愪氦琛ㄥ崟閫昏緫
       console.log(this.questionList);
       let form = {
-        param1: this.encrypt(this.taskid),
-        param2: this.encrypt(this.patid),
+        param1: this.taskid,
+        param2: this.patid,
         ivrTaskcalldetailList: [],
       };
       this.questionList.forEach((item) => {
diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue
index ccb3669..9bbe27d 100644
--- a/src/views/outsideChainwt.vue
+++ b/src/views/outsideChainwt.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="questionnaire">
     <div class="CONTENT">
-      <div class="title">浜屾湡闂嵎璋冩煡琛�</div>
+      <div class="title">{{ taskname ? taskname : "闂嵎" }}</div>
       <div class="preview-left">
         <!-- 鍗曢�� -->
         <div
@@ -9,33 +9,61 @@
           v-for="(item, index) in questionList"
           :key="item.aaa"
         >
-          <div class="dev-text">
-            {{ index + 1 }}銆�<span>{{ item.scriptContent }}</span>
+          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 1">
+            <div class="dev-text">
+              {{ index + 1 }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-radio-group v-model="item.scriptResult">
+                <el-radio
+                  v-for="(items, index) in item.svyLibTemplateTargetoptions"
+                  :key="index"
+                  :label="index"
+                  >{{ items.optioncontent }}</el-radio
+                >
+              </el-radio-group>
+            </div>
           </div>
-
-          <div class="dev-xx" v-if="item.valueType == 1">
-            <el-radio-group v-model="item.asrtext">
-              <el-radio
-                v-for="(items, index) in item.ivrLibaScriptTargetoptionList"
-                :key="items.id"
-                :label="items.targetvalue"
-                >{{ items.targetvalue }}</el-radio
+          <!-- 澶氶�� -->
+          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 2">
+            <div class="dev-text">
+              {{ index + 1 }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-checkbox-group v-model="item.scriptResult">
+                <el-checkbox
+                  @change="$forceUpdate()"
+                  v-for="(items, indexs) in item.svyLibTemplateTargetoptions"
+                  :key="indexs"
+                  :label="items.optioncontent"
+                >
+                  {{ items.optioncontent }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </div>
+          <!-- 濉┖ -->
+          <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4">
+            <div class="dev-text">
+              {{ index + 1 }}銆乕闂瓟]<span>{{ item.scriptContent }}</span>
+            </div>
+            <div class="dev-xx">
+              <el-input
+                type="textarea"
+                :rows="2"
+                placeholder="璇疯緭鍏ョ瓟妗�"
+                v-model="item.scriptResult"
+                clearable
               >
-            </el-radio-group>
-          </div>
-          <div v-else>
-            <el-input
-              type="textarea"
-              placeholder="璇疯緭鍏ュ唴瀹�"
-              v-model.sync="item.asrtext"
-              :rows="2"
-            />
+              </el-input>
+            </div>
           </div>
         </div>
       </div>
       <el-form :model="formData" label-width="80px">
         <el-form-item>
-          <el-button type="primary" @click="submitForm">鎻愪氦闂嵎</el-button>
+          <el-button type="primary" @click="cache(true)">鎻愪氦闂嵎</el-button>
+          <el-button type="primary" @click="cache">缂撳瓨闂嵎</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -45,7 +73,9 @@
 <script>
 import {
   getExternalfollowup,
-  SetsaveQuestionAnswer,
+  getCachequestionnaire,
+  Cachequestionnaire,
+  Submitaquestionnaire,
 } from "@/api/AiCentre/index";
 import JSEncrypt from "jsencrypt";
 export default {
@@ -74,25 +104,60 @@
   methods: {
     // 鑾峰彇鏁版嵁
     getQuestionnaire() {
-      let taskid = this.$route.query.param1;
-      let patid = this.$route.query.param2;
+      this.taskid = decodeURIComponent(this.$route.query.param1);
+      this.patid = decodeURIComponent(this.$route.query.param2);
+      this.taskname = this.$route.query.param3;
       // let taskid =
       //   "OFp7tn/B6x7IzKJetvGWHdSWBj7msRlnlj6am9dyuHTH6sEt4uBbVCUXs5kcF/e4O2W6vqHf2Bz9K3/evbYDmw==";
       // let patid =
       //   "CVk0j8O86AeCqhV5WPsBBYDg9fec0wDoDlP9imYK4wDBNIkxywZzMJEGlPagOxnq6qr2WYZo0U8MUGWRGnq8ZA==";
-      this.taskid = this.decrypt(taskid);
-      this.patid = this.decrypt(patid);
+      // this.taskid = this.decrypt(taskid);
+      // this.patid = this.decrypt(patid);
 
       // this.$modal.msgSuccess("鐢ㄦ埛id涓�" + this.patid);
       // this.$modal.msgSuccess("浠诲姟id涓�" + this.taskid);
-      let taskids = this.encrypt(this.taskid);
-      let patids = this.encrypt(this.patid);
-      getExternalfollowup({ param1: taskids, param2: patids }).then((res) => {
-        if (res.code == 200) {
-          this.questionList = res.rows;
+      // let taskids = this.encrypt(this.taskid);
+      // let patids = this.encrypt(this.patid);
+      console.log(this.$route.query.param1);
+      console.log(this.$route.query.param2);
+      // 鍏堝彇缂撳瓨
+      getCachequestionnaire({ param1: this.taskid, param2: this.patid }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.questionList = res.data;
+            if (this.questionList[0]) {
+              this.questionList.forEach((item) => {
+                if (item.scriptResult) {
+                  item.scriptResult = JSON.parse(item.scriptResult);
+                }
+              });
+              return;
+            } else {
+              this.getExternalfollowup();
+            }
+          } else {
+            this.getExternalfollowup();
+          }
         }
-      });
+      );
     },
+    getExternalfollowup() {
+      getExternalfollowup({ param1: this.taskid, param2: this.patid }).then(
+        (res) => {
+          if (res.code == 200) {
+            this.questionList = res.rows;
+            // 澶勭悊棰樼洰鏀堕泦缁撴灉鏍煎紡
+            this.questionList.forEach((item) => {
+              item.nextScriptno = Number(item.nextScriptno);
+              if (item.scriptType == 2) {
+                item.scriptResult = [];
+              }
+            });
+          }
+        }
+      );
+    },
+
     // 鍔犲瘑鍑芥暟
     encrypt(txt) {
       const encryptor = new JSEncrypt();
@@ -109,37 +174,44 @@
     // 鎻愪氦
     submitForm() {
       // 鎻愪氦琛ㄥ崟閫昏緫
-      console.log(this.questionList);
       let form = {
-        param1: this.encrypt(this.taskid),
-        param2: this.encrypt(this.patid),
-        svyTasksingledetailList: [],
+        param1: this.taskid,
+        param2: this.patid,
+        serviceSubtaskDetailList: [],
       };
-      this.questionList.forEach((item) => {
-        let optionarr = [];
-        item.ivrLibaScriptTargetoptionList.forEach((option) => {
-          optionarr.push(option.targetvalue);
-        });
-        let ivrTaskcalldetail = {
-          asrtext: item.asrtext,
-          valueType: item.valueType,
-          scriptType: item.scriptType,
-          questiontext: item.questiontext,
-          questionvoice: item.questionvoice,
-          scriptContent: item.scriptContent,
-          targetoptions: optionarr.join(","),
-        };
-        form.svyTasksingledetailList.push(ivrTaskcalldetail);
+      const arr = structuredClone(this.questionList);
+      arr.forEach((item) => {
+        item.asrtext = JSON.stringify(item.scriptResult);
       });
-      console.log(form, "form");
-
-      SetsaveQuestionAnswer(form).then((res) => {
+      form.serviceSubtaskDetailList = arr;
+      Submitaquestionnaire(form).then((res) => {
         if (res.code == 200) {
           this.$modal.msgSuccess("鎻愪氦鎴愬姛");
         }
       });
       // 鍙互灏嗘暟鎹彁浜ゅ埌鍚庣鎴栬�呰繘琛屽叾浠栧鐞�
     },
+    // 缂撳瓨
+    cache(subm) {
+      let form = {
+        param1: this.taskid,
+        param2: this.patid,
+        svyLibTemplateScriptVOS: [],
+      };
+      const arr = structuredClone(this.questionList);
+      arr.forEach((item) => {
+        item.scriptResult = JSON.stringify(item.scriptResult);
+      });
+      form.svyLibTemplateScriptVOS = arr;
+      Cachequestionnaire(form).then((res) => {
+        if (res.code == 200) {
+          this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+          if (subm) {
+            this.submitForm();
+          }
+        }
+      });
+    },
   },
 };
 </script>
diff --git a/src/views/outsideChainxj.vue b/src/views/outsideChainxj.vue
index b6db656..e843090 100644
--- a/src/views/outsideChainxj.vue
+++ b/src/views/outsideChainxj.vue
@@ -50,8 +50,8 @@
   methods: {
     // 鑾峰彇鏁版嵁
     getQuestionnaire() {
-      // let taskid = this.$route.query.param1;
-      // let patid = this.$route.query.param2;
+      this.taskid = this.$route.query.param1;
+      this.patid = this.$route.query.param2;
       // // let taskid =
       // //   "OFp7tn/B6x7IzKJetvGWHdSWBj7msRlnlj6am9dyuHTH6sEt4uBbVCUXs5kcF/e4O2W6vqHf2Bz9K3/evbYDmw==";
       // // let patid =
@@ -63,11 +63,11 @@
       // // this.$modal.msgSuccess("浠诲姟id涓�" + this.taskid);
       // let taskids = this.encrypt(this.taskid);
       // let patids = this.encrypt(this.patid);
-      // getExternalfollowup({ param1: taskids, param2: patids }).then((res) => {
-      //   if (res.code == 200) {
-      //     this.questionList = res.rows;
-      //   }
-      // });
+      getExternalfollowup({ param1: this.taskid, param2: this.patid }).then((res) => {
+        if (res.code == 200) {
+          this.questionList = res.rows;
+        }
+      });
       // 涓存椂鑾峰彇鏁版嵁
       axios
         .get("http://192.168.1.10:8095/profile/upload/show/娴嬭瘯/娴嬭瘯.html")
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index 4ef34a9..94cc4ac 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -602,7 +602,7 @@
       richText: "<p>Hello, <strong>world</strong>!</p>",
       // 鎮h�呰〃鍗�
       tableLabelhz: [
-        { label: "搴忓彿", width: "", prop: "patid" },
+        // { label: "搴忓彿", width: "", prop: "patid" },
         { label: "鎮h�呭悕绉�", width: "", prop: "name" },
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "骞撮緞", width: "", prop: "age" },
@@ -889,7 +889,7 @@
           }
           this.$router.push({
             path: "/followvisit/tasklist",
-            query: { tasktopic: 4 },
+            query: { tasktopic: this.form.serviceType },
           });
         }
       });
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index fceefd2..316ce12 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -589,7 +589,7 @@
       questionList: [],
       // 鎮h�呰〃鍗�
       tableLabelhz: [
-        { label: "搴忓彿", width: "", prop: "patid" },
+        // { label: "搴忓彿", width: "", prop: "patid" },
         { label: "鎮h�呭悕绉�", width: "", prop: "name" },
         { label: "鎬у埆", width: "", prop: "sex" },
         { label: "骞撮緞", width: "", prop: "age" },
@@ -884,7 +884,7 @@
           }
           this.$router.push({
             path: "/followvisit/tasklist",
-            query: { tasktopic: 6 },
+            query: { tasktopic: this.form.serviceType },
           });
         }
       });
@@ -943,7 +943,6 @@
       });
       if (this.patientqueryParams.allhosp == 1) {
         this.tableLabelhz = [
-          { label: "搴忓彿", width: "", prop: "patid" },
           { label: "鎮h�呭悕绉�", width: "", prop: "name" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
@@ -954,7 +953,6 @@
         ];
       } else if (this.patientqueryParams.allhosp == 2) {
         this.tableLabelhz = [
-          { label: "搴忓彿", width: "", prop: "patid" },
           { label: "鎮h�呭悕绉�", width: "", prop: "name" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 7e846f9..acc683b 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -740,7 +740,6 @@
             value: "1",
             label: "浜哄伐",
           },
-
           {
             value: "3",
             label: "鐢佃瘽",
@@ -802,7 +801,6 @@
     // 淇濆瓨
     submitForm(formName) {
       this.form.preachform = this.checkList.join(",");
-
       // this.formatFn(1);
       if (!this.form.patTaskRelevances[0]) {
         this.$modal.msgError("璇烽�夋嫨鐥呬汉");
@@ -826,7 +824,10 @@
           } else {
             this.$modal.msgSuccess("淇敼鎴愬姛");
           }
-          this.$router.go(-1);
+          this.$router.push({
+            path: "/followvisit/tasklist",
+            query: { tasktopic: this.form.serviceType },
+          });
         }
       });
     },
@@ -888,7 +889,6 @@
       });
       if (this.patientqueryParams.allhosp == 1) {
         this.tableLabelhz = [
-          { label: "搴忓彿", width: "", prop: "patid" },
           { label: "鎮h�呭悕绉�", width: "", prop: "name" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
@@ -899,7 +899,6 @@
         ];
       } else if (this.patientqueryParams.allhosp == 2) {
         this.tableLabelhz = [
-          { label: "搴忓彿", width: "", prop: "patid" },
           { label: "鎮h�呭悕绉�", width: "", prop: "name" },
           { label: "鎬у埆", width: "", prop: "sex" },
           { label: "骞撮緞", width: "", prop: "age" },
diff --git a/src/views/repositoryai/templateku/index.vue b/src/views/repositoryai/templateku/index.vue
index db3e944..1cd37ef 100644
--- a/src/views/repositoryai/templateku/index.vue
+++ b/src/views/repositoryai/templateku/index.vue
@@ -4,7 +4,7 @@
     <div class="sidecolumn">
       <div class="sidecolumn-top">
         <div class="top-wj">妯$増绫诲瀷</div>
-        <div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
+        <div class="top-tj" @click="Newcategory">+娣诲姞</div>
       </div>
       <div class="center-ss">
         <el-input
@@ -793,6 +793,13 @@
       this.classifyform = b;
       this.dialogFormVisible = true;
     },
+    Newcategory() {
+      this.classifyform = {}; //绫诲埆琛ㄥ崟
+        this.radio = "涓诲垎绫�";
+      this.dialogFormVisible = true;
+      this.zifon = true;
+      this.zufon = true;
+    },
     // 棰勮
     preview(row) {
       getvFollowup({ id: row.id }).then((res) => {
diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue
index ad73d02..7dfaf18 100644
--- a/src/views/repositoryai/verbaltrick/index.vue
+++ b/src/views/repositoryai/verbaltrick/index.vue
@@ -4,7 +4,7 @@
     <div class="sidecolumn">
       <div class="sidecolumn-top">
         <div class="top-wj">闂绫诲瀷</div>
-        <div class="top-tj" @click="dialogFormVisible = true">+娣诲姞</div>
+        <div class="top-tj" @click="Newcategory">+娣诲姞</div>
       </div>
       <div class="center-ss">
         <el-input
@@ -187,13 +187,7 @@
                 :show-overflow-tooltip="true"
               />
 
-              <el-table-column
-                label="闂鍐呭"
-                align="center"
-                key="scriptContent"
-                prop="scriptContent"
-                width="200"
-              /><el-table-column
+             <el-table-column
                 label="鍏宠仈鎸囨爣"
                 align="center"
                 key="targetname"
@@ -315,11 +309,11 @@
       </div>
     </div>
     <!-- 娣诲姞绫诲埆寮规 -->
-    <el-dialog title="鏂板绫诲埆" width="30%" :visible.sync="dialogFormVisible">
+    <el-dialog :title="title" width="30%" :visible.sync="dialogFormVisible">
       <div style="text-align: center; margin-bottom: 20px">
         <el-radio-group v-model="radio">
-          <el-radio-button label="涓诲垎绫�"></el-radio-button>
-          <el-radio-button label="瀛愬垎绫�"></el-radio-button>
+          <el-radio-button label="涓诲垎绫�" v-show="zifon"></el-radio-button>
+          <el-radio-button label="瀛愬垎绫�" v-show="zufon"></el-radio-button>
         </el-radio-group>
       </div>
       <el-divider></el-divider>
@@ -523,7 +517,7 @@
         },
       ],
       // 寮瑰嚭灞傛爣棰�
-      title: "",
+      title: "鏂板绫诲埆",
       // 鏄惁鏄剧ず寮瑰嚭灞�
       open: false,
       // 鏃ユ湡鑼冨洿
@@ -542,7 +536,8 @@
       indexopen: false, //寮规灞曠ず鍚�
       propss: { multiple: true },
       radio: "涓诲垎绫�",
-
+      zufon: true,
+      zifon: true,
       usable: [],
 
       mode: [],
@@ -716,12 +711,23 @@
       this.dialogFormVisible = true;
       if (!b.pid) {
         this.radio = "涓诲垎绫�";
+        this.title = "淇敼涓诲垎绫�";
+        this.zufon = false;
       } else {
         this.radio = "瀛愬垎绫�";
+        this.title = "淇敼瀛愬垎绫�";
+        this.zifon = false;
       }
       this.classifyform = b;
       this.dialogFormVisible = true;
     },
+    Newcategory(){
+      this.classifyform= {}, //绫诲埆琛ㄥ崟
+      this.radio = "涓诲垎绫�";
+     this.dialogFormVisible = true
+     this.zifon = true;
+     this.zufon = true;
+    },
 
     // 绛涢�夎妭鐐�
     filterNode(value, data) {
diff --git a/vue.config.js b/vue.config.js
index 7abbd0d..0746100 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,7 @@
 
 const name = process.env.VUE_APP_TITLE || '鎮h�呮櫤鎱ф湇鍔$郴缁�' // 缃戦〉鏍囬
 
-const port = process.env.port || process.env.npm_config_port || 8095 // 绔彛
+const port = process.env.port || process.env.npm_config_port || 8096 // 绔彛
 
 // vue.config.js 閰嶇疆璇存槑
 //瀹樻柟vue.config.js 鍙傝�冩枃妗� https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -35,9 +35,9 @@
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.1.10:8095`,
+        target: `http://192.168.2.8:8095`,
         // target:`http://localhost:8095`,
-        // target: `http://www.hxsoft.com:8080`,
+        // target: `http://35z1t16164.qicp.vip`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

--
Gitblit v1.9.3