diff --git a/src/views/system/components/wangEditor.vue b/src/views/system/components/wangEditor.vue index 8f03af9..3226394 100644 --- a/src/views/system/components/wangEditor.vue +++ b/src/views/system/components/wangEditor.vue @@ -3,7 +3,7 @@ - +
@@ -14,7 +14,7 @@ 确定
- +
@@ -37,6 +37,8 @@ import { labelFieldList } from '@/api/system/wangEditor.js' // import menuConf from "./ModalMenu"; +import { getToken } from "@/utils/auth"; + var that export default ({ components: { Editor, Toolbar }, @@ -59,7 +61,16 @@ export default ({ placeholder: '请输入内容...', MENU_CONF: { uploadImage: { - server: '/api/upload', + server: process.env.VUE_APP_BASE_API + '/common/richTextPictureUrl', + headers: { + Authorization: "Bearer " + getToken() + }, + fieldName: "file", // 这里有个坑,如果返回的响应结果是没有上传文件,跟这里关系很大 + customInsert(res, insertFn) { + if (res.code == 200) { + insertFn(res.url, null, null); + } + }, }, }, }, @@ -160,7 +171,6 @@ export default ({ }) }) this.labeloptions = res.data.data - console.log(this.labeloptions) }) labelFieldList('KNOWLEDGE_FIELD').then(res => { res.data.data.forEach(e => { @@ -171,6 +181,11 @@ export default ({ this.fieldoptions = res.data.data }) }, + beforeClose() { + this.modify = false + this.fieldshow = false + this.labelshow = false + }, }, mounted() { }, diff --git a/src/views/system/specialDiseaseNode/index.vue b/src/views/system/specialDiseaseNode/index.vue index 622c917..99cab68 100644 --- a/src/views/system/specialDiseaseNode/index.vue +++ b/src/views/system/specialDiseaseNode/index.vue @@ -11,39 +11,45 @@ 适用范围 - - + + + +
- 管理路径节点({{ timelinelist.length }}) - + 管理路径节点({{ lists.length }}) +
-
- - - + + + + + + + - +
- +
-

{{ uitem.title }}

-

{{ uitem.text }}

+

{{ uitem.taskTypeName }}

+

{{ uitem.taskSubdivisionName }}

@@ -52,43 +58,44 @@
- + - + - + - + - +
-
+
@@ -257,13 +264,14 @@
--> - +
+ @@ -284,59 +292,33 @@ export default { }, form: { templateId: '', - templateName: '', + templateName: ' ', + taskType: '', + taskTypeName: '', + taskSubdivision: '', + taskSubdivisionName: ' ', + taskStatus: '', + secondClassifyDescribe: '', + executionTime: '', }, itemindex: 0, listindex: 0, - timelinelist: [{ - title: '选项1', - text: '黄金糕', + lists: [{ + routeNodeName: "", + routeNodeDay: '', list: [ { - title: '选项1', - text: '黄金糕', - }, - { - title: '选项1', - text: '黄金糕', - }, - ], - }, { - title: '选项2', - text: '双皮奶', - list: [ - { - title: '选项1', - text: '黄金糕', - }, - ], - }, { - title: '选项3', - text: '蚵仔煎', - list: [ - { - title: '选项1', - text: '黄金糕', - }, - { - title: '选项1', - text: '黄金糕', - }, - ], - }, { - title: '选项4', - text: '龙须面' - }, { - title: '选项5', - text: '北京烤鸭', - list: [ - { - title: '选项1', - text: '黄金糕', - }, - { - title: '选项1', - text: '黄金糕', + taskTypeName: '', + taskSubdivisionName: '', + templateId: '', + templateName: ' ', + taskType: '', + taskTypeName: '', + taskSubdivision: '', + taskSubdivisionName: ' ', + taskStatus: '', + secondClassifyDescribe: '', + executionTime: '', }, ], }], @@ -354,15 +336,20 @@ export default { this.taskinfo(); this.wangeditorshow = true }, - beforeDestroy(){ + beforeDestroy() { this.wangeditorshow = false }, watch: { }, mounted() { + this.form = this.lists[0].list[0] // console.log(this.$refs.editor.html) }, methods: { + //暂存 + TemporaryStorage() { + console.log(this.lists) + }, ontemplate(item) { this.form.templateId = item.templateId this.form.templateName = item.templateName @@ -393,18 +380,73 @@ export default { taskPartitionList(id).then(res => { this.taskPartitionList = res.data }) + this.selectTaskTypeList.forEach(el => { + if (id == el.id) { + this.form.taskTypeName = el.taskTypeName + } + }) + }, + changetaskSubdivision(e) { + this.taskPartitionList.forEach(el => { + if (e == el.id) { + this.form.taskSubdivisionName = el.taskTypeName + } + }) + }, + addlist() { + this.lists.push({ + routeNodeName: "", + routeNodeDay: '', + list: [ + { + taskTypeName: '', + taskSubdivisionName: '', + templateId: '', + templateName: ' ', + taskType: '', + taskTypeName: '', + taskSubdivision: '', + taskSubdivisionName: ' ', + taskStatus: '', + secondClassifyDescribe: '', + executionTime: '', + }, + ] + }) + }, + additem(item) { + item.list.push({ + taskTypeName: '', + taskSubdivisionName: '', + templateId: '', + templateName: ' ', + taskType: '', + taskTypeName: '', + taskSubdivision: '', + taskSubdivisionName: ' ', + taskStatus: '', + secondClassifyDescribe: '', + executionTime: '', + }) + }, + delitem(item, index) { + item.list.splice(this.itemindex, 1) + if (item.list.length == 0) { + this.lists.splice(index, 1) + } }, } };