From ffc31835fb765229c420db4a651abce3f8c832fc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 03 Sep 2021 09:47:44 +0800
Subject: [PATCH] 冲突
---
src/views/securityUnitOperation/operationAnalysis.vue | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/src/views/securityUnitOperation/operationAnalysis.vue b/src/views/securityUnitOperation/operationAnalysis.vue
index b6985de..3da4c0b 100644
--- a/src/views/securityUnitOperation/operationAnalysis.vue
+++ b/src/views/securityUnitOperation/operationAnalysis.vue
@@ -17,16 +17,20 @@
</el-select> -->
<el-select
class="select1"
- v-model="value1"
+ ref="treeForm"
+ v-model="node.title"
placeholder="请选择"
- @change="fenjuChange"
>
- <el-option
- v-for="item in options1"
- :key="item.id"
- :label="item.title"
- :value="item.id"
- ></el-option>
+ <el-option style="height: auto;" :value="node">
+ <el-tree
+ :data="options1"
+ default-expand-all
+ node-key="id"
+ @node-click="handleNodeClick"
+ :props="props"
+ >
+ </el-tree>
+ </el-option>
</el-select>
<el-select
class="select2"
@@ -136,7 +140,7 @@
<script>
import * as echarts from "echarts";
import echartJs from "./securityEchart.js";
-import { lazyTreeJu } from "../../api/index/index";
+import { lazyTreeJu, lazyTrees } from "../../api/index/index";
import {
queryCounts,
getCompanys,
@@ -209,10 +213,23 @@
qing: 0,
zhong: 0,
lao: 0
- }
+ },
+ props: {
+ children: "children",
+ label: "title",
+ value: "id"
+ },
+ node: {} //选中的记录
};
},
methods: {
+ //点击节点
+ handleNodeClick(data) {
+ this.node = data;
+ this.value1 = data.id;
+ this.$refs.treeForm.blur();
+ this.getCompanys();
+ },
setAgeEchart() {
this.loading4 = true;
let params = {
@@ -252,19 +269,19 @@
getFenju() {
this.options1 = [];
this.value1 = "";
- lazyTreeJu().then(res => {
+ this.node = {};
+ lazyTrees().then(res => {
if (res.data.code === 200) {
this.options1 = res.data.data;
this.value1 = this.options1[0] ? this.options1[0].id : "";
+ this.node = this.options1[0];
this.getCompanys();
} else {
this.$message.error(res.msg);
}
});
},
- fenjuChange() {
- this.getCompanys();
- },
+
getCompanys() {
getCompanys({ jurisdiction: this.value1 }).then(res => {
if (res.data.code === 200) {
--
Gitblit v1.9.3