From 452e7fb4ea242b0d7bb821abc0cb3bf465129ffd Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 22 七月 2024 17:40:05 +0800
Subject: [PATCH] 测试完成

---
 src/views/knowledge/illness/index.vue              |   17 ++++
 src/views/knowledge/drug/index.vue                 |   27 ++++++
 src/views/knowledge/firstAid/index.vue             |   17 ++++
 src/views/knowledge/classify/index.vue             |   17 ++++
 src/components/Regular/index.vue                   |   20 +++-
 src/store/getters.js                               |   16 ----
 src/views/repositoryai/intention/index.vue         |   26 +++++-
 src/views/patient/propaganda/Missioncreation.vue   |   25 +++---
 src/views/patient/propaganda/particty.vue          |   27 +++---
 src/views/patient/propaganda/QuestionnaireTask.vue |   24 +++---
 10 files changed, 150 insertions(+), 66 deletions(-)

diff --git a/src/components/Regular/index.vue b/src/components/Regular/index.vue
index 091e957..4aa1773 100644
--- a/src/components/Regular/index.vue
+++ b/src/components/Regular/index.vue
@@ -66,7 +66,7 @@
             </el-input> </el-form-item
         ></el-col>
       </el-row>
-      <el-form-item label="鍏抽敭瀛�(鍚�)" prop="desc">
+      <el-form-item label="鍏抽敭瀛�(鍚�)" prop="desc" v-if="hasValue">
         <div class="xinz-inf">
           <el-tag
             :key="crux"
@@ -108,7 +108,7 @@
           >
         </div>
       </el-form-item>
-      <el-form-item label="鍏抽敭瀛�(闈�)" prop="desc">
+      <el-form-item label="鍏抽敭瀛�(闈�)" prop="desc" v-if="hasValue">
         <div class="xinz-inf">
           <el-tag
             :key="crux"
@@ -179,7 +179,6 @@
               class="upload-demo"
               style="display: flex"
               action="https://jsonplaceholder.typicode.com/posts/"
-              :on-change="handleChange"
               :file-list="fileList"
               :limit="1"
               :on-exceed="handleExceed"
@@ -268,6 +267,10 @@
       type: Boolean,
       default: true,
     },
+    hasValue: {
+      type: Boolean,
+      default: true,
+    },
   },
 
   created() {
@@ -314,9 +317,9 @@
       this.handleSelectionChange();
     },
     // 鎺у埗鏂囦欢
-    handleChange(file, fileList) {
-      this.fileList = fileList.slice(-3);
-    },
+    // handleChange(file, fileList) {
+    //   this.fileList = fileList.slice(-3);
+    // },
     // 鏂囦欢瓒呭嚭涓暟闄愬埗鏃剁殑閽╁瓙
     handleExceed(files, fileList) {
       this.$message.warning(
@@ -392,8 +395,11 @@
     },
     // 閫夐」鏂囦欢涓婁紶
     handleChange(item, response, file, fileList) {
+      console.log(response, "response");
+      console.log(item, "item");
+      console.log(this.TargetoptionList, "this.TargetoptionList");
       let index = this.TargetoptionList.findIndex(
-        (obj) => obj.id == item.id && obj.name == item.name
+        (obj) => obj.guid == item.guid && obj.name == item.name
       );
       this.TargetoptionList[index].picturePath = response.url;
     },
diff --git a/src/store/getters.js b/src/store/getters.js
index cb8425e..4a6ac06 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -36,22 +36,6 @@
         listClass: "",
       },
     },
