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/economicTable.vue |   26 ++------------------------
 1 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/views/securityUnitOperation/economicTable.vue b/src/views/securityUnitOperation/economicTable.vue
index 7d0292b..9fdd024 100644
--- a/src/views/securityUnitOperation/economicTable.vue
+++ b/src/views/securityUnitOperation/economicTable.vue
@@ -23,7 +23,7 @@
 import XLSX from "xlsx";
 import { mapGetters } from "vuex";
 import { selectJj } from "../../api/securityUnitOperation/securityUnitOperation";
-import { lazyTreeJu } from "../../api/index/index";
+import { lazyTreeJu,lazyTrees } from "../../api/index/index";
 export default {
   name: "公司经济情况智能分析详情表",
   data() {
@@ -229,28 +229,6 @@
         }
       ],
       subofficeValue: "0",
-      subofficeOptions: [
-        {
-          value: "0",
-          label: "南昌市公安局"
-        },
-        {
-          value: "2",
-          label: "东湖分局"
-        },
-        {
-          value: "3",
-          label: "西湖分局"
-        },
-        {
-          value: "4",
-          label: "青云谱分局"
-        },
-        {
-          value: "5",
-          label: "青山湖分局"
-        }
-      ],
       companyName: "",
       loading: true
     };
@@ -336,7 +314,7 @@
       });
     },
     getSubOfficeData() {
-      lazyTreeJu().then(res => {
+      lazyTrees().then(res => {
         if (res.data.code === 200) {
           this.tableOption.column.forEach(item => {
             if (item.label == "所属辖区") {

--
Gitblit v1.9.3