省重点年份，默认年份

.env.development

@@ -1,8 +1,8 @@
 ###
  # @Author: 张涛
  # @Date: 2023-07-18 13:04:50
- # @LastEditors: 张涛
- # @LastEditTime: 2023-10-27 14:12:24
+ # @LastEditors: laozt 2721205210@qq.com
+ # @LastEditTime: 2023-12-08 10:32:08
  # @FilePath: \suzhouyingjiPC\.env.development
 ### 
 # 页面标题
@@ -13,7 +13,7 @@ ENV = 'development'
 
 # 苏州应急执法计划管理系统/开发环境
 # VUE_APP_BASE_API = 'http://39.101.188.84:9033'
-VUE_APP_BASE_API = 'http://localhost:13002'
+VUE_APP_BASE_API = 'http://192.168.0.111:9033'
 # VUE_APP_BASE_API = 'http://180.108.205.123:13002'
 
 # 统一登录-内网

src/api/yingji/home.js

@@ -11,7 +11,7 @@ import request from '@/utils/request'
 // 首页表格
 export function indexRegionalism(params) {
   return request({
-    url: "/pharmaceuticals/bPlanEnterprise/tree",
+    url: "/pharmaceuticals/division/tree",
     method: "get",
     params,
   });

src/api/yingji/index.js

@@ -12,7 +12,7 @@ export default {
   // 行政区划
   tree(params) {
     return request({
-      url: "/pharmaceuticals/administrative/tree",
+      url: "/pharmaceuticals/division/tree",
       method: "get",
       params,
     });

src/api/yingji/keyEnterprise.js

@@ -87,7 +87,7 @@ export function listDist(query) {
 //计划企业表数结构
 export function planeEnTree(data) {
     return request({
-        url: '/pharmaceuticals/bPlanEnterprise/tree',
+        url: '/pharmaceuticals/division/tree',
         method: 'get',
         params:data
     })
@@ -95,7 +95,7 @@ export function planeEnTree(data) {
 // 行政区划树结构
 export function xzTree() {
     return request({
-        url: '/pharmaceuticals/administrative/tree',
+        url: '/pharmaceuticals/division/tree',
         method: 'get',
     })
 }

src/views/yingji/echarts/executive.vue

@@ -20,7 +20,6 @@
   </div>
 </template>
 <script>
-import { xzTree } from "@/api/yingji/keyEnterprise.js";
 import { mapState } from "vuex";
 export default {
   data() {
@@ -38,7 +37,7 @@ export default {
     };
   },
   created() {
-    this.xzList();
+    this.treeList();
   },
   computed: {
     ...mapState({
@@ -53,28 +52,27 @@ export default {
     },
   },
   methods: {
-    xzList() {
-      // xzTree().then((res) => {
-        if (this.dept.parentId == 0 || this.dept.leader == "admin") {
-              let treeData =  JSON.parse(localStorage.getItem("TREE_DATA"))
+    treeList() {
+      if (this.dept.parentId == 0 || this.dept.leader == "admin") {
+        let treeData = JSON.parse(localStorage.getItem("TREE_DATA"));
+        // console.log(treeData);
         treeData.forEach((value, index) => {
-            this.compartment.push({
-              value: value.subdistrict,
-              label: value.institutionName,
-              children: [],
-            });
-            if (value.children.length > 0) {
-              value.children.forEach((value1, index1) => {
-                this.compartment[index].children.push({
-                  value: value1.subdistrict,
-                  label: value1.institutionName,
-                });
-              });
-            }
+          this.compartment.push({
+            value: value.districtCode,
+            label: value.district,
+            children: [],
           });
-        }
-        this.$emit("quhuadizhi", this.compartment);
-      // });
+          if (value.children.length > 0) {
+            value.children.forEach((value1, index1) => {
+              this.compartment[index].children.push({
+                value: value1.countyCode,
+                label: value1.county,
+              });
+            });
+          }
+        });
+      }
+      this.$emit("quhuadizhi", this.compartment);
     },
     getData(e) {
       if (!this.none) {

src/views/yingji/focusEnter.vue

@@ -3,8 +3,8 @@
  * @version: 
  * @Author: JC9527
  * @Date: 2023-09-04 10:20:06
- * @LastEditors: 张涛
- * @LastEditTime: 2023-10-12 13:33:22
+ * @LastEditors: laozt 2721205210@qq.com
+ * @LastEditTime: 2023-12-13 09:50:24
 -->
 <template>
   <div class="container-main" ref="main">
@@ -82,7 +82,7 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="year" label="计划年份" header-align="center">
+        <el-table-column prop="year" label="年份" header-align="center">
           <template slot-scope="scope">
             {{ $moment(new Date(scope.row.year)).format("yyyy") }}
           </template>
@@ -235,7 +235,7 @@
         <div class="content">
           <div class="filtrate">
             <el-descriptions :column="2" border>
-              <el-descriptions-item label="计划年份">
+              <el-descriptions-item label="年份">
                 {{ $moment(new Date(details.year)).format("yyyy") }}
               </el-descriptions-item>
               <el-descriptions-item label="企业名称">
@@ -304,7 +304,6 @@ import {
   deleteEnterprise,
   exportEnterprise,
   getEnterprise,
-  // xzTree,
 } from "@/api/yingji/keyEnterprise.js";
 // import { mapState } from "vuex";
 import { getToken } from "@/utils/auth";
@@ -425,7 +424,8 @@ export default {
     };
   },
   created() {
-    // this.getTreeList();
+    this.queryParms.year = this.$moment(new Date()).format("yyyy")
+    this.searchBefore = { ...this.searchBefore, ...this.queryParms };
     this.getList();
   },
   // computed: {
@@ -501,7 +501,6 @@ export default {
     //获取列表
     getList() {
       this.loading = true;
-      // console.log(this.searchBefore);
       listEnterprise(this.searchBefore).then((res) => {
         // console.log(res);
         this.tableData = res.data.list;

src/views/yingji/home.vue

@@ -98,8 +98,8 @@ import completePlan from "./echarts/completePlan";
 import finishRate from "./echarts/finishRate";
 import executionPlan from "./echarts/executionPlan";
 import myPagination from "@/views/components/myPagination/index";
-import { indexRegionalism } from "@/api/yingji/home.js";
 import executive from "./echarts/executive";
+import { indexRegionalism } from "@/api/yingji/home.js";
 
 export default {
   data() {