-    {
-      value: "3",
-      label: "浜哄伐鐢佃瘽",
-      raw: {
-        cssClass: "",
-        listClass: "",
-      },
-    },
-    {
-      value: "4",
-      label: "鏅鸿兘闂瓟",
-      raw: {
-        cssClass: "",
-        listClass: "",
-      },
-    },
   ],
   // 閫傜敤鏂瑰紡
   Askmode: (state) => [
diff --git a/src/views/knowledge/classify/index.vue b/src/views/knowledge/classify/index.vue
new file mode 100644
index 0000000..45805df
--- /dev/null
+++ b/src/views/knowledge/classify/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>鐤剧梾鍒嗙被浠g爜</div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+
+  created() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/knowledge/drug/index.vue b/src/views/knowledge/drug/index.vue
new file mode 100644
index 0000000..aa54bde
--- /dev/null
+++ b/src/views/knowledge/drug/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <div>
+鑽搧鐭ヨ瘑搴�
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+
+    }
+  },
+
+  created () {
+
+  },
+
+  methods: {
+
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+
+</style>
diff --git a/src/views/knowledge/firstAid/index.vue b/src/views/knowledge/firstAid/index.vue
new file mode 100644
index 0000000..b5626fe
--- /dev/null
+++ b/src/views/knowledge/firstAid/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>鎬ユ晳鐭ヨ瘑搴�</div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+
+  created() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/knowledge/illness/index.vue b/src/views/knowledge/illness/index.vue
new file mode 100644
index 0000000..d31c696
--- /dev/null
+++ b/src/views/knowledge/illness/index.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>鐤剧梾鐭ヨ瘑搴�</div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+
+  created() {},
+
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index cfd8047..1861e31 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -169,18 +169,6 @@
               </el-form>
             </div>
           </div>
-        </div>
-        <el-button type="success" @click="nextstep('ruleForm')">{{
-          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
-        }}</el-button>
-        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
-      </div>
-
-      <!-- 浠诲姟璇︽儏 -->
-      <div v-if="Editprogress == 2">
-        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
-        </el-alert>
-        <div class="leftvlue-jbxx">
           <div class="examine-jic">
             <div class="headline">
               <div>鍙橀噺鍖归厤閲忓弬</div>
@@ -226,6 +214,19 @@
               </div>
             </div>
           </div>
+        </div>
+        <el-button type="success" @click="nextstep('ruleForm')">{{
+          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
+        }}</el-button>
+        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+      </div>
+
+      <!-- 浠诲姟璇︽儏 -->
+      <div v-if="Editprogress == 2">
+        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
+        </el-alert>
+        <div class="leftvlue-jbxx">
+
           <div class="examine-jic">
             <div class="headline">
               <div>鎮h�呭垪琛�</div>
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index a5de586..ed4b22f 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -169,18 +169,6 @@
               </el-form>
             </div>
           </div>
-        </div>
-        <el-button type="success" @click="nextstep('ruleForm')">{{
-          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
-        }}</el-button>
-        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
-      </div>
-
-      <!-- 浠诲姟璇︽儏 -->
-      <div v-if="Editprogress == 2">
-        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
-        </el-alert>
-        <div class="leftvlue-jbxx">
           <div class="examine-jic">
             <div class="headline">
               <div>鍙橀噺鍖归厤閲忓弬</div>
@@ -226,6 +214,18 @@
               </div>
             </div>
           </div>
+        </div>
+        <el-button type="success" @click="nextstep('ruleForm')">{{
+          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
+        }}</el-button>
+        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+      </div>
+
+      <!-- 浠诲姟璇︽儏 -->
+      <div v-if="Editprogress == 2">
+        <el-alert title="鍦ㄦ湰闃舵閫夋嫨瀹f暀鐥呬汉" type="success" effect="dark">
+        </el-alert>
+        <div class="leftvlue-jbxx">
           <div class="examine-jic">
             <div class="headline">
               <div>鎮h�呭垪琛�</div>
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 6afd5c6..d49df9b 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -169,18 +169,6 @@
               </el-form>
             </div>
           </div>
-        </div>
-        <el-button type="success" @click="nextstep('ruleForm')">{{
-          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
-        }}</el-button>
-        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
-      </div>
-
-      <!-- 浠诲姟璇︽儏 -->
-      <div v-if="Editprogress == 2">
-        <el-alert title="鍦ㄦ湰闃舵閫夋嫨闅忚鐥呬汉" type="success" effect="dark">
-        </el-alert>
-        <div class="leftvlue-jbxx">
           <div class="examine-jic">
             <div class="headline">
               <div>鍙橀噺鍖归厤閲忓弬</div>
@@ -226,6 +214,18 @@
               </div>
             </div>
           </div>
+        </div>
+        <el-button type="success" @click="nextstep('ruleForm')">{{
+          quote ? "绔嬪嵆鍒涘缓" : "浠诲姟璇︽儏閰嶇疆"
+        }}</el-button>
+        <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
+      </div>
+
+      <!-- 浠诲姟璇︽儏 -->
+      <div v-if="Editprogress == 2">
+        <el-alert title="鍦ㄦ湰闃舵閫夋嫨闅忚鐥呬汉" type="success" effect="dark">
+        </el-alert>
+        <div class="leftvlue-jbxx">
           <div class="examine-jic">
             <div class="headline">
               <div>鎮h�呭垪琛�</div>
@@ -994,6 +994,7 @@
     // 澶勭悊闂灞傚彉閲�
     Variablehandling(arr, type) {
       let Variablist = [];
+      this.variableList = []; //鍙橀噺鍒楄〃
       if (type == 1) {
         console.log(arr);
         // 寰幆闂
@@ -1010,13 +1011,13 @@
             }
           });
         });
