From 47efee4e578552c77390411d37b5427811999211 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期六, 11 五月 2024 16:43:28 +0800
Subject: [PATCH] 测试完成
---
src/views/followvisit/tasklist/index.vue | 58 ++++++--------
src/api/smartor/patphysical.js | 2
src/api/system/menu.js | 4
src/views/followvisit/tasklist/FollowupDetails/index.vue | 6
src/api/AiCentre/indicator.js | 8 ++
src/views/repositoryai/outsideChain/publicity.vue | 35 ++++++++
src/views/repositoryai/outsideChain/questionnaire.vue | 17 ++++
src/views/repositoryai/verbaltrick/particulars/index.vue | 6
src/components/Regular/index.vue | 6 +
src/views/knowledge/questionnaire/compilequer/index.vue | 4
src/views/repositoryai/intention/index.vue | 54 +++++++++----
src/views/patient/propaganda/particty.vue | 36 ++++-----
12 files changed, 154 insertions(+), 82 deletions(-)
diff --git a/src/api/AiCentre/indicator.js b/src/api/AiCentre/indicator.js
index 006829e..695c223 100644
--- a/src/api/AiCentre/indicator.js
+++ b/src/api/AiCentre/indicator.js
@@ -132,4 +132,12 @@
data:data,
});
}
+// 娴嬭瘯鎸囨爣
+export function testtagerlist(data) {
+ return request({
+ url: "/smartor/target/targetQuesMate",
+ method: "post",
+ data:data,
+ });
+}
diff --git a/src/api/smartor/patphysical.js b/src/api/smartor/patphysical.js
index 59840bc..8466a35 100644
--- a/src/api/smartor/patphysical.js
+++ b/src/api/smartor/patphysical.js
@@ -4,7 +4,7 @@
export function listPatphysical(query) {
return request({
url: '/smartor/patphysical/selectPatMedPhysicalList',
- method: 'get',
+ method: 'post',
data: query
})
}
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index 86daaf6..ce256c2 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -36,7 +36,7 @@
// 鏂板鑿滃崟
export function addMenu(data) {
return request({
- url: '/system/menu',
+ url: '/system/menu/add',
method: 'post',
data: data
})
@@ -57,4 +57,4 @@
url: '/system/menu/remove/' + menuId,
method: 'get'
})
-}
\ No newline at end of file
+}
diff --git a/src/components/Regular/index.vue b/src/components/Regular/index.vue
index 5de3b58..6368c34 100644
--- a/src/components/Regular/index.vue
+++ b/src/components/Regular/index.vue
@@ -255,8 +255,12 @@
}
regex = regex.slice(0, -1);
regexno = regexno.slice(0, -1);
+ if (regexno) {
+ hostregexno = "^(?!.*(?:" + `${regexno}` + ")).*$";
+ } else {
+ hostregexno = "";
+ }
hostregex = "(?=.*(?:" + `${regex}` + ")).*$";
- hostregexno = "^(?!.(?:" + `${regexno}` + ")).*$";
this.TargetoptionList[index].targetregex = hostregex;
this.TargetoptionList[index].targetregex2 = hostregexno;
console.log(hostregex, "纭畾瀛楀尮閰�");
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index da33a19..c597bae 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -930,8 +930,8 @@
<el-table-column
label="鎮ｈ�呮潵婧�"
align="center"
- key="source"
- prop="source"
+ key="sourcefrom"
+ prop="sourcefrom"
/>
<el-table-column
label="鎵嬫満鍙风爜"
@@ -1088,7 +1088,7 @@
created() {
this.Addsubtask();
this.Getsubtask();
-
+
},
methods: {
diff --git a/src/views/followvisit/tasklist/index.vue b/src/views/followvisit/tasklist/index.vue
index e8de0b2..71c8e71 100644
--- a/src/views/followvisit/tasklist/index.vue
+++ b/src/views/followvisit/tasklist/index.vue
@@ -105,7 +105,7 @@
size="medium"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:user:edit']"
+
>淇敼</el-button
>
</el-col>
@@ -149,54 +149,39 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
- <el-table-column label="搴忓彿" fixed align="center" key="id" prop="id" />
+ <el-table-column label="搴忓彿" fixed align="center" key="taskid" prop="taskid" />
<el-table-column
label="浠诲姟鍚嶇О"
fixed
align="center"
sortable
- key="name"
- prop="name"
+ key="taskName"
+ prop="taskName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="浠诲姟鎻忚堪"
align="center"
- key="describe"
- prop="describe"
+ key="taskDesc"
+ prop="taskDesc"
/>
<el-table-column
label="寰呮墽琛�/鎬讳换鍔�"
align="center"
key="nickName"
prop="nickName"
- />
-
- <!-- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- key="create_by"
- prop="create_by"
- width="120"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="瀹℃牳鏃堕棿"
- sortable
- align="center"
- prop="create_time"
- width="160"
>
+
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.create_time) }}</span>
+ <span>{{ scope.row.wfs}}/{{ scope.row.yfs }}</span>
</template>
- </el-table-column> -->
+ </el-table-column>
<el-table-column
label="鍒涘缓浜�"
align="center"
- key="create_by"
- prop="create_by"
+ key="createBy"
+ prop="createBy"
width="120"
:show-overflow-tooltip="true"
/>
@@ -204,11 +189,11 @@
label="鍒涘缓鏃堕棿"
sortable
align="center"
- prop="create_time"
+ prop="createTime"
width="160"
>
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.create_time) }}</span>
+ <span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
@@ -232,9 +217,18 @@
size="medium"
type="text"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:user:edit']"
+
><span class="button-zx"
- ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span
+ ><i class="el-icon-s-promotion"></i>浠诲姟鍙戣捣</span
+ ></el-button
+ >
+ <el-button
+ size="medium"
+ type="text"
+ @click="handleUpdate(scope.row)"
+
+ ><span class="button-zx"
+ ><i class="el-icon-s-promotion"></i>渚濈収鏂板</span
></el-button
>
</template>
@@ -284,7 +278,7 @@
<el-row :gutter="20">
<el-col :span="12"
><el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="form.name"></el-input> </el-form-item
+ <el-input v-model="form.taskName"></el-input> </el-form-item
></el-col>
</el-row>
<el-row :gutter="20">
@@ -717,7 +711,7 @@
handleUpdate(row) {
this.$router.push({
path: "/followvisit/particty",
- query: { type: row.type, id: row.taskid },
+ query: { type: row.hospType, id: row.taskid },
});
},
// 鍒犻櫎浠诲姟
diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue
index 7e7e61a..d49e57d 100644
--- a/src/views/knowledge/questionnaire/compilequer/index.vue
+++ b/src/views/knowledge/questionnaire/compilequer/index.vue
@@ -541,9 +541,9 @@
:inline="true"
label-width="98px"
>
- <el-form-item label="鏍囬" prop="userName">
+ <el-form-item label="闂鏍囬" prop="topic">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.topic"
placeholder="璇疯緭鍏�"
clearable
style="width: 200px"
diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue
index 42620a3..d191f38 100644
--- a/src/views/patient/propaganda/particty.vue
+++ b/src/views/patient/propaganda/particty.vue
@@ -7,7 +7,7 @@
<el-step
icon="el-icon-edit"
title="鍩虹淇℃伅"
- description="閫夋嫨瀹ｆ暀妯＄増銆佸舰寮忕瓑鍩虹淇℃伅"
+ description="閫夋嫨妯＄増銆佸舰寮忕瓑鍩虹淇℃伅"
></el-step>
<el-step
icon="el-icon-user"
@@ -22,11 +22,7 @@
<div class="leftvlue" style="margin: 0 20px">
<!-- 鍩烘湰淇℃伅 -->
<div v-if="Editprogress == 1">
- <el-alert
- title="閫夋嫨瀹ｆ暀妯＄増銆佸舰寮忕瓑鍩虹淇℃伅"
- type="success"
- effect="dark"
- >
+ <el-alert title="閫夋嫨妯＄増銆佸舰寮忕瓑鍩虹淇℃伅" type="success" effect="dark">
</el-alert>
<div class="leftvlue-jbxx">
<!-- 鍩虹淇℃伅 -->
@@ -576,20 +572,7 @@
<el-form-item label="鎮ｈ�呭悕绉帮細">
<el-input v-model="patientqueryParams.name"></el-input>
</el-form-item>
- <!-- <el-form-item label="鎮ｈ�呮潵婧�" prop="status">
- <el-select
- v-model="patientqueryParams.topic"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in topicoptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item> -->
+
<el-form-item label="灏辫瘖绉戝" prop="status">
<el-select
v-model="patientqueryParams.topic"
@@ -1114,6 +1097,19 @@
});
this.form.patTaskRelevances.push(...this.SelectPatientslist);
this.dialogVisiblepatient = false;
+ this.assignedVariable()
+ },
+ // 鍙橀噺澶勭悊璧嬪�兼湇鍔�
+ assignedVariable() {
+ // 鑾峰彇鎮ｈ�呭垪琛ㄤ俊鎭惊鐜�
+ console.log(this.variableList,'this.variableList');
+ this.form.patTaskRelevances.forEach((item) => {
+ this.variableList.forEach((item1) => {
+
+ })
+ })
+ // 鍙栨暟鎹～鍏呭彉閲忔暟缁�
+ // 鏁扮粍杞璞″瓨鍏�
},
// 鍙橀噺---------------
diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue
index 0b3eb02..54a3438 100644
--- a/src/views/repositoryai/intention/index.vue
+++ b/src/views/repositoryai/intention/index.vue
@@ -517,7 +517,7 @@
v-model="indexform.reply"
maxlength="50"
show-word-limit
- >
+ >
</el-input
></el-form-item>
</div>
@@ -535,14 +535,16 @@
<el-col :span="12">
<el-form-item label="娴嬭瘯杈撳叆" prop="nickName">
<el-input
- v-model="testvalue"
+ v-model="indexform.content"
placeholder="璇疯緭鍏ユ祴璇曞唴瀹�"
maxlength="40"
/>
</el-form-item>
</el-col>
<el-col :span="4">
- <el-button type="success">寮�濮嬫祴璇�</el-button>
+ <el-button type="success" @click="testtagerlist"
+ >寮�濮嬫祴璇�</el-button
+ >
</el-col>
</el-row>
</el-form>
@@ -652,6 +654,7 @@
gettargetInfo,
particulartarget,
gettargetInfoedit,
+ testtagerlist,
addtarget,
deletetarget,
getillnesslist,
@@ -706,9 +709,7 @@
}, //绫诲埆琛ㄥ崟
// 琛ㄦ牸鏁版嵁
targetList: null,
- testuserList: [
-
- ],
+ testuserList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -1158,18 +1159,20 @@
console.log(row);
this.title = "鎸囨爣璇︽儏";
this.indexform = row;
- if(!row.targetoptionList[0]){
- row.targetoptionList=[{
- targettype: "1",
- targetvalue: "",
- targetregex: "",
- targetregex2: "",
- isoperation: 1,
- dynamiccruxs: [],
- nodynamiccruxs: [],
- dynamiccruxsJson: "",
- nodynamiccruxsJson: "",
- },]
+ if (!row.targetoptionList[0]) {
+ row.targetoptionList = [
+ {
+ targettype: "1",
+ targetvalue: "",
+ targetregex: "",
+ targetregex2: "",
+ isoperation: 1,
+ dynamiccruxs: [],
+ nodynamiccruxs: [],
+ dynamiccruxsJson: "",
+ nodynamiccruxsJson: "",
+ },
+ ];
}
this.dynamicTags = row.baseTagList.map(this.processElement);
this.testuserList = row.targetoptionList;
@@ -1224,6 +1227,21 @@
}
});
},
+ // 娴嬭瘯琛ㄥ崟
+ testtagerlist() {
+ if (this.indexform.content) {
+ let data = this.indexform;
+ data.targetoptionList = this.testuserList.concat(this.targetoptionList);
+ testtagerlist(data).then((res) => {
+ this.$modal.msgSuccess("娴嬭瘯鎴愬姛");
+ this.testgovalue = res.msg;
+ this.getList();
+ });
+ } else {
+ this.$modal.msgError("璇峰～鍐欐祴璇曞唴瀹�");
+ return;
+ }
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const userIds = row.id || this.ids;
diff --git a/src/views/repositoryai/outsideChain/publicity.vue b/src/views/repositoryai/outsideChain/publicity.vue
new file mode 100644
index 0000000..bc97fd6
--- /dev/null
+++ b/src/views/repositoryai/outsideChain/publicity.vue
@@ -0,0 +1,35 @@
+<template>
+ <div>
+ <div>
+ <!-- 鏍囬鍙婃偅鑰呬俊鎭� -->
+ <div>瀹ｆ暀澶栭摼</div>
+ <!-- 鏂囨湰灞曠ず -->
+ <div></div>
+ <!-- 鍥剧墖鍙婅棰戝睍绀� -->
+ <div></div>
+ </div>
+
+ </div>
+</template>
+
+<script>
+export default {
+ data () {
+ return {
+
+ }
+ },
+
+ created () {
+
+ },
+
+ methods: {
+
+ }
+}
+</script>
+
+<style lang='scss' scoped>
+
+</style>
diff --git a/src/views/repositoryai/outsideChain/questionnaire.vue b/src/views/repositoryai/outsideChain/questionnaire.vue
new file mode 100644
index 0000000..8cd080a
--- /dev/null
+++ b/src/views/repositoryai/outsideChain/questionnaire.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/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue
index 8e0978c..f239964 100644
--- a/src/views/repositoryai/verbaltrick/particulars/index.vue
+++ b/src/views/repositoryai/verbaltrick/particulars/index.vue
@@ -364,7 +364,7 @@
id="noClearlyText"
:rows="2"
placeholder="璇疯緭鍏ュ唴瀹�"
- @focus="handleInput('noClearlyText')"
+ @focus="handleInput('noClearlyText')"
v-model.sync="indexform.noClearlyText"
show-word-limit
/>
@@ -482,8 +482,8 @@
<script>
import { listtag } from "@/api/system/label";
import {
- getverbaltricklist,
- verbaltrickinfo,
+ gettagerlist,
+ testtagerlist,
delverbaltrickinfo,
compileverbaltrick,
getverbaltrick,
--
Gitblit v1.9.3