diff --git a/.env.development b/.env.development index 4916245..447579f 100644 --- a/.env.development +++ b/.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' diff --git a/src/layout/newyjLayout.vue b/src/layout/newyjLayout.vue index 22407d7..d5addd9 100644 --- a/src/layout/newyjLayout.vue +++ b/src/layout/newyjLayout.vue @@ -56,9 +56,9 @@ - + 修改密码 diff --git a/src/router/index.js b/src/router/index.js index b55f79b..ca18bb4 100644 --- a/src/router/index.js +++ b/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, }); diff --git a/src/views/components/AddDialog/tab2.vue b/src/views/components/AddDialog/tab2.vue index 6bf05e9..8992f47 100644 --- a/src/views/components/AddDialog/tab2.vue +++ b/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, diff --git a/src/views/components/AddDialog/tab3.vue b/src/views/components/AddDialog/tab3.vue index 49bc512..0bd6204 100644 --- a/src/views/components/AddDialog/tab3.vue +++ b/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: "取消", diff --git a/src/views/yingji/home.vue b/src/views/yingji/home.vue index fd560a5..459f87b 100644 --- a/src/views/yingji/home.vue +++ b/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();