From 231c59b39a5f41439440d256c86d19ef7a71ab05 Mon Sep 17 00:00:00 2001
From: dhy1725534722 <1725534722@qq.com>
Date: Tue, 3 Oct 2023 10:32:12 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8C=BA=E5=88=92=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/yingji/echarts/executive.vue | 37 +++++++++++++++++++-------
 src/views/yingji/enforcing.vue         |  2 +-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/views/yingji/echarts/executive.vue b/src/views/yingji/echarts/executive.vue
index 019e76d..d38c7b9 100644
--- a/src/views/yingji/echarts/executive.vue
+++ b/src/views/yingji/echarts/executive.vue
@@ -7,7 +7,7 @@
  * @LastEditTime: 2023-09-28 17:03:02
 -->
 <template>
-  <div >
+  <div>
     <el-cascader
       size="small"
       v-model="district"
@@ -46,10 +46,16 @@ export default {
       dept: (state) => state.user.dept,
     }),
   },
+  props: {
+    none: {
+      type: Boolean,
+      default: false,
+    },
+  },
   methods: {
     xzList() {
       xzTree().then((res) => {
-        if (this.dept.parentId == 0 || this.dept.leader == 'admin') {
+        if (this.dept.parentId == 0 || this.dept.leader == "admin") {
           res.data.forEach((value, index) => {
             this.compartment.push({
               value: value.county,
@@ -66,16 +72,26 @@ export default {
             }
           });
         }
-        this.$emit("quhuadizhi", this.compartment)
+        this.$emit("quhuadizhi", this.compartment);
       });
     },
     getData(e) {
-      if (e.length == 1) {
-        this.$emit("quhua", e[0].slice(1, 8));
-      } else if (e.length == 2 && e[0] == e[1]) {
-        this.$emit("quhua", e[0].slice(1, 8));
+      if (!this.none) {
+        if (e.length == 1) {
+          this.$emit("quhua", e[0].slice(1, 8));
+        } else if (e.length == 2 && e[0] == e[1]) {
+          this.$emit("quhua", e[0].slice(1, 8));
+        } else {
+          this.$emit("quhua", e[1].slice(1, 11));
+        }
       } else {
-        this.$emit("quhua", e[1].slice(1, 11));
+        if (e.length == 1) {
+          this.$emit("quhua", e[0]);
+        } else if (e.length == 2 && e[0] == e[1]) {
+          this.$emit("quhua", e[0]);
+        } else {
+          this.$emit("quhua", e[1]);
+        }
       }
     },
   },
@@ -88,7 +104,10 @@ export default {
   .el-input__inner {
     height: 33px;
   }
-  .el-input .el-input__suffix .el-input__suffix-inner .el-icon-arrow-down::before {
+  .el-input
+    .el-input__suffix
+    .el-input__suffix-inner
+    .el-icon-arrow-down::before {
     content: "";
     background: url(../../../assets/images/down2.png) center center no-repeat;
     background-size: cover;
diff --git a/src/views/yingji/enforcing.vue b/src/views/yingji/enforcing.vue
index 9581b17..abc30b5 100644
--- a/src/views/yingji/enforcing.vue
+++ b/src/views/yingji/enforcing.vue
@@ -23,7 +23,7 @@
         </div>
         <div class="select-input">
           <div class="select-span">区划:</div>
-          <executive @quhua="quhua" @quhuadizhi="quhuadizhi"  ref="executive"></executive>
+          <executive @quhua="quhua" @quhuadizhi="quhuadizhi" :none="true"  ref="executive"></executive>
         </div>
         <div class="my-checkbox">
           <el-checkbox-group v-model="checkList" @change="setmealSelect">

From 6e17ee73f4a7a61f378728453d811e8813c1df33 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 6 Oct 2023 11:28:35 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 3 ++-
 vue.config.js   | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.env.production b/.env.production
index c213c90..ad61603 100644
--- a/.env.production
+++ b/.env.production
@@ -6,7 +6,8 @@ ENV = 'production'
 
 # 苏州应急执法计划管理系统/生产环境
 # VUE_APP_BASE_API = 'http://192.168.0.105:9033'
-VUE_APP_BASE_API = 'http://39.101.188.84:9033'
+# VUE_APP_BASE_API = 'http://39.101.188.84:9033'
+VUE_APP_BASE_API = 'http://180.108.205.123:13002'
 
 
 # 路由懒加载
diff --git a/vue.config.js b/vue.config.js
index 27ef35c..70fb63b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,8 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/demo/suzhouyingjiPC/" : "/",
+  // publicPath: process.env.NODE_ENV === "production" ? "/demo/suzhouyingjiPC/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "./" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
   outputDir: "dist",
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -48,15 +49,14 @@ module.exports = {
       //     ["^" + process.env.VUE_APP_BASE_API]: "",
       //   },
       // },
-      '/api': {
+      "/api": {
         target: `http://39.101.188.84:9033`,
         // target: `http://192.168.0.119:9033`,
         changeOrigin: true,
         pathRewrite: {
-          '^/api': ''
+          "^/api": "",
         },
       },
-      
     },
     disableHostCheck: true,
   },

From 3ce29382644f86c39c7566fe30cc4e84745354c1 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 6 Oct 2023 13:03:10 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E8=B7=AF=E5=8A=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue |  8 +++++---
 src/layout/newyjLayout.vue       | 17 +++++++++++------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4d4a105..2feaa2c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -139,9 +139,11 @@ export default {
         .then(() => {
           this.$store.dispatch("LogOut").then(() => {
             location.href =
-              process.env.NODE_ENV === "production"
-                ? "/demo/suzhouyingjiPC/"
-                : "/";
+              // process.env.NODE_ENV === "production"
+              //   ? "/demo/suzhouyingjiPC/"
+              //   : "/";
+              location.href =
+                process.env.NODE_ENV === "production" ? "./" : "/";
           });
         })
         .catch(() => {});
diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index d4d4177..701d097 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="big-container">
-    <div class="left-menu" >
+    <div class="left-menu">
       <nav class="menu-headers">
         <div>
           <img src="../assets/images/logo.png" alt="" />
@@ -8,7 +8,7 @@
         <div class="nav-text">苏州市应急</div>
         <div class="nav-text">执法计划管理系统</div>
       </nav>
-      <div >
+      <div>
         <div
           v-for="(item, index) in newRouter"
           :key="index"
@@ -111,10 +111,15 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.$store.dispatch("LogOut").then(() => {
-            location.href =
+          // this.$store.dispatch("LogOut").then(() => {
+          //   location.href =
+          //     process.env.NODE_ENV === "production"
+          //       ? "/demo/suzhouyingjiPC/"
+          //       : "/";
+          // });
+          location.href =
               process.env.NODE_ENV === "production"
-                ? "/demo/suzhouyingjiPC/"
+                ? "./"
                 : "/";
           });
         })
@@ -244,4 +249,4 @@ export default {
   cursor: pointer;
   user-select: none;
 }
-</style>
\ No newline at end of file
+</style>

From fb31d57f57aaa9079d0420db36615ffba22d11c0 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 6 Oct 2023 13:04:09 +0800
Subject: [PATCH 4/6] =?UTF-8?q?admin=E9=9A=90=E8=97=8F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/newyjLayout.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index 701d097..5ad7c49 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -51,13 +51,13 @@
             <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <div
+        <!-- <div
           class="showGLstyle"
           v-if="roles && roles[0] == 'admin'"
           @click="toNewPage"
         >
           进入管理平台
-        </div>
+        </div> -->
       </header>
       <div class="bottom-view">
         <router-view></router-view>

From 1891d9b951cbf5ba957120e25edcca7ba3dfdf68 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 6 Oct 2023 13:39:45 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=9D=E7=95=992=E4=BD=8D=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                        |  4 ++--
 src/layout/newyjLayout.vue              | 18 ++++++++----------
 src/views/yingji/echarts/finishRate.vue | 12 ++++++------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/.env.development b/.env.development
index 0909b16..316dd69 100644
--- a/.env.development
+++ b/.env.development
@@ -12,8 +12,8 @@ VUE_APP_TITLE = 苏州应急执法计划管理系统
 ENV = 'development'
 
 # 苏州应急执法计划管理系统/开发环境
-# VUE_APP_BASE_API = 'http://localhost:9028'
-VUE_APP_BASE_API = '/api'
+VUE_APP_BASE_API = 'http://39.101.188.84:9033'
+# VUE_APP_BASE_API = '/api'
 
 
 # 路由懒加载
diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue
index 5ad7c49..4e0aca1 100644
--- a/src/layout/newyjLayout.vue
+++ b/src/layout/newyjLayout.vue
@@ -111,16 +111,14 @@ export default {
         type: "warning",
       })
         .then(() => {
-          // this.$store.dispatch("LogOut").then(() => {
-          //   location.href =
-          //     process.env.NODE_ENV === "production"
-          //       ? "/demo/suzhouyingjiPC/"
-          //       : "/";
-          // });
-          location.href =
-              process.env.NODE_ENV === "production"
-                ? "./"
-                : "/";
+          this.$store.dispatch("LogOut").then(() => {
+            location.href =
+              // process.env.NODE_ENV === "production"
+              //   ? "/demo/suzhouyingjiPC/"
+              //   : "/";
+
+              location.href =
+                process.env.NODE_ENV === "production" ? "./" : "/";
           });
         })
         .catch(() => {});
diff --git a/src/views/yingji/echarts/finishRate.vue b/src/views/yingji/echarts/finishRate.vue
index 982eea4..9276d45 100644
--- a/src/views/yingji/echarts/finishRate.vue
+++ b/src/views/yingji/echarts/finishRate.vue
@@ -1,4 +1,4 @@
-<template >
+<template>
   <div style="height: 100%; height: 100%" v-loading="loadS">
     <div id="cakeBox"></div>
   </div>
@@ -36,7 +36,7 @@ export default {
         } else {
           this.arr2.push({
             value: value1.plannedEnterpriseCount,
-            name: value1.institutionName ,
+            name: value1.institutionName,
             pt: value1.pt == "NaN" ? 0 : value1.pt.toFixed(2),
           });
         }
@@ -139,9 +139,9 @@ export default {
                 position: "center",
                 formatter: function (params) {
                   console.log(params);
-                  return `{a|${Number(params.data.pt) * 100}%}\n{b|${
-                    params.data.name
-                  }完成率}`;
+                  return `{a|${(Number(params.data.pt) * 100).toFixed(
+                    2
+                  )}%}\n{b|${params.data.name}完成率}`;
                 },
                 rich: {
                   a: {
@@ -209,4 +209,4 @@ export default {
   height: 100%;
   width: 100%;
 }
-</style>
\ No newline at end of file
+</style>

From 9bce925628449989e15694662272f3353a09faa8 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Fri, 6 Oct 2023 13:56:35 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=9C=81=E9=87=8D=E7=82=B9=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/yingji/focusEnter.vue | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/yingji/focusEnter.vue b/src/views/yingji/focusEnter.vue
index 32b2cd1..e0e53d9 100644
--- a/src/views/yingji/focusEnter.vue
+++ b/src/views/yingji/focusEnter.vue
@@ -11,13 +11,13 @@
     <div class="enforce-the-law-title">
       <div class="filtrate-condition">
         <div class="select-input">
-          <div class="select-span">年月:</div>
+          <div class="select-span">年份:</div>
           <div>
             <el-date-picker
               v-model="queryParms.year"
-              type="month"
-              placeholder="请选择"
-              value-format="yyyy-MM"
+              type="year"
+              placeholder="请选择年份"
+              value-format="yyyy"
               size="small"
             >
             </el-date-picker>
@@ -89,9 +89,9 @@
         @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-MM") }}
+            {{ $moment(new Date(scope.row.year)).format("yyyy") }}
           </template>
         </el-table-column>
         <el-table-column
@@ -270,7 +270,7 @@
           <div class="filtrate">
             <el-descriptions :column="2" border>
               <el-descriptions-item label="计划年份">
-                {{ $moment(new Date(details.year)).format("yyyy-MM") }}
+                {{ $moment(new Date(details.year)).format("yyyy") }}
               </el-descriptions-item>
               <el-descriptions-item label="企业名称">
                 {{ details.enterpriseName }}
@@ -294,8 +294,8 @@
     </el-dialog>
   </div>
 </template>
-  
-  <script>
+
+<script>
 import myPagination from "@/views/components/myPagination/index.vue";
 import { Loading } from "element-ui";
 import executive from "./echarts/executive";
@@ -640,7 +640,7 @@ export default {
   },
 };
 </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 ::v-deep .el-descriptions-row th {
   width: 20% !important;
   font-size: 14px;
@@ -934,4 +934,3 @@ export default {
   // line-height: 40px;
 }
 </style>
-  
\ No newline at end of file