From 8dcf2987d3fcb5a7a8244513148606ead6715d53 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 01 九月 2024 00:31:28 +0800
Subject: [PATCH] 测试完成
---
src/views/system/user/index.vue | 3 +
vue.config.js | 6 +-
src/views/repositoryai/templateku/configurat/index.vue | 5 ++
src/views/knowledge/questionnaire/compilequer/index.vue | 25 +++++++++---
src/views/knowledge/questionnaire/index.vue | 12 +++++
src/views/patient/propaganda/particty.vue | 34 +++++++++++++++--
src/api/system/dept.js | 2
src/views/patient/propaganda/QuestionnaireTask.vue | 2
src/views/repositoryai/templateku/index.vue | 12 +++++
9 files changed, 81 insertions(+), 20 deletions(-)
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/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 0eb6d7e..83ebd65 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -695,7 +695,7 @@
<div
class="scriptTopic-dev"
:key="item.sort"
- v-if="item.scriptType == 3"
+ v-if="item.scriptType == 4"
>
<div class="dev-text">
{{ item.sort }}銆乕濉┖]<span>{{ item.scriptContent }}</span>
@@ -1278,13 +1278,13 @@
},
activated() {
if (this.id != this.$route.query.id) {
- this.gettabList();
this.getissueinfo();
+ this.gettabList();
}
},
created() {
- this.gettabList();
this.getissueinfo();
+ this.gettabList();
this.mode = store.getters.Askmode;
this.languagelist = store.getters.languagelist;
this.usable = store.getters.usable;
@@ -1337,6 +1337,12 @@
// 鑾峰彇鏁版嵁
getissueinfo() {
this.id = this.$route.query.id;
+ this.ruleForm = {
+ svyTemplateLibScripts: [],
+ tempDetpRelevances: [],
+ svyLibTemplateTagList: [],
+ };
+
if (this.id) {
getQtemplateobj({ svyid: this.id }).then((res) => {
this.ruleForm = res.rows[0];
@@ -1365,9 +1371,11 @@
});
},
submitForm(formName) {
- this.$modal.loading("姝ｅ湪涓婁紶鏁版嵁锛岃绋嶅��...");
+ this.$modal.loading("姝ｅ湪淇淇濆瓨鏁版嵁锛岃绋嶅��...");
this.ruleForm.suitway = this.ruleForm.suitway.join(",");
-
+ if (!this.ruleForm.categoryid) {
+ this.ruleForm.categoryid = -1;
+ }
if (this.id) {
this.ruleForm.isoperation = 2;
compileQtemplate(this.ruleForm).then((res) => {
@@ -1808,12 +1816,15 @@
const allGreaterThanTen = arr.every((array) => {
const totalScore = array.reduce((accumulator, current) => {
- return accumulator + current.score;
+ return accumulator + Number(current.score);
}, 0);
+ console.log(totalScore);
+ console.log(this.ruleForm.scriptScore);
+
return totalScore == this.ruleForm.scriptScore;
});
if (allGreaterThanTen) {
- this.$modal.msgSuccess("棰樼洰鍒嗗�肩疮鍔犲拰妯＄増鎬诲垎鐩哥");
+ this.$modal.msgSuccess("鍒嗗�兼牎楠屾垚鍔�");
} else {
this.$modal.msgError("棰樼洰鍒嗗�肩疮鍔犲拰妯＄増鍒嗗�间笉绗�");
}
diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue
index 7866a88..bdb0a2d 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="addtagclass">+娣诲姞</div>
</div>
<div class="center-ss">
<el-input
@@ -823,6 +823,16 @@
this.classifyform = b;
this.dialogFormVisible = true;
},
+ addtagclass() {
+ this.dialogFormVisible = true;
+ this.classifyform = {
+ categoryname: "",
+ }; //绫诲埆琛ㄥ崟
+ this.radio = "涓诲垎绫�";
+ this.title = "鏂板绫诲埆";
+ this.zufon = true;
+ this.zifon = true;
+ },
// 绛涢�夎妭鐐�
filterNode(value, data) {
diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue
index fceefd2..341f444 100644
--- a/src/views/patient/propaganda/QuestionnaireTask.vue
+++ b/src/views/patient/propaganda/QuestionnaireTask.vue
@@ -425,7 +425,7 @@
class="scriptTopic-dev"
v-for="item in questionList"
:key="item.sort"
- v-if="item.scriptType == 3"
+ v-if="item.scriptType == 4"
>
<div class="dev-text">
{{ item.sort }}銆乕濉┖]<span>{{ item.scriptContent }}</span>
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 7e846f9..c99282f 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -447,11 +447,8 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="闅忚涓婚">
- <el-input v-model="topqueryParams.name"></el-input>
- </el-form-item>
<el-form-item label="闅忚鍚嶇О">
- <el-input v-model="topqueryParams.name"></el-input>
+ <el-input v-model="topqueryParams.templateName"></el-input>
</el-form-item>
<el-form-item label="閫傜敤绉戝" prop="status">
@@ -463,6 +460,28 @@
:value="item.value"
>
</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="闅忚妯＄増鍒嗙被" prop="region">
+ <el-select
+ v-model="topqueryParams.assortid"
+ size="medium"
+ filterable
+ placeholder="璇烽�夋嫨鍒嗙被"
+ >
+ <el-option-group
+ v-for="group in indexAssortlist"
+ :key="group.id"
+ :label="group.indexAssortName"
+ >
+ <el-option
+ v-for="item in group.ivrLibaTemplateAssortList"
+ :key="item.id"
+ :label="item.indexAssortName"
+ :value="item.id"
+ >
+ </el-option>
+ </el-option-group>
</el-select>
</el-form-item>
<el-form-item>
@@ -519,6 +538,7 @@
delhetaskinfo,
Editsingletask,
getvFollowup,
+ getFollowupclassify,
} from "@/api/AiCentre/index";
import { listDept } from "@/api/system/dept";
@@ -615,6 +635,8 @@
patientuserList: [], //閫夋嫨鎮ｈ�呭垪琛�
sonuserList: [], //閫変腑鎮ｈ�呭垪琛�
delvariableList: [], //鍒犻櫎鍙橀噺涓存椂瀛樺偍
+ indexAssortlist: [],
+
variableList: [
{
name: "濮撳悕",
@@ -794,6 +816,7 @@
this.total = response.total;
});
},
+
nextstep() {
if (this.Editprogress <= 3) {
return this.Editprogress++;
@@ -1057,6 +1080,9 @@
}
});
}
+ getFollowupclassify({}).then((res) => {
+ this.indexAssortlist = res.rows;
+ });
},
// 鑾峰彇绉戝鍒楄〃
listDept() {
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index be649eb..48d4926 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -1626,6 +1626,9 @@
} else {
this.ruleForm.isoperation = 1;
}
+ if (!this.ruleForm.assortid) {
+ this.ruleForm.assortid = -1;
+ }
this.ruleForm.labelInfo = JSON.stringify(this.dynamicTags);
this.ruleForm.suitway = this.ruleForm.suitway.join(",");
this.ruleForm.campus = this.ruleForm.campus.join(",");
@@ -1680,7 +1683,7 @@
},
// 绉戝澶勭悊
Departmenttreatment() {
- this.$modal.loading("姝ｅ湪涓婁紶鏁版嵁锛岃绋嶅��...");
+ this.$modal.loading("姝ｅ湪淇淇濆瓨鏁版嵁锛岃绋嶅��...");
this.ruleForm.deptNames = JSON.stringify(this.tempDetpRelevanceslist);
this.ruleForm.ivrLibaTemplateScriptVOList =
this.ruleForm.ivrLibaTemplateScriptVOList.concat(this.delScriptVOList);
diff --git a/src/views/repositoryai/templateku/index.vue b/src/views/repositoryai/templateku/index.vue
index db3e944..e86814b 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="addtagclass">+娣诲姞</div>
</div>
<div class="center-ss">
<el-input
@@ -793,6 +793,16 @@
this.classifyform = b;
this.dialogFormVisible = true;
},
+ addtagclass() {
+ this.dialogFormVisible = true;
+ this.classifyform = {
+ categoryname: "",
+ }; //绫诲埆琛ㄥ崟
+ this.radio = "涓诲垎绫�";
+ this.title = "鏂板绫诲埆";
+ this.zufon = true;
+ this.zifon = true;
+ },
// 棰勮
preview(row) {
getvFollowup({ id: row.id }).then((res) => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index bb206c6..d31eecf 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -307,7 +307,7 @@
<el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
<treeselect
- v-model="deptIds"
+ v-model="form.depts"
:options="deptOptions"
:multiple="true"
:show-count="true"
@@ -743,6 +743,7 @@
this.open = true;
this.title = "娣诲姞鐢ㄦ埛";
this.form.password = this.initPassword;
+ this.form.depts = [];
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
diff --git a/vue.config.js b/vue.config.js
index 7abbd0d..4ebf425 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,7 @@
const name = process.env.VUE_APP_TITLE || '鎮ｈ�呮櫤鎱ф湇鍔＄郴缁�' // 缃戦〉鏍囬
-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,8 +35,8 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://192.168.1.10:8095`,
- // target:`http://localhost:8095`,
+ // target: `http://192.168.1.10:8095`,
+ target:`http://localhost:8095`,
// target: `http://www.hxsoft.com:8080`,
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3