From 6b6cc07fb81f05153fc07995e0a5be5596b5ca4f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 29 七月 2024 09:36:45 +0800
Subject: [PATCH] 测试完成
---
src/views/repositoryai/verbaltrick/index.vue | 42 +----
/dev/null | 0
vue.config.js | 4
src/views/repositoryai/templateku/configurat/index.vue | 8 +
src/views/repositoryai/verbaltrick/particulars/index.vue | 282 ++++++++++++++++++++++++++++------------
src/components/Regular/index.vue | 2
src/views/knowledge/questionbank/particulars/index.vue | 30 ++-
src/views/knowledge/questionbank/index.vue | 35 ++--
8 files changed, 255 insertions(+), 148 deletions(-)
diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index cffa2f1..0000000
--- a/dist.zip
+++ /dev/null
Binary files differ
diff --git a/src/components/Regular/index.vue b/src/components/Regular/index.vue
index 4aa1773..e1553ba 100644
--- a/src/components/Regular/index.vue
+++ b/src/components/Regular/index.vue
@@ -156,7 +156,7 @@
class="upload-demo"
:action="uploadImgUrl"
:headers="headers"
- :accept="'image/*,video/*'"
+ accept=".jpg,.png,image/*"
:on-success="handleChange.bind(this, item)"
>
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
diff --git a/src/views/knowledge/questionbank/index.vue b/src/views/knowledge/questionbank/index.vue
index 4bd5e99..132ee1e 100644
--- a/src/views/knowledge/questionbank/index.vue
+++ b/src/views/knowledge/questionbank/index.vue
@@ -68,28 +68,17 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="鍙敤闄㈠尯" prop="status">
- <el-select v-model="queryParams.courtyard" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in languagelist"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="闂涓婚" prop="userName">
+ <el-form-item label="闂鏍囬" prop="userName">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.scriptTopic"
placeholder="璇疯緭鍏�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鏂囧瓧" prop="status">
- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+ <el-form-item label="璇█" prop="status">
+ <el-select v-model="queryParams.language" placeholder="璇烽�夋嫨">
<el-option
v-for="item in languagelist"
:key="item.value"
@@ -98,6 +87,15 @@
>
</el-option>
</el-select>
+ </el-form-item>
+ <el-form-item label="鍏宠仈鎸囨爣" prop="targetname">
+ <el-input
+ v-model="queryParams.targetname"
+ placeholder="璇疯緭鍏�"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鏄惁鍙敤" prop="isavailable">
<el-select
@@ -472,7 +470,7 @@
topicVisible: false, //棰勮寮规
deletefenl: "楂樿鍘�", //鍒犻櫎椤�
classifyform: {
- categoryname: "",
+ name: "",
}, //绫诲埆琛ㄥ崟
// 琛ㄦ牸鏁版嵁
userList: [],
@@ -658,10 +656,11 @@
(obj) => obj.id == this.classifyform.pid
);
calssvalue = this.deptOptions[index];
- calssvalue.svyLibTopicCategoryList.push(this.classifyform);
+ console.log(calssvalue,'calssvalue');
+ calssvalue.svyLibScriptCategoryList.push(this.classifyform);
} else if (this.radio == "涓诲垎绫�" && this.classifyform.name) {
this.classifyform.pid = null;
- this.classifyform.svyLibTopicCategoryList = [];
+ this.classifyform.svyLibScriptCategoryList = [];
} else {
return this.$modal.msgError("璇峰～鍐欏畬鏁翠俊鎭�");
}
diff --git a/src/views/knowledge/questionbank/particulars/index.vue b/src/views/knowledge/questionbank/particulars/index.vue
index a5cab12..ca60cd7 100644
--- a/src/views/knowledge/questionbank/particulars/index.vue
+++ b/src/views/knowledge/questionbank/particulars/index.vue
@@ -91,7 +91,7 @@
</el-select> </el-form-item
></el-col>
<el-col :span="8"
- ><el-form-item label="璇█(缂�)">
+ ><el-form-item label="璇█">
<el-select
v-model="topicobj.language"
size="medium"
@@ -149,11 +149,9 @@
<el-col :span="8"
><el-form-item label="閫傜敤鏂瑰紡">
<el-select
- v-model="suitwaylist"
- size="medium"
- filterable
- multiple
- placeholder="璇烽�夋嫨鍒嗙被"
+ v-model="topicobj.suitway"
+ disabled
+ placeholder="璇烽�夋嫨"
>
<el-option
class="topicobjaa"
@@ -190,11 +188,15 @@
class="upload-demo"
:action="uploadImgUrl"
:headers="headers"
- :accept="'image/*,video/*'"
+ accept=".jpg,.png,image/*"
:on-success="handleChangetg"
>
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">
+ 鍙兘涓婁紶jpg/png绫诲瀷鏂囦欢
+ </div>
</el-upload>
+
<div style="margin: 20px">
<el-image
style="width: 100px; height: 100px"
@@ -387,7 +389,7 @@
class="upload-demo"
:action="uploadImgUrl"
:headers="headers"
- :accept="'image/*,video/*'"
+ accept=".jpg,.png,image/*"
:on-success="handleChange.bind(this, item)"
>
<el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
@@ -515,6 +517,7 @@
topicobj: {
svyLibScriptOptions: [],
svyLibScriptTagList: [],
+ suitway: "1",
},
headers: {
Authorization: "Bearer " + getToken(),
@@ -629,7 +632,6 @@
this.dynamicTags = this.topicobj.svyLibScriptTagList.map(
this.processElement
);
- this.suitwaylist = this.topicobj.suitway.split(",");
this.variablelist = JSON.parse(this.topicobj.otherdata)
? JSON.parse(this.topicobj.otherdata)
: this.variablelist;
@@ -663,10 +665,10 @@
}
);
this.topicobj.targetoptions = this.topicobj.svyLibScriptOptions
+ .filter((item) => item.isoperation != 3)
.map((item) => item.optioncontent)
.join(", ");
this.topicobj.otherdata = JSON.stringify(this.variablelist);
- this.topicobj.suitway = this.suitwaylist.join(",");
if (this.id) {
this.topicobj.isoperation = 2;
compileissue(this.topicobj).then((res) => {
@@ -915,7 +917,13 @@
// this.illnessVisible = false;
// this.$modal.msgSuccess("缂栬緫鎴愬姛");
// },
- resetQuery() {},
+ resetQuery() {
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ };
+ this.gettargetInfo();
+ },
// 渚挎嵎鏍囩
tsgnameto(row) {
let inputValueArr = "";
diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue
index b5664fd..52f5ed0 100644
--- a/src/views/repositoryai/templateku/configurat/index.vue
+++ b/src/views/repositoryai/templateku/configurat/index.vue
@@ -817,6 +817,14 @@
width="200"
:show-overflow-tooltip="true"
/>
+ <el-table-column
+ label="閫夐」鍐呭"
+ align="center"
+ key="targetoptions"
+ prop="targetoptions"
+ width="200"
+ :show-overflow-tooltip="true"
+ />
<el-table-column
label="鎿嶄綔"
diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue
index bf55daf..0963c32 100644
--- a/src/views/repositoryai/verbaltrick/index.vue
+++ b/src/views/repositoryai/verbaltrick/index.vue
@@ -68,48 +68,27 @@
v-show="showSearch"
label-width="98px"
>
- <el-form-item label="鍙敤闄㈠尯" prop="status">
- <el-select v-model="queryParams.courtyard" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in languagelist"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="闂鏍囬" prop="userName">
+ <el-form-item label="闂鏍囬" prop="scriptTopic">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.scriptTopic"
placeholder="璇疯緭鍏�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍏宠仈鎸囨爣" prop="userName">
+ <el-form-item label="鍏宠仈鎸囨爣" prop="targetname">
<el-input
- v-model="queryParams.userName"
+ v-model="queryParams.targetname"
placeholder="璇疯緭鍏�"
clearable
style="width: 200px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="閫傜敤鏂瑰紡" prop="status">
- <el-select v-model="queryParams.suitway" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in mode"
- :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="queryParams.status" placeholder="璇烽�夋嫨">
+ <el-select v-model="queryParams.language" placeholder="璇烽�夋嫨">
<el-option
v-for="item in languagelist"
:key="item.value"
@@ -119,8 +98,11 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鏄惁鍙敤" prop="status">
- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨">
+ <el-form-item label="鏄惁鍙敤" prop="isavailable">
+ <el-select
+ v-model="queryParams.isavailable"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in qyoptions"
:key="item.value"
@@ -189,7 +171,7 @@
prop="id"
/>
<el-table-column
- label="闂涓婚"
+ label="闂鏍囬"
fixed
align="center"
key="scriptTopic"
diff --git a/src/views/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue
index 3c89c07..07ed606 100644
--- a/src/views/repositoryai/verbaltrick/particulars/index.vue
+++ b/src/views/repositoryai/verbaltrick/particulars/index.vue
@@ -25,7 +25,14 @@
<div class="leftvlue">
<!-- 鍩烘湰淇℃伅 -->
<div v-if="Editprogress == 1">
- <div class="leftvlue-jbxx">鍩烘湰淇℃伅</div>
+ <div class="leftvlue-jbxx">
+ 鍩烘湰淇℃伅
+ <span style="margin-left: 30px"
+ ><el-button type="success" round @click="gettargetInfo"
+ >+閫夋嫨鎸囨爣</el-button
+ ></span
+ >
+ </div>
<el-divider></el-divider>
<el-form
ref="form"
@@ -218,8 +225,8 @@
<el-col :span="6">
<el-form-item label="閫傜敤鏂瑰紡" prop="status">
<el-select
+ disabled
v-model="indexform.suitway"
- multiple
placeholder="璇烽�夋嫨"
>
<el-option
@@ -227,28 +234,6 @@
:key="item.value"
:label="item.label"
:value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鍏宠仈鎸囨爣" prop="region">
- <el-select
- v-model="indexform.targetid"
- filterable
- remote
- reserve-keyword
- placeholder="璇疯緭鍏ュ叧閿瘝"
- :remote-method="remoteMethod"
- @change="targetchange"
- :loading="loading"
- >
- <el-option
- v-for="item in targetlist"
- :key="item.id"
- :label="item.targetname"
- :value="item.id"
>
</el-option>
</el-select>
@@ -405,7 +390,14 @@
</div>
<!-- 鎸囨爣璁剧疆 -->
<div v-if="Editprogress == 2">
- <div class="leftvlue-jbxx">鎸囨爣棰樼洰璁剧疆</div>
+ <div class="leftvlue-jbxx">
+ 鎸囨爣棰樼洰璁剧疆
+ <span style="margin-left: 30px"
+ ><el-button type="success" round @click="gettargetInfo"
+ >+閫夋嫨鎸囨爣</el-button
+ ></span
+ >
+ </div>
<el-divider></el-divider>
<el-form
ref="form"
@@ -441,6 +433,15 @@
<el-radio :label="1">閫夐」</el-radio>
<el-radio :label="2">鏂囨湰</el-radio>
<el-radio :label="3">鏁板��</el-radio>
+ </el-radio-group>
+ </el-form-item>
+
+ <el-form-item label="棰樼洰绫诲瀷">
+ <el-radio-group disabled v-model="indexform.scriptType">
+ <el-radio :label="1">鍗曢��</el-radio>
+ <el-radio :label="2">澶氶��</el-radio>
+ <el-radio :label="3">濉┖</el-radio>
+ <el-radio :label="4">闂瓟</el-radio>
</el-radio-group>
</el-form-item>
</el-col></el-row
@@ -496,6 +497,86 @@
<el-button @click="Saveproblem()">淇濆瓨鏁版嵁</el-button>
</div>
</div>
+ <el-drawer
+ title="閫夋嫨鎸囨爣"
+ :visible.sync="drawer"
+ custom-class="demo-drawer"
+ size="50%"
+ >
+ <div class="preview-left">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ label-width="98px"
+ >
+ <el-form-item label="鏍囬" prop="userName">
+ <el-input
+ v-model="queryParams.targetname"
+ placeholder="璇疯緭鍏�"
+ clearable
+ style="width: 200px"
+ @keyup.enter.native="gettargetInfo"
+ />
+ </el-form-item>
+
+ <el-form-item>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="medium"
+ @click="gettargetInfo"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="medium" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
+ </el-form-item>
+ </el-form>
+ <el-table v-loading="loading" :data="targetList">
+ <el-table-column
+ label="鏍囬"
+ align="center"
+ key="targetname"
+ prop="targetname"
+ width="100"
+ />
+ <el-table-column
+ label="闂鍐呭"
+ align="center"
+ key="targetdesc"
+ prop="targetdesc"
+ width="200"
+ :show-overflow-tooltip="true"
+ />
+
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="medium"
+ type="text"
+ @click="selectlabel(scope.row)"
+ ><span class="button-textxg"
+ ><i class="el-icon-circle-plus-outline"></i>閫夋嫨</span
+ ></el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="gettargetInfo"
+ />
+ </div>
+ </el-drawer>
</div>
</template>
@@ -526,7 +607,9 @@
radioas: "", //濉┖棰樼瓟妗�
dynamicTags: [],
dellist: [],
+ targetList: [],
inputVisible: false,
+ drawer: false,
inputValue: "",
testvalue: "",
testgovalue: "",
@@ -534,6 +617,7 @@
indexform: {
ivrLibaScriptTargetoptionList: [],
ivrLibaScriptTagList: [],
+ suitway: "2",
},
mode: [],
questionclass: [],
@@ -541,13 +625,6 @@
courtyardlist: [],
// 鎬绘潯鏁�
total: 1,
-
- targetlist: [
- {
- value: "閫夐」1",
- label: "鍥炬枃",
- },
- ],
rules: {},
rulesa: {},
optionstag: [],
@@ -572,11 +649,6 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- userName: undefined,
- phonenumber: undefined,
- status: undefined,
- deptId: undefined,
- IDnumber: undefined,
},
variabledeawer: false,
};
@@ -599,8 +671,7 @@
if (id) {
getverbaltrick({ id: id }).then((res) => {
this.indexform = res.data;
- if (this.indexform.suitway)
- this.indexform.suitway = this.indexform.suitway.split(",");
+
this.indexform.assortid = parseInt(this.indexform.assortid);
this.variablelist = JSON.parse(this.indexform.otherdata).length
? JSON.parse(this.indexform.otherdata)
@@ -608,18 +679,8 @@
this.dynamicTags = this.indexform.ivrLibaScriptTagList.map(
this.processElement
);
-
- // this.targetlist = [
- // {
- // id: this.indexform.targetid,
- // targetname: this.indexform.targetname,
- // },
- // ];
});
}
- gettargetInfolist({ pageSize: 100, pageNum: 1 }).then((res) => {
- this.targetlist = res.rows;
- });
// 鏍�
getbaltrickclassify({}).then((res) => {
this.questionclass = res.rows;
@@ -630,9 +691,6 @@
// 淇濆瓨璇︾粏淇℃伅
Saveproblem() {
this.indexform.otherdata = JSON.stringify(this.variablelist);
- if (this.indexform.suitway) {
- this.indexform.suitway = this.indexform.suitway.join(",");
- }
if (this.indexform.id) {
this.indexform.ivrLibaScriptTargetoptionList =
@@ -647,6 +705,11 @@
console.log(this.dellist);
this.indexform.ivrLibaScriptTargetoptionList =
this.indexform.ivrLibaScriptTargetoptionList.concat(this.dellist);
+ this.indexform.targetoptions =
+ this.indexform.ivrLibaScriptTargetoptionList
+ .filter((item) => item.isope != 3) // 杩囨护鎺� isope 涓� 3 鐨勯」
+ .map((item) => item.targetvalue)
+ .join(", ");
compileverbaltrick(this.indexform).then((res) => {
if (res.code == 200) {
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -674,43 +737,74 @@
});
}
},
- remoteMethod(query) {
- if (query !== "") {
- this.loading = true;
- setTimeout(() => {
- this.loading = false;
- gettargetInfolist({ targetname: query }).then((res) => {
- this.targetlist = res.rows;
+
+ // targetchange(res) {
+ // console.log(res);
+ // gettargetInfo({ id: res }).then((res) => {
+ // console.log(res.rows[0]);
+ // this.$modal
+ // .confirm('鏄惁娣诲姞"' + res.rows[0].targetname + '"鎸囨爣鐨勯�夐」锛�')
+ // .then(() => {
+ // this.indexform.valueType = res.rows[0].valueType;
+ // this.indexform.scriptType = res.rows[0].scriptType;
+ // this.indexform.scriptTopic = res.rows[0].targetname;
+ // this.indexform.targetname = res.rows[0].targetname;
+ // this.indexform.targetid = res.rows[0].id;
+ // this.indexform.targetdesc = res.rows[0].targetdesc;
+ // this.indexform.isAvailable = "0";
+ // this.indexform.language = "鏅�氳瘽";
+ // this.indexform.isenable = res.rows[0].isenable;
+ // this.$forceUpdate();
+ // res.rows[0].targetoptionList.forEach((item) => {
+ // item.isoperation = 1;
+ // this.indexform.ivrLibaScriptTargetoptionList.push(item);
+ // });
+ // })
+ // .catch(() => {
+ // this.$modal.msgSuccess("宸插彇娑�");
+ // });
+ // });
+ // },
+ // 閫夋嫨鎸囨爣
+ selectlabel(row) {
+ this.$modal
+ .confirm(
+ '鏄惁閫夋嫨鏍囬涓�"' + row.targetname + '"鐨勬寚鏍囧苟鏇挎崲濉厖闂淇℃伅锛�'
+ )
+ .then(() => {
+ console.log(row);
+ this.indexform.valueType = row.valueType;
+ this.indexform.scriptType = row.scriptType;
+ this.indexform.scriptTopic = row.targetname;
+ this.indexform.targetname = row.targetname;
+ this.indexform.targetid = row.id;
+ this.indexform.targetdesc = row.targetdesc;
+ this.indexform.isAvailable = "0";
+ this.indexform.language = "鏅�氳瘽";
+ this.indexform.isenable = row.isenable;
+ const labellist = row.targetoptionList;
+ labellist.forEach((item) => {
+ item.isoperation = 1;
+ this.indexform.ivrLibaScriptTargetoptionList.push(item);
});
- }, 200);
- } else {
- this.targetlist = [];
- }
+ this.drawer = false;
+ })
+ .catch(() => {});
},
- targetchange(res) {
- console.log(res);
- gettargetInfo({ id: res }).then((res) => {
- console.log(res.rows[0]);
- this.$modal
- .confirm('鏄惁娣诲姞"' + res.rows[0].targetname + '"鎸囨爣鐨勯�夐」锛�')
- .then(() => {
- this.indexform.valueType = res.rows[0].valueType;
- this.indexform.scriptTopic = res.rows[0].targetname;
- this.indexform.targetname = res.rows[0].targetname;
- this.indexform.targetdesc = res.rows[0].targetdesc;
- this.indexform.isAvailable = "0";
- this.indexform.language = "鏅�氳瘽";
- this.indexform.isenable = res.rows[0].isenable;
- this.$forceUpdate();
- res.rows[0].targetoptionList.forEach((item) => {
- item.isoperation = 1;
- this.indexform.ivrLibaScriptTargetoptionList.push(item);
- });
- })
- .catch(() => {
- this.$modal.msgSuccess("宸插彇娑�");
- });
+ gettargetInfo() {
+ gettargetInfo(this.queryParams).then((res) => {
+ console.log(res);
+ this.targetList = res.rows;
+ this.total = res.total;
+ this.drawer = true;
});
+ },
+ resetQuery() {
+ this.queryParams = {
+ pageNum: 1,
+ pageSize: 10,
+ };
+ this.gettargetInfo();
},
// 涓嬩竴姝�
@@ -1064,6 +1158,22 @@
.tsgnamebj:hover {
background: #27c449;
}
+.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);
+ .scriptTopic-dev {
+ margin-bottom: 25px;
+ font-size: 20px !important;
+ .dev-text {
+ margin-bottom: 10px;
+ }
+ }
+}
::v-deep .addtopic-input {
input {
diff --git a/vue.config.js b/vue.config.js
index 8e67b3a..2e93784 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `http://192.168.2.8:8089`,
- 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