zhangtao
laozt 1 year ago
parent 348ccf7ac7
commit 5b616a9363

@ -6,8 +6,8 @@ ENV = 'production'
# 苏州市应急执法计划管理系统/生产环境 # 苏州市应急执法计划管理系统/生产环境
# VUE_APP_BASE_API = 'http://192.168.0.105:9033' # 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' # 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' 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'

@ -286,8 +286,9 @@ export default {
if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") { if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
this.queryParams.district = userInfo.permissionCode; this.queryParams.district = userInfo.permissionCode;
this.queryPlanEnterpriseParams.district = userInfo.permissionCode; this.queryPlanEnterpriseParams.district = userInfo.permissionCode;
this.queryPlanEnterpriseParams.lawHierarchy = userInfo.userName;
} }
this.getList();
this.getPlanEnterpriseList(); this.getPlanEnterpriseList();
}, },
/** 查询计划企业列表 */ /** 查询计划企业列表 */
@ -319,7 +320,7 @@ export default {
this.formPlanEnterprise.lawSort = userInfo.lawSort; this.formPlanEnterprise.lawSort = userInfo.lawSort;
this.formPlanEnterprise.lawAreas = userInfo.lawAreas; this.formPlanEnterprise.lawAreas = userInfo.lawAreas;
this.formPlanEnterprise.lawLevel = userInfo.lawLevel; this.formPlanEnterprise.lawLevel = userInfo.lawLevel;
this.formPlanEnterprise.lawHierarchy = userInfo.userName; this.formPlanEnterprise.lawHierarchy = userInfo.nickName;
this.formPlanEnterprise.plannedYear = this.$moment(new Date()).format( this.formPlanEnterprise.plannedYear = this.$moment(new Date()).format(
"yyyy" "yyyy"
); );

@ -286,6 +286,7 @@ export default {
if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") { if (userInfo.lawLevel == "县级" || userInfo.lawLevel == "镇级") {
this.queryParams.district = userInfo.permissionCode; this.queryParams.district = userInfo.permissionCode;
this.queryPlanEnterpriseParams.district = userInfo.permissionCode; this.queryPlanEnterpriseParams.district = userInfo.permissionCode;
this.queryPlanEnterpriseParams.lawHierarchy = userInfo.userName;
} }
this.getList(); this.getList();
this.getPlanEnterpriseList(); this.getPlanEnterpriseList();
@ -319,7 +320,7 @@ export default {
this.formPlanEnterprise.lawSort = userInfo.lawSort; this.formPlanEnterprise.lawSort = userInfo.lawSort;
this.formPlanEnterprise.lawAreas = userInfo.lawAreas; this.formPlanEnterprise.lawAreas = userInfo.lawAreas;
this.formPlanEnterprise.lawLevel = userInfo.lawLevel; this.formPlanEnterprise.lawLevel = userInfo.lawLevel;
this.formPlanEnterprise.lawHierarchy = userInfo.userName; this.formPlanEnterprise.lawHierarchy = userInfo.nickName;
this.formPlanEnterprise.plannedYear = this.$moment(new Date()).format( this.formPlanEnterprise.plannedYear = this.$moment(new Date()).format(
"yyyy" "yyyy"
); );

@ -148,8 +148,12 @@ export default {
}, },
created() { created() {
this.$nextTick(() => { this.$nextTick(() => {
//
let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO")); let userInfo = JSON.parse(sessionStorage.getItem("USER_INFO"));
this.queryParams.district = userInfo.permissionCode; // if (userInfo.lawLevel == "" || userInfo.lawLevel == "") {
this.queryParams.district = userInfo.permissionCode;
this.queryParams.lawHierarchy = userInfo.userName;
// }
this.getList(); this.getList();
}); });
}, },
@ -181,7 +185,7 @@ export default {
this.$prompt("请输入月份", "编辑", { this.$prompt("请输入月份", "编辑", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
inputValue: row.plannedMonth ? row.plannedMonth :plannedMonth, inputValue: row.plannedMonth ? row.plannedMonth : plannedMonth,
inputPlaceholder: "请输入1到12的数字", inputPlaceholder: "请输入1到12的数字",
inputPattern: /^(1[0-2]|[1-9])$/, inputPattern: /^(1[0-2]|[1-9])$/,
inputErrorMessage: "格式不正确", inputErrorMessage: "格式不正确",

@ -25,8 +25,8 @@ module.exports = {
// 部署生产环境和开发环境下的URL。 // 部署生产环境和开发环境下的URL。
// 默认情况下Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 默认情况下Vue CLI 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 // 例如 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" ? "/" : "/", // publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
// 在npm run build 或 yarn build 时 生成文件的目录名称要和baseUrl的生产环境路径一致默认dist // 在npm run build 或 yarn build 时 生成文件的目录名称要和baseUrl的生产环境路径一致默认dist
outputDir: "dist", outputDir: "dist",
// 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下) // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下)

Loading…
Cancel
Save