-        console.log(Variablist, "Variablist");
         const Aarr = Variablist.filter(
           (obj, index, self) =>
             index ===
             self.findIndex((t) => t.name === obj.name && t.value === obj.value)
         );
         this.variableList = this.transitionList.concat(Aarr);
+        console.log(this.variableList, "variableList");
         // this.form.textParam = this.convertFormat2ToFormat1(this.variableList);
       }
     },
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index 100dd5b..a7edc4b 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -212,7 +212,7 @@
               >
               </el-table-column>
 
-              <el-table-column
+              <!-- <el-table-column
                 label="姝e父鍊艰寖鍥�"
                 align="center"
                 key="warndown"
@@ -222,7 +222,7 @@
                 <template slot-scope="scope">
                   <span>{{ scope.row.warnup }}~{{ scope.row.warndown }}</span>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
               <el-table-column
                 label="鎸囨爣鎻忚堪"
                 align="center"
@@ -297,7 +297,7 @@
                       ><i class="el-icon-edit"></i>淇敼</span
                     ></el-button
                   >
-                  <el-button
+                  <!-- <el-button
                     size="medium"
                     type="text"
                     @click="handlemeasurement(scope.row)"
@@ -305,7 +305,7 @@
                     ><span class="button-textcs"
                       ><i class="el-icon-help"></i>娴嬭瘯</span
                     ></el-button
-                  >
+                  > -->
                   <el-button
                     size="medium"
                     type="text"
@@ -495,8 +495,10 @@
               <el-col :span="24">
                 <el-form-item label="閫傜敤鍦烘櫙" prop="suitWayList">
                   <el-select
+                    class="el-select1"
                     v-model="indexform.suitWayList"
                     multiple
+                    @change="changeselect"
                     placeholder="璇烽�夋嫨"
                   >
                     <el-option
@@ -513,18 +515,19 @@
             <el-card
               class="box-card"
               style="margin-bottom: 20px"
-              v-if="indexform.valueType == 1 || indexform.valueType == 2"
+              v-if="indexform.scriptType == 1 || indexform.scriptType == 2"
             >
               <Regular
                 :TargetoptionList="testuserList"
                 :intent="false"
+                :hasValue="hasValue"
                 @addoption="addoption"
                 @deloption="deloption"
                 @syioption="syioption"
                 @xiayioption="xiayioption"
               />
             </el-card>
-            <div v-if="indexform.valueType == 3">
+            <div v-if="indexform.scriptType == 3">
               <el-form-item label="鏀堕泦淇℃伅">
                 <el-input
                   type="text"
@@ -707,6 +710,7 @@
       radio: "涓诲垎绫�",
       testvalue: "",
       testgovalue: "",
+      hasValue: true,
       classifyform: {
         categoryname: "",
       }, //绫诲埆琛ㄥ崟
@@ -810,6 +814,10 @@
     getIndexInArray(arr, obj) {
       // 杩斿洖鏁扮粍涓寚瀹氬厓绱犵殑绱㈠紩
       return arr.indexOf(obj);
+    },
+    changeselect(row) {
+      console.log(row);
+      this.hasValue = row.includes('2');
     },
     //鍒犻櫎鍒嗙被
     deletefenlei(row) {
@@ -954,6 +962,7 @@
         id: this.indexform.id,
         targettype: this.indexform.targettype,
         isoperation: 1,
+        isabnormal: 0,
         targetvalue: "",
         targetregex: "",
         targetregex2: "",
@@ -1008,6 +1017,7 @@
           dynamiccruxsJson: item.dynamiccruxsJson,
           nodynamiccruxsJson: item.nodynamiccruxsJson,
           targetoptionid: item.targetoptionid,
+          isabnormal: item.isabnormal,
         };
       });
       console.log(this.testuserList);
@@ -1179,6 +1189,7 @@
       this.title = "鎸囨爣璇︽儏";
       this.indexform = {};
       this.indexform = row;
+      this.indexform.scriptType = Number(row.scriptType);
       if (!row.targetoptionList[0]) {
         row.targetoptionList = [
           {
@@ -1396,6 +1407,9 @@
     height: 400px;
   }
 }
+.el-select {
+  width: 40%;
+}
 ::v-deep.el-tabs--left,
 .el-tabs--right {
   overflow: hidden;

--
Gitblit v1.9.3