高度

.env.development

@@ -13,8 +13,8 @@ ENV = 'development'
 
 # 苏州市应急执法计划管理系统/开发环境
 # VUE_APP_BASE_API = 'http://39.101.188.84:9033'
-VUE_APP_BASE_API = 'http://localhost:9033'
-# VUE_APP_BASE_API = 'http://180.108.205.123:13002'
+# VUE_APP_BASE_API = 'http://localhost:9033'
+VUE_APP_BASE_API = 'http://180.108.205.123:13002'
 
 # 统一登录-内网
 VUE_APP_SSO_LOGIN_N = 'http://2.46.4.197:8090/sso-server/oauth2/sso?aid=17847210&cbu=http%3A%2F%2F180.108.205.123%3A13001%2F&response_type=code'

src/layout/newyjLayout.vue

@@ -56,9 +56,9 @@
             </div>
           </div>
           <el-dropdown-menu slot="dropdown">
-            <router-link v-show="userInfo.userName == 'admin'" to="/system/user">
+            <!-- <router-link v-show="userInfo.userName == 'admin'" to="/system/user">
               <el-dropdown-item>进入后台管理</el-dropdown-item>
-            </router-link>
+            </router-link> -->
             <router-link to="/user/profile">
               <el-dropdown-item>修改密码</el-dropdown-item>
             </router-link>

src/router/index.js

@@ -203,8 +203,8 @@ Router.prototype.replace = function push(location) {
 };
 
 export default new Router({
-  mode: "history", // 去掉url中的#
-  base: "/",
+  // mode: "history", // 去掉url中的#
+  // base: "/",
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes,
 });

src/views/components/AddDialog/tab2.vue

@@ -319,7 +319,7 @@ export default {
           plannedYear: this.$moment(new Date()).format("yyyy"),
           plannedMonth: null,
           status: 0,
-          checkStatus: null,
+          checkStatus: 0,
           checkId: null,
           checkAgeing: null,
           createId: null,

src/views/components/AddDialog/tab3.vue

@@ -188,7 +188,7 @@ export default {
     editMonth(row) {
       let _this = this;
 
-      let plannedMonth = this.$moment(new Date()).format("MM");
+      let plannedMonth = this.$moment(new Date()).format("M");
       this.$prompt("请输入月份", "编辑", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/yingji/home.vue

@@ -92,7 +92,8 @@
           v-loading="load1"
           :data="tableData"
           style="width: 100%"
-          :height="530"
+                  :height="tableHeight"
+
           :border="false"
           :row-class-name="tableRowClassName"
         >
@@ -234,6 +235,8 @@ import completePlan from "./echarts/completePlan";
 import finishRate from "./echarts/finishRate";
 import executionPlan from "./echarts/executionPlan";
 import resetPwd from "../system/userc/profile/resetPwd.vue";
+import detectZoom from "@/utils/detectZoom";
+
 import {
   listEnterprise,
   getEnterprise,
@@ -331,6 +334,8 @@ export default {
       title: "",
       isDialogShow: false,
       tableInfoData: [],
+            tableHeight: 530,
+
     };
   },
   components: {
@@ -342,7 +347,8 @@ export default {
   created() {
     this.queryParams.plannedYear = this.$moment(new Date()).format("yyyy");
     this.getList();
-
+// 设置表格高度 100% 125%
+    this.tableHeight = detectZoom == 100 ? 730 : 530;
     if (JSON.parse(sessionStorage.getItem("USER_P_STATUS")) == 1) {
       // 原始密码修改
       this.resetPwd();