diff --git a/src/api/modules/report.js b/src/api/modules/report.js
index f590359..8eb9656 100644
--- a/src/api/modules/report.js
+++ b/src/api/modules/report.js
@@ -18,10 +18,10 @@ export default {
params: data
})
},
- // 标签管理
+ // 标签增加
labelAdd (data) {
return request({
- url: '/api/label/add',
+ url: 'api/tree-label/add',
method: 'POST',
data
})
@@ -29,7 +29,7 @@ export default {
// 标签列表
labelList (data) {
return request({
- url: '/api/label/list',
+ url: 'api/tree-label/list',
method: 'GET',
params: data
})
@@ -37,11 +37,16 @@ export default {
// 标签删除|单个
labelDeleteId (data) {
return request({
- url: `/api/label/delete/${data.id}`,
+ url: `api/tree-label/${data.id}`,
method: 'POST'
})
},
-
+labelUpdate(){
+ return request({
+ url: 'api/tree-label/update',
+ method: 'POST'
+ })
+},
// 新增或编辑报告
reportAdd (data) {
return request({
@@ -129,4 +134,5 @@ export default {
params: data
})
}
+ //
}
diff --git a/src/views/Report/ReportManager.vue b/src/views/Report/ReportManager.vue
index 03705b8..11cf98d 100644
--- a/src/views/Report/ReportManager.vue
+++ b/src/views/Report/ReportManager.vue
@@ -139,14 +139,14 @@
新增
-
+
{{ node.label }}
- 编辑
- 删除
@@ -279,7 +279,7 @@ export default {
/* =============================================== 标签维护 =============================================== */
dialogTags: false, // 标签维护
filterText: '',
- data: [
+ treeData: [
{
id: 0,
label: '根节点',
@@ -336,6 +336,12 @@ export default {
}
],
+ options:[
+ {
+ value:'1',
+ label:'1'
+ }
+ ],
tagsForm: {
tags01: {
name: '',
@@ -452,6 +458,19 @@ export default {
}
},
methods: {
+ init() {
+ this.getTreeLabel()
+ // this.labelList();
+ this.reset();
+ this.reportDateList();
+ this.sysUserList();
+ },
+ getTreeLabel(){
+ this.$api.report.labelList().then(res => {
+ console.log('5555',res);
+ this.treeData=res.data
+ })
+ },
//标签搜索
filterNode(value, data) {
if (!value) return true;
@@ -475,8 +494,6 @@ export default {
.catch(_ => { });
},
- addTag() {
- },
/* 权限全选 */
selectAll() {
this.reportF.reportUserIdList = [];
@@ -491,12 +508,7 @@ export default {
this.checked = (val.length || this.reportF.reportUserIdList.length) === this.userList.length;
// this.$emit('update:updateMultipleSelect',this.reportF.reportUserIdList);
},
- init() {
- this.labelList();
- this.reset();
- this.reportDateList();
- this.sysUserList();
- },
+
/* =============================================== 操作日志 =============================================== */
// 操作日志
openLog() {
diff --git a/src/views/Report/reportManager/labelModal.vue b/src/views/Report/reportManager/labelModal.vue
index ab80e2f..d98e6ff 100644
--- a/src/views/Report/reportManager/labelModal.vue
+++ b/src/views/Report/reportManager/labelModal.vue
@@ -4,20 +4,18 @@
-
-
-
-
+
+
-
+
-
+
-
+
取消
@@ -47,19 +45,8 @@ export default {
tip:''
},
- options:[
- {
- label:'1',
- value:'1'
- },
- {
- label:'2',
- value:'2'
- },
- {
- label:'3',
- value:'3'
- },
+ cascaderOptions:[
+
],
rule: {
name: [
@@ -84,6 +71,10 @@ export default {
},
open(node, data) {
this.dialogVisible = true
+ this.$api.report.labelList().then(res => {
+ console.log('666',res);
+ this.cascaderOptions=res.data
+ })
if (node && data) {
this.showAddOrUpdateLabel = true
this.form.label = node.parent.data.label
@@ -91,7 +82,6 @@ export default {
this.$refs.form.clearValidate('name',)
this.form={...this.form}
this.$forceUpdate()
- debugger
} else {
this.form = {}
this.$forceUpdate()
@@ -103,8 +93,10 @@ export default {
submitForm() {
this.$refs.form.validate((valid) => {
if (valid) {
+ this.$api.report.labelAdd({}).then(res => {
+ })
this.dialogVisible = false
-
+
}
})
}
@@ -146,4 +138,14 @@ export default {
line-height: 40px;
width: 80%;
}
+::v-deep .el-cascader{
+ height: 40px !important;
+ line-height: 40px !important;
+ width: 90%;
+}
+::v-deep .el-cascader .el-input__inner {
+ height: 40px !important;
+ line-height: 40px !important;
+ width: 100%;
+}
\ No newline at end of file