From 59272d99113d2d11b1873d60653e52b49f14d757 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期五, 26 一月 2024 11:53:19 +0800 Subject: [PATCH] 指标完成 --- src/assets/images/login-background1.jpg | 0 src/views/repositoryai/templateku/configurat/index.vue | 47 ++- src/views/knowledge/questionnaire/compilequer/index.vue | 57 ++-- src/views/patient/propaganda/index.vue | 80 +++---- src/views/followvisit/satisfaction/particulars/index.vue | 2 src/views/repositoryai/verbaltrick/particulars/index.vue | 70 +++--- src/views/knowledge/questionbank/particulars/index.vue | 2 src/views/knowledge/education/compilequer/index.vue | 119 +++++++--- src/components/SFtable/index.vue | 22 + src/views/repositoryai/verbaltrick/index.vue | 28 ++ src/views/followvisit/tasklist/FollowupDetails/index.vue | 2 src/views/knowledge/questionbank/index.vue | 20 + src/views/knowledge/education/index.vue | 20 + src/views/login.vue | 13 + src/views/repositoryai/general/index.vue | 20 + src/components/Regular/index.vue | 7 package.json | 2 src/views/patient/patient/profile/index.vue | 2 src/assets/images/login-background2.jpg | 0 src/views/knowledge/questionnaire/index.vue | 20 + src/views/repositoryai/intention/index.vue | 39 ++- src/App.vue | 2 src/assets/images/login-background.jpg | 0 src/views/patient/propaganda/particty.vue | 64 +++-- src/views/repositoryai/templateku/index.vue | 19 + 25 files changed, 444 insertions(+), 213 deletions(-) diff --git a/package.json b/package.json index 484dda3..bd2056b 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "cos-js-sdk-v5": "^1.4.18", "dayjs": "^1.11.7", "echarts": "^5.4.2", - "element-ui": "2.15.12", + "element-ui": "^2.15.4", "file-saver": "^2.0.5", "fuse.js": "6.4.3", "highlight.js": "9.18.5", diff --git a/src/App.vue b/src/App.vue index 20ad216..798390b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -31,7 +31,7 @@ </script> <style scoped> #app { - overflow: scroll; + overflow-y: scroll; height: 100vh; background: #f8fafd; /* font-family: "Microsoft YaHei", Arial, Helvetica, sans-serif, "瀹嬩綋"; */ diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg index 8a89eb8..db41d52 100644 --- a/src/assets/images/login-background.jpg +++ b/src/assets/images/login-background.jpg Binary files differ diff --git a/src/assets/images/login-background1.jpg b/src/assets/images/login-background1.jpg new file mode 100644 index 0000000..8a89eb8 --- /dev/null +++ b/src/assets/images/login-background1.jpg Binary files differ diff --git a/src/assets/images/login-background2.jpg b/src/assets/images/login-background2.jpg new file mode 100644 index 0000000..0341185 --- /dev/null +++ b/src/assets/images/login-background2.jpg Binary files differ diff --git a/src/components/Regular/index.vue b/src/components/Regular/index.vue index 58e60ca..fb1f240 100644 --- a/src/components/Regular/index.vue +++ b/src/components/Regular/index.vue @@ -203,6 +203,7 @@ let regex = ""; let regexno = ""; let hostregex = ""; + let hostregexno = ""; for (let i = 0; i < this.dynamiccruxs.length; i++) { regex += `${this.dynamiccruxs[i]}|`; @@ -213,8 +214,10 @@ regex = regex.slice(0, -1); regexno = regexno.slice(0, -1); - hostregex = "^(?!." + `${regexno}` + ")(.(" + `${regex}` + ")+.*)$"; - console.log(hostregex); + hostregex = "(?=.*(?:" + `${regex}` + ")).*$"; + hostregexno = "(?=.*(?:" + `${regexno}` + ")).*$"; + console.log(hostregex, "纭畾瀛楀尮閰�"); + console.log(hostregexno, "鍚﹀畾瀛楀尮閰�"); }, // 鎺у埗鏂囦欢 handleChange(file, fileList) { diff --git a/src/components/SFtable/index.vue b/src/components/SFtable/index.vue index 18e3057..f8eea2b 100644 --- a/src/components/SFtable/index.vue +++ b/src/components/SFtable/index.vue @@ -18,7 +18,13 @@ width="50" align="center" /> - <el-table-column label="搴忓彿" align="center" key="id" prop="id" /> + <el-table-column + v-if="serialnumber" + label="搴忓彿" + align="center" + key="id" + prop="id" + /> <el-table-column v-for="(item, index) in tableLabel" :key="index" @@ -52,7 +58,7 @@ v-if="controlxz" size="medium" type="text" - @click.native="$emit('handleUpdate', scope.row)" + @click.native="$emit('selectfn', scope.row, typeinfo)" ><span class="button-zx" ><i class="el-icon-s-promotion"></i>閫夋嫨</span ></el-button @@ -61,7 +67,7 @@ v-if="controlsc" size="medium" type="text" - @click.native="$emit('details', scope.row)" + @click.native="$emit('details', scope.row, typeinfo)" ><span style="color: red" ><i class="el-icon-delete"></i>鍒犻櫎</span ></el-button @@ -73,6 +79,7 @@ <script> import dayjs from "dayjs"; +import store from "@/store"; export default { data() { return { @@ -109,6 +116,15 @@ type: Boolean, default: true, }, + serialnumber: { + type: Boolean, + default: true, + }, + // 1妯$増鍒楄〃 2閫変腑鎮h�� 3鎮h�呭垪琛� + typeinfo: { + type: Number, + default: 1, + }, }, created() { this.mode = store.getters.mode; diff --git a/src/views/followvisit/satisfaction/particulars/index.vue b/src/views/followvisit/satisfaction/particulars/index.vue index b2d846f..a64a754 100644 --- a/src/views/followvisit/satisfaction/particulars/index.vue +++ b/src/views/followvisit/satisfaction/particulars/index.vue @@ -726,7 +726,7 @@ // min-height: 12vh; margin: 20px; margin-bottom: 0; - padding: 30px; + padding: 20px; background: #edf1f7; border: 1px solid #dcdfe6; -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue index 30daf3e..da33a19 100644 --- a/src/views/followvisit/tasklist/FollowupDetails/index.vue +++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue @@ -1209,7 +1209,7 @@ // margin-top: 20px; margin: 20px; margin-bottom: 0; - padding: 30px; + padding: 20px; background: #edf1f7; border: 1px solid #dcdfe6; -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue index 40afd79..ad86eaf 100644 --- a/src/views/knowledge/education/compilequer/index.vue +++ b/src/views/knowledge/education/compilequer/index.vue @@ -2,12 +2,22 @@ <div class="Questionnairemanagement"> <!-- 宸︿晶鏍� --> <div class="sidecolumn"> - <div style="height: 200px"> - <el-steps direction="vertical" :active="Editprogress"> - <el-step title="鍩虹淇℃伅璁剧疆"></el-step> - <el-step title="瀹f暀鍐呭"></el-step> - </el-steps> - </div> + <el-steps finish-status="success" :active="Editprogress" simple> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 1" + >鍩虹淇℃伅璁剧疆</span + > + </template> + </el-step> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 2" + >瀹f暀鍐呭</span + > + </template> + </el-step> + </el-steps> </div> <!-- 鍙充晶鏁版嵁 --> <div class="leftvlue"> @@ -43,14 +53,26 @@ </el-option-group> </el-select> </el-form-item> + <el-row> + <el-col :span="12"> </el-col> + <el-col :span="12"> </el-col> + </el-row> <el-form-item label="瀹f暀鏍囬" prop="preachname"> <div style="width: 30%"> - <el-input v-model="ruleForm.preachname"></el-input> + <el-input + v-model="ruleForm.preachname" + placeholder="璇疯緭鍏ユ爣棰�" + ></el-input> </div> </el-form-item> <el-form-item label="瀹f暀鎻忚堪" prop="preachcontent"> - <div style="width: 30%"> - <el-input v-model="ruleForm.preachcontent"></el-input> + <div style="width: 60%"> + <el-input + type="textarea" + :rows="2" + v-model="ruleForm.preachcontent" + placeholder="璇疯緭鍏ユ弿杩�" + ></el-input> </div> </el-form-item> <el-form-item label="閫氱煡鍙橀噺" prop="name"> @@ -146,7 +168,10 @@ <el-row :gutter="20"> <el-col :span="6"> <el-form-item label="鐗堟湰鍙�" prop="name"> - <el-input v-model="ruleForm.version"></el-input> </el-form-item + <el-input + v-model="ruleForm.version" + placeholder="榛樿1.0.1" + ></el-input> </el-form-item ></el-col> <el-col :span="9"> <el-form-item label="鍙敤鐘舵��" prop="region"> @@ -186,7 +211,7 @@ </el-select> </el-form-item> <el-form-item label="閫傜敤鐤剧梾" prop="region"> - <div class="xinz-infs"> + <div class="xinz-inf"> <el-tag :key="item.icd10name" type="warning" @@ -230,6 +255,7 @@ <el-select v-model="ruleForm.campus" size="medium" + multiple filterable placeholder="璇烽�夋嫨鍒嗙被" > @@ -470,7 +496,12 @@ radioas: "", //濉┖棰樼瓟妗� // 鎬绘潯鏁� total: 1, - ruleForm: {}, + ruleForm: { + campus: [], + heLibraryTagList: [], + tempDetpRelevances: [], + version: "1.0.1", + }, rules: {}, rulesa: {}, mode: [], @@ -542,25 +573,37 @@ }, methods: { + processElement(element) { + return { ...element, isoperation: null }; + }, + // 鑾峰彇椤甸潰鏁版嵁 getList() { this.loading = true; this.id = this.$route.query.id; - getlibraryinfo({ id: this.id }).then((res) => { - this.ruleForm = res.data[0]; + if (this.id) { + getlibraryinfo({ id: this.id }).then((res) => { + this.ruleForm = res.data[0]; + this.ruleForm.campus = this.ruleForm.campus.split(","); + this.dynamicTags = res.data[0].heLibraryTagList.map( + this.processElement + ); - if (this.ruleForm.deptNames) { - this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames); - } - if (this.ruleForm.suitway) { - this.ruleForm.suitway = this.ruleForm.suitway.split(","); - } - this.variablelist = this.ruleForm.otherdata - ? JSON.parse(this.ruleForm.otherdata) - : this.variablelist; - }); + if (this.ruleForm.deptNames) { + this.tempDetpRelevanceslist = JSON.parse(this.ruleForm.deptNames); + } + if (this.ruleForm.suitway) { + this.ruleForm.suitway = this.ruleForm.suitway.split(","); + } + this.variablelist = this.ruleForm.otherdata + ? JSON.parse(this.ruleForm.otherdata) + : this.variablelist; + }); + } + // 瀹f暀鍒嗙被 getheLibraryAssort({}).then((res) => { this.sortlist = res.rows; }); + // 閮ㄩ棬 listDept(this.queryParams).then((response) => { this.deptList = this.handleTree(response.data, "deptId"); }); @@ -572,8 +615,7 @@ this.dynamicTags.forEach((item) => { tgs.push(item.tagname); }); - console.log(tgs.length, "tgs"); - + this.ruleForm.campus = this.ruleForm.campus.join(","); this.ruleForm.labelInfo = tgs.length != 0 ? tgs.join(", ") : ""; this.ruleForm.otherdata = JSON.stringify(this.variablelist); console.log(22); @@ -635,6 +677,7 @@ ); if (!condition) { listDept({ deptId: item }).then((res) => { + console.log("dept"); res.data[0].type = 2; this.ruleForm.tempDetpRelevances.push(res.data[0]); }); @@ -689,7 +732,11 @@ }); }, handleClosetag(tag) { - const lindex = this.dynamicTags.indexOf(tag); + console.log(tag); + const lindex = this.ruleForm.heLibraryTagList.findIndex( + (item) => item.tagname == tag.tagname + ); + console.log(lindex); this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1); this.ruleForm.heLibraryTagList[lindex].isoperation = 3; }, @@ -783,8 +830,8 @@ this.illnesslist.push(opeavalue); } }); - console.log(this.illnesslist); - this.inputVisible = false; + console.log(this.illnesslist, "鍔�"); + this.illnessVisible = false; this.inputValue = ""; }, confirmillness() { @@ -866,17 +913,17 @@ <style lang="scss" scoped> .Questionnairemanagement { - display: flex; + // display: flex; } .sidecolumn { - width: 300px; - min-height: 100vh; - text-align: center; + // width: 300px; + // min-height: 100vh; + // text-align: center; // display: flex; // margin-top: 20px; margin: 20px; margin-bottom: 0; - padding: 30px; + padding: 20px; background: #edf1f7; border: 1px solid #dcdfe6; -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12), @@ -885,9 +932,7 @@ .leftvlue { // display: flex; // flex: 1; - width: 80%; - margin-top: 20px; - // margin: 20px; + margin: 20px; padding: 30px; background: #ffff; border: 1px solid #dcdfe6; diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue index 1e984a6..fb79e5a 100644 --- a/src/views/knowledge/education/index.vue +++ b/src/views/knowledge/education/index.vue @@ -829,7 +829,7 @@ margin-top: 20px; margin: 20px; padding: 30px; - background: #edf1f7; + background: #fff; 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); @@ -944,6 +944,24 @@ font-size: 20px; cursor: pointer; } +::v-deep .el-tree { + position: relative; + cursor: default; + border-radius: 5px; + background: #eff8fe; + color: #606266; + border: 1px solid #bbe1fa; + // 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); +} +::v-deep + .el-tree--highlight-current + .el-tree-node.is-current + > .el-tree-node__content { + background-color: #7799fb; + color: #fff; +} ::v-deep .el-button--mini.is-circle { padding: 7px; margin: 0; diff --git a/src/views/knowledge/questionbank/index.vue b/src/views/knowledge/questionbank/index.vue index 437e672..33f8941 100644 --- a/src/views/knowledge/questionbank/index.vue +++ b/src/views/knowledge/questionbank/index.vue @@ -737,7 +737,7 @@ margin-top: 20px; margin: 20px; padding: 30px; - background: #edf1f7; + background: #fff; 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); @@ -868,6 +868,24 @@ font-size: 20px; cursor: pointer; } +::v-deep .el-tree { + position: relative; + cursor: default; + border-radius: 5px; + background: #eff8fe; + color: #606266; + border: 1px solid #bbe1fa; + // 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); +} +::v-deep + .el-tree--highlight-current + .el-tree-node.is-current + > .el-tree-node__content { + background-color: #7799fb; + color: #fff; +} ::v-deep .el-button--mini.is-circle { padding: 7px; margin: 0; diff --git a/src/views/knowledge/questionbank/particulars/index.vue b/src/views/knowledge/questionbank/particulars/index.vue index 63cc423..f7495b4 100644 --- a/src/views/knowledge/questionbank/particulars/index.vue +++ b/src/views/knowledge/questionbank/particulars/index.vue @@ -14,7 +14,7 @@ <div style="margin-left: 8%"> <el-form-item label="闂鍒嗙被"> <el-select - v-model="topicobj.assortid" + v-model="topicobj.categoryid" size="medium" filterable placeholder="璇烽�夋嫨鍒嗙被" diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue index 6a25a21..56940e3 100644 --- a/src/views/knowledge/questionnaire/compilequer/index.vue +++ b/src/views/knowledge/questionnaire/compilequer/index.vue @@ -2,14 +2,27 @@ <div class="Questionnairemanagement"> <!-- 宸︿晶鏍� --> <div class="sidecolumn"> - <div style="height: 400px"> - <el-steps direction="vertical" :active="Editprogress"> - <el-step title="鍩虹淇℃伅"></el-step> - <el-step title="闂嵎棰樼洰"></el-step> - <el-step - title="闂嵎棰勮" - description="鏌ョ湅闂嵎棰勮锛屽彲瀵煎嚭PDF" - ></el-step> + <div> + <el-steps finish-status="success" :active="Editprogress" simple> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 1" + >鍩虹淇℃伅</span + > + </template> + </el-step> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 2" + >闂嵎棰樼洰</span + > + </template> + </el-step> + <el-step description="鏌ョ湅闂嵎棰勮锛屽彲瀵煎嚭PDF"> + <span slot="title" style="cursor: pointer" @click="Editprogress = 3" + >闂嵎棰勮</span + > + </el-step> </el-steps> </div> </div> @@ -776,7 +789,7 @@ const result = this.tempDetpRelevanceslist.map( (subArr) => subArr[subArr.length - 1] ); - console.log(result); + console.log(result, "result"); // id鏁扮粍鏌ユ暟缁勫璞� result.forEach((item) => { const condition = this.ruleForm.tempDetpRelevances.some( @@ -795,6 +808,7 @@ this.ruleForm.tempDetpRelevances.forEach((item) => { const condition = result.some((obj) => obj === item.deptId); if (!condition) { + console.log(condition); const index = this.ruleForm.tempDetpRelevances.indexOf(item); this.ruleForm.tempDetpRelevances[index].delFlag = 1; } @@ -848,10 +862,8 @@ this.ruleForm.svyLibTopics.push(row); }, handleDelete(row) { - this.ruleForm.svyLibTopics.splice( - this.ruleForm.svyLibTopics.indexOf(row), - 1 - ); + let index = this.ruleForm.svyLibTopics.indexOf(row); + this.ruleForm.svyLibTopics[index].isoperation = 3; this.sortFn(); }, handleUpdate(row) { @@ -1036,28 +1048,23 @@ <style lang="scss" scoped> .Questionnairemanagement { - display: flex; + // display: flex; } .sidecolumn { - width: 300px; - min-height: 100vh; - text-align: center; - // display: flex; - // margin-top: 20px; margin: 20px; margin-bottom: 0; - padding: 30px; + padding: 20px; background: #edf1f7; 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); } .leftvlue { - // display: flex; - // flex: 1; - width: 80%; - margin-top: 20px; - // margin: 20px; + // // display: flex; + // // flex: 1; + // width: 80%; + // margin-top: 20px; + margin: 20px; padding: 30px; background: #ffff; border: 1px solid #dcdfe6; diff --git a/src/views/knowledge/questionnaire/index.vue b/src/views/knowledge/questionnaire/index.vue index b65e57a..68dbafc 100644 --- a/src/views/knowledge/questionnaire/index.vue +++ b/src/views/knowledge/questionnaire/index.vue @@ -813,7 +813,7 @@ margin-top: 20px; margin: 20px; padding: 30px; - background: #edf1f7; + background: #fff; 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); @@ -929,6 +929,24 @@ font-size: 20px; cursor: pointer; } +::v-deep .el-tree { + position: relative; + cursor: default; + border-radius: 5px; + background: #eff8fe; + color: #606266; + border: 1px solid #bbe1fa; + // 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); +} +::v-deep + .el-tree--highlight-current + .el-tree-node.is-current + > .el-tree-node__content { + background-color: #7799fb; + color: #fff; +} ::v-deep .el-button--mini.is-circle { padding: 7px; margin: 0; diff --git a/src/views/login.vue b/src/views/login.vue index e23ddcf..e9975b8 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -79,7 +79,7 @@ </el-form> <!-- 搴曢儴 --> <div class="el-login-footer"> - <span>Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span> + <span style="color: #568FBD; font-size: 25px;">Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span> </div> </div> </template> @@ -194,6 +194,17 @@ justify-content: center; align-items: center; height: 100%; + overflow:hidden !important; + background-position: center center; + + /* 鑳屾櫙鍥句笉骞抽摵 */ +background-repeat: no-repeat; +/* 褰撳唴瀹归珮搴﹀ぇ浜庡浘鐗囬珮搴︽椂锛岃儗鏅浘鍍忕殑浣嶇疆鐩稿浜巚iewport鍥哄畾 */ +background-attachment: fixed; +/* 璁╄儗鏅浘鍩轰簬瀹瑰櫒澶у皬浼哥缉 */ +background-size: cover; +/* 璁剧疆鑳屾櫙棰滆壊锛岃儗鏅浘鍔犺浇杩囩▼涓細鏄剧ず鑳屾櫙鑹� */ +background-color: #464646; background-image: url("../assets/images/login-background.jpg"); background-size: cover; } diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue index 46768ea..2f08635 100644 --- a/src/views/patient/patient/profile/index.vue +++ b/src/views/patient/patient/profile/index.vue @@ -794,7 +794,7 @@ }); }, processElement(element) { - return { ...element, isoperation: 0 }; + return { ...element, isoperation: null }; }, // 鑾峰彇鍩虹淇℃伅 getuserinfo() { diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue index 32bfa58..88b06e6 100644 --- a/src/views/patient/propaganda/index.vue +++ b/src/views/patient/propaganda/index.vue @@ -133,40 +133,30 @@ @selection-change="handleSelectionChange" > <el-table-column type="selection" width="50" align="center" /> + <el-table-column fixed label="搴忓彿" align="center" key="id" prop="id" /> <el-table-column - fixed - label="搴忓彿" + label="濮撳悕" + fixed align="center" - key="id" - prop="id" + key="name" + prop="name" /> -<el-table-column label="濮撳悕" fixed align="center" key="types" prop="types" /> <el-table-column label="鐥呭巻鍙�" align="center" sortable - key="userName" - prop="userName" + key="medicalRecordNo" + prop="medicalRecordNo" width="120" /> - - <el-table-column - label="骞撮緞" - align="center" - key="nickName" - prop="nickName" - /> - <el-table-column - label="搴婂彿" - align="center" - key="nickName" - prop="nickName" - /> + + <el-table-column label="骞撮緞" align="center" key="age" prop="age" /> + <el-table-column label="搴婂彿" align="center" key="badNo" prop="badNo" /> <el-table-column label="绉戝/鐥呭尯" align="center" - key="phonenumber" - prop="phonenumber" + key="dept" + prop="dept" width="120" > </el-table-column> @@ -174,39 +164,37 @@ <el-table-column label="鐤剧梾鍚嶇О" align="center" - key="topicnumber" - prop="topicnumber" + key="icdName" + prop="icdName" width="120" :show-overflow-tooltip="true" > - <template slot-scope="scope"> - <div>杞诲害楠ㄨ</div> - </template> </el-table-column> - + <el-table-column label="瀹f暀鍐呭" align="center" - key="topicnumberaa" - prop="topicnumberaa" + key="heTask" + prop="heTask" width="120" - /> - <el-table-column - label="瀹f暀鏉愭枡" - align="center" - key="topicnumberaa" - prop="topicnumberaa" - width="120" - /> + > + <template slot-scope="scope"> + <span>{{ scope.row.heTask.preachname }}</span> + </template> + </el-table-column> <el-table-column label="瀹f暀鏂瑰紡" align="center" key="topicnumberaa" prop="topicnumberaa" width="120" - /> + > + <template slot-scope="scope"> + <span>{{ scope.row.heTask.preachform }}</span> + </template> + </el-table-column> <el-table-column - label="瀹f暀浜哄憳" + label="鎿嶄綔浜哄憳(榛樿鐧婚檰浜哄彲閫�)" align="center" key="topicnumberaa" prop="topicnumberaa" @@ -214,7 +202,7 @@ /> <el-table-column - label="灏辫瘖鏃堕棿" + label="灏辫瘖鏃堕棿(缂�)" sortable align="center" prop="createTime" @@ -225,7 +213,7 @@ </template> </el-table-column> <el-table-column - label="瀹f暀鏃堕棿" + label="瀹f暀鏃堕棿锛堢己锛�" sortable align="center" prop="createTime" @@ -236,7 +224,7 @@ </template> </el-table-column> <el-table-column - label="鍥炲鏃堕棿" + label="鎺ユ敹鏃堕棿锛堢己锛�" sortable align="center" prop="createTime" @@ -246,8 +234,8 @@ <span>{{ parseTime(scope.row.createTime) }}</span> </template> </el-table-column> -<el-table-column - label="閫氱煡鐘舵��" + <el-table-column + label="閫氱煡鐘舵�侊紙缂猴級" fixed="right" align="center" key="topicnumber" @@ -260,7 +248,7 @@ </template> </el-table-column> <el-table-column - fixed="right" + fixed="right" label="浠诲姟璇︽儏" align="center" width="200" diff --git a/src/views/patient/propaganda/particty.vue b/src/views/patient/propaganda/particty.vue index d313974..0f18cf6 100644 --- a/src/views/patient/propaganda/particty.vue +++ b/src/views/patient/propaganda/particty.vue @@ -14,6 +14,10 @@ title="瀹f暀瀵硅薄" description="鍦ㄦ湰閮ㄩ�夋嫨瀹f暀鐥呬汉" ></el-step> + <el-step + icon="el-icon-user" + title="妯$増纭" + ></el-step> </el-steps> </div> </div> @@ -37,25 +41,39 @@ <el-form ref="form" :model="form" label-width="105px"> <el-form-item label="妯$増鍚嶇О锛�"> <el-input + :disabled="true" style="width: 220px" - v-model="form.bt" + v-model="form.preachname" placeholder="璇峰湪涓嬫柟閫夋嫨" /> </el-form-item> - <el-form-item label="鍙戦�佹椂闂达細" v-if="currenttype != 2"> + <el-form-item label="鍙戦�佽缃細" v-if="currenttype != 2"> + <el-radio-group v-model="radio"> + <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="鍙戦�佹椂闂寸偣锛�" + v-if="currenttype != 2 && radio == 2" + > <el-date-picker - v-model="form.name" - type="date" - placeholder="閫夋嫨鏃ユ湡" + v-model="form.sendTime" + type="datetime" + placeholder="閫夋嫨鏃ユ湡鏃堕棿" + default-time="13:00:00" > </el-date-picker> </el-form-item> - <el-form-item label="鍙戦�佹椂闂存锛�" v-if="currenttype != 2"> + <el-form-item + label="鍙戦�佹椂闂存锛�" + v-if="currenttype != 2 && radio == 1" + > <el-checkbox-group v-model="checkList"> <el-checkbox label="涓婂崍锛�8:30-11:30锛�"></el-checkbox> <el-checkbox label="涓嬪崍锛�14:30-16:30锛�"></el-checkbox> <el-checkbox label="澶滈棿锛�18:30-20:30锛�"></el-checkbox> - <el-checkbox label="涓嶅畾鏃�"></el-checkbox> </el-checkbox-group> </el-form-item> <el-form-item label="鏈嶅姟褰㈠紡"> @@ -67,18 +85,18 @@ ></el-checkbox> </el-checkbox-group> </el-form-item> - <el-form-item label="缁勭粐褰㈠紡"> + <!-- <el-form-item label="缁勭粐褰㈠紡"> <el-radio-group v-model="form.radio"> <el-radio :label="3">鍗曚汉瀹f暀</el-radio> <el-radio :label="6">澶氫汉闆嗕腑瀹f暀</el-radio> </el-radio-group> - </el-form-item> - <el-form-item label="璇煶妯$増" prop="region"> + </el-form-item> --> + <!-- <el-form-item label="璇煶妯$増" prop="region"> <el-select v-model="form.region" placeholder="璇烽�夋嫨妯$増"> <el-option label="涓�鍙锋ā鐗�" value="shanghai"></el-option> <el-option label="浜屽彿妯$増" value="beijing"></el-option> </el-select> - </el-form-item> + </el-form-item> --> </el-form> </div> </div> @@ -252,6 +270,7 @@ :tableLabel="tableLabel" :controlsc="false" :multiplechoice="false" + :typeinfo="1" /> <pagination v-show="total > 0" @@ -416,7 +435,7 @@ <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> <el-select - v-model="tasktopic" + v-model="patientqueryParams.allhosp" placeholder="璇烽�夋嫨鏂板绫诲瀷" > <el-option @@ -434,7 +453,7 @@ plain icon="el-icon-plus" size="medium" - :disabled="!tasktopic" + :disabled="!patientqueryParams.allhosp" @click="handleAddpatient" >鏂板</el-button > @@ -461,6 +480,7 @@ :currentList="sonuserList" :tableLabel="tableLabelhz" :controlxz="false" + :typeinfo="2" /> <pagination v-show="total > 0" @@ -568,7 +588,9 @@ @handleSelectionChange="handleSelectionChange" :currentList="patientuserList" :tableLabel="tableLabelhz" + :serialnumber="false" :controlsc="false" + :typeinfo="3" /> </el-row> <pagination @@ -592,6 +614,7 @@ <script> import { messagelistpatient } from "@/api/patient/homepage"; +import store from "@/store"; import { getTaskpatient, getlibrarylist, @@ -615,10 +638,12 @@ loading: false, // 閬僵灞� patientloading: false, // 閬僵灞� dialogVisiblepatient: false, //娣诲姞鎮h�呭脊妗� + radio: 1, checkboxlist: [], tableLabel: [], // 鎮h�呰〃鍗� tableLabelhz: [ + { label: "搴忓彿", width: "", prop: "patid" }, { label: "鎮h�呭悕绉�", width: "", prop: "name" }, { label: "鎬у埆", width: "", prop: "sex" }, { label: "骞撮緞", width: "", prop: "age" }, @@ -750,7 +775,6 @@ this.Addsubtask(); this.Getsubtask(); this.Acquisitiontype(); - }, methods: { @@ -761,11 +785,8 @@ pageSize: 10, isavailable: "", }; - getTaskpatient({ allhosp: 1 }).then((res) => { - console.log(res); - }); this.currenttype = this.$route.query.type; - console.log(this.currenttype); + console.log(this.currenttype, "1"); if (this.currenttype == 1) { this.title = "瀹f暀鍐呭鍒楄〃"; this.tableLabel = this.tableLabelxj; @@ -853,8 +874,7 @@ }, // 瀛愪换鍔′簩绾у脊妗� handleAddpatient(row) { - console.log(row, "瀛愮粍浠舵暟鎹�"); - messagelistpatient(this.patientqueryParams).then((response) => { + getTaskpatient(this.patientqueryParams).then((response) => { console.log(response); this.patientuserList = response.rows; this.patienttotal = response.total; @@ -913,11 +933,11 @@ // 鏌ヨ瀛愪换鍔″垪琛� Getsubtask() { this.topqueryParams.pguid = 2; - console.log(this.topqueryParams); + console.log(this.topqueryParams, "aa"); messagelistpatient(this.topqueryParams).then((res) => { this.userList = res.rows; this.total = res.total; - console.log(this.userList); + console.log(this.userList, "ss"); }); }, // 鍙橀噺--------------- diff --git a/src/views/repositoryai/general/index.vue b/src/views/repositoryai/general/index.vue index 22b86bf..fb99d10 100644 --- a/src/views/repositoryai/general/index.vue +++ b/src/views/repositoryai/general/index.vue @@ -678,7 +678,7 @@ margin-top: 20px; margin: 20px; padding: 30px; - background: #edf1f7; + background: #fff; 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); @@ -770,6 +770,24 @@ font-size: 20px; cursor: pointer; } +::v-deep .el-tree { + position: relative; + cursor: default; + border-radius: 5px; + background: #eff8fe; + color: #606266; + border: 1px solid #bbe1fa; + // 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); +} +::v-deep + .el-tree--highlight-current + .el-tree-node.is-current + > .el-tree-node__content { + background-color: #7799fb; + color: #fff; +} ::v-deep .el-button--mini.is-circle { padding: 7px; margin: 0; diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue index c6b3d38..11cf0f8 100644 --- a/src/views/repositoryai/intention/index.vue +++ b/src/views/repositoryai/intention/index.vue @@ -784,7 +784,7 @@ dynamicTags: [], illnesslist: [], illnesslistapi: [], - optionsillness: [], + optionsillness: [], qyoptions: [], mode: [], optionstag: [], @@ -794,11 +794,6 @@ queryParams: { pageNum: 1, pageSize: 10, - userName: undefined, - phonenumber: undefined, - status: undefined, - deptId: undefined, - IDnumber: undefined, }, // 琛ㄥ崟鏍¢獙 @@ -808,10 +803,12 @@ watch: { // 鏍规嵁鍚嶇О绛涢�夐儴闂ㄦ爲 sidecolumnval(val) { + console.log(val); this.$refs.tree.filter(val); }, }, created() { + // 鍒濆鍖栨暟鎹� this.getList(); this.gettabList(); this.getDeptTree(); @@ -820,7 +817,6 @@ this.languagelist = store.getters.languagelist; this.qyoptions = store.getters.usable; }, - methods: { /** 鏌ヨ鎸囨爣鍒楄〃 */ getList() { @@ -833,13 +829,15 @@ }); }, - processElement(element) { + processElement(element) { + // 杩斿洖涓�涓柊鐨勫璞★紝灏唀lement瀵硅薄鐨勫睘鎬soperation璁剧疆涓�1 return { ...element, isoperation: 1 }; }, + // 杩斿洖鏁扮粍涓寚瀹氬厓绱犵殑绱㈠紩 getIndexInArray(arr, obj) { + // 杩斿洖鏁扮粍涓寚瀹氬厓绱犵殑绱㈠紩 return arr.indexOf(obj); }, - //鍒犻櫎鍒嗙被 deletefenlei(row) { if (this.deleteVisible) { @@ -881,7 +879,6 @@ } }, remoteMethod(value) { - console.log(value); const illnessqueryParams = { pageNum: 1, pageSize: 100, @@ -1131,7 +1128,10 @@ resetQuery() { this.dateRange = []; this.resetForm("queryForm"); - this.queryParams.deptId = undefined; + this.queryParams={ + pageNum: 1, + pageSize: 10, + }; this.$refs.tree.setCurrentKey(null); this.handleQuery(); }, @@ -1290,7 +1290,7 @@ margin-top: 20px; margin: 20px; padding: 30px; - background: #edf1f7; + background: #fff; 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); @@ -1382,6 +1382,21 @@ font-size: 20px; cursor: pointer; } +::v-deep .el-tree{ + position: relative; + cursor: default; + border-radius: 5px; + background: #EFF8FE; + color: #606266; + border: 1px solid #bbe1fa; + // 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); + +} +::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content { + background-color: #7799FB ; + color: #fff; +} ::v-deep .el-button--mini.is-circle { padding: 7px; margin: 0; diff --git a/src/views/repositoryai/templateku/configurat/index.vue b/src/views/repositoryai/templateku/configurat/index.vue index 004e65d..e301dee 100644 --- a/src/views/repositoryai/templateku/configurat/index.vue +++ b/src/views/repositoryai/templateku/configurat/index.vue @@ -2,14 +2,29 @@ <div class="Questionnairemanagement"> <!-- 宸︿晶鏍� --> <div class="sidecolumn"> - <div style="height: 400px"> - <el-steps direction="vertical" :active="Editprogress"> - <el-step title="鍩虹淇℃伅"></el-step> - <el-step title="闅忚妯$増棰樼洰"></el-step> - <el-step - title="闅忚妯$増棰勮" - description="鏌ョ湅闅忚妯$増棰勮锛屽彲瀵煎嚭PDF" - ></el-step> + <div> + <el-steps finish-status="success" :active="Editprogress" simple> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 1" + >鍩虹淇℃伅</span + > + </template> + </el-step> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 2" + >闅忚妯$増棰樼洰</span + > + </template> + </el-step> + <el-step description="鏌ョ湅闅忚妯$増棰勮锛屽彲瀵煎嚭PDF"> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 3" + >闅忚妯$増棰勮</span + > + </template> + </el-step> </el-steps> </div> </div> @@ -1252,6 +1267,10 @@ }); }, addtopic(row) { + console.log(row); + getverbaltrick({ id: row.id }).then((res) => { + console.log(res); + }); row.isoperation = 1; this.ruleForm.ivrLibaTemplateScriptVOList.push(row); }, @@ -1378,14 +1397,9 @@ <style lang="scss" scoped> .Questionnairemanagement { - display: flex; + // display: flex; } .sidecolumn { - width: 250px; - min-height: 100vh; - text-align: center; - // display: flex; - // margin-top: 20px; margin: 20px; margin-bottom: 0; padding: 30px; @@ -1397,9 +1411,8 @@ .leftvlue { // display: flex; // flex: 1; - width: 80%; - margin-top: 20px; - // margin: 20px; + // width: 80%; + margin: 20px; padding: 30px; background: #ffff; border: 1px solid #dcdfe6; diff --git a/src/views/repositoryai/templateku/index.vue b/src/views/repositoryai/templateku/index.vue index e09b99f..371522e 100644 --- a/src/views/repositoryai/templateku/index.vue +++ b/src/views/repositoryai/templateku/index.vue @@ -786,8 +786,8 @@ // display: flex; margin-top: 20px; margin: 20px; - padding: 30px; - background: #edf1f7; + padding: 20px; + background: #fff; 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); @@ -932,6 +932,21 @@ font-size: 20px; cursor: pointer; } +::v-deep .el-tree{ + position: relative; + cursor: default; + border-radius: 5px; + background: #EFF8FE; + color: #606266; + border: 1px solid #bbe1fa; + // 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); + +} +::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content { + background-color: #7799FB ; + color: #fff; +} ::v-deep .el-button--mini.is-circle { padding: 7px; margin: 0; diff --git a/src/views/repositoryai/verbaltrick/index.vue b/src/views/repositoryai/verbaltrick/index.vue index 96a7c9e..eccc72b 100644 --- a/src/views/repositoryai/verbaltrick/index.vue +++ b/src/views/repositoryai/verbaltrick/index.vue @@ -170,7 +170,13 @@ @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="id" + prop="id" + /> <el-table-column label="闂涓婚" fixed @@ -751,7 +757,7 @@ margin-top: 20px; margin: 20px; padding: 30px; - background: #edf1f7; + background: #fff; 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); @@ -866,6 +872,24 @@ font-size: 20px; cursor: pointer; } +::v-deep .el-tree { + position: relative; + cursor: default; + border-radius: 5px; + background: #eff8fe; + color: #606266; + border: 1px solid #bbe1fa; + // 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); +} +::v-deep + .el-tree--highlight-current + .el-tree-node.is-current + > .el-tree-node__content { + background-color: #7799fb; + color: #fff; +} ::v-deep .el-button--mini.is-circle { padding: 7px; margin: 0; diff --git a/src/views/repositoryai/verbaltrick/particulars/index.vue b/src/views/repositoryai/verbaltrick/particulars/index.vue index 8b3271e..0daa5c7 100644 --- a/src/views/repositoryai/verbaltrick/particulars/index.vue +++ b/src/views/repositoryai/verbaltrick/particulars/index.vue @@ -2,10 +2,22 @@ <div class="Questionnairemanagement"> <!-- 宸︿晶鏍� --> <div class="sidecolumn"> - <div style="height: 300px"> - <el-steps direction="vertical" :active="Editprogress"> - <el-step title="闂搴撶紪杈�"></el-step> - <el-step title="闂鎸囨爣缂栬緫"></el-step> + <div> + <el-steps finish-status="success" :active="Editprogress" simple> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="Editprogress = 1" + >闂搴撶紪杈�</span + > + </template> + </el-step> + <el-step> + <template slot="title"> + <span style="cursor: pointer" @click="nextstep" + >闂鎸囨爣缂栬緫</span + > + </template> + </el-step> </el-steps> </div> </div> @@ -63,20 +75,20 @@ filterable placeholder="璇烽�夋嫨鍒嗙被" > - <el-option-group - v-for="group in questionclass" - :key="group.id" - :label="group.indexAssortName" - > - <el-option - v-for="item in group.ivrLibaScriptAssortList" - :key="item.id" - :label="item.indexAssortName" - :value="item.id" + <el-option-group + v-for="group in questionclass" + :key="group.id" + :label="group.indexAssortName" > - </el-option> - </el-option-group> - </el-select> + <el-option + v-for="item in group.ivrLibaScriptAssortList" + :key="item.id" + :label="item.indexAssortName" + :value="item.id" + > + </el-option> + </el-option-group> + </el-select> </el-form-item> </el-col> @@ -732,14 +744,13 @@ // 涓嬩竴姝� nextstep() { - if (this.Editprogress <= 1 && this.indexform.targetid) { - if (this.indexform.ivrLibaScriptTargetoptionList.length) { + if (this.Editprogress <= 1) { + if (this.indexform.targetid) { return this.Editprogress++; + } else { + this.$message.warning("璇峰厛閫夋嫨鍏宠仈鎸囨爣"); } - - return this.Editprogress++; } else { - this.$message.warning("璇峰厛閫夋嫨鍏宠仈鎸囨爣"); } }, // 涓婁竴姝� @@ -974,28 +985,19 @@ <style lang="scss" scoped> .Questionnairemanagement { - display: flex; + // display: flex; } .sidecolumn { - width: 300px; - min-height: 100vh; - text-align: center; - // display: flex; - // margin-top: 20px; margin: 20px; margin-bottom: 0; - padding: 30px; + padding: 20px; background: #edf1f7; 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); } .leftvlue { - // display: flex; - // flex: 1; - width: 80%; - margin-top: 20px; - // margin: 20px; + margin: 20px; padding: 30px; background: #ffff; border: 1px solid #dcdfe6; -- Gitblit v1.9.3