zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_web

This commit is contained in:
shijing 2024-08-19 15:18:31 +08:00
parent 9c76501511 fe704c09a7
commit 5dcbe0c8e4
15 changed files with 121 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/config/route.js
View File

@ -946,16 +946,16 @@ const routes = [
}, },
component: "enm_energy/value", component: "enm_energy/value",
}, },
{ // {
name: "electric", // name: "electric",
path: "/enm_energy/electric", // path: "/enm_energy/electric",
meta: { // meta: {
title: "全厂电量统计", // title: "全厂电量统计",
// icon: "el-icon-grid", // // icon: "el-icon-grid",
perms: ["enm_energy_electric"], // perms: ["enm_energy_electric"],
}, // },
component: "enm_energy/electric", // component: "enm_energy/electric",
}, // },
{ {
name: "electricHour", name: "electricHour",
path: "/enm_energy/electricHour", path: "/enm_energy/electricHour",

7
src/views/em/mpoint_form.vue
View File

@ -149,6 +149,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :md="12" :sm="24">
<el-form-item label="计算系数" label-width="90">
<el-input-number
v-model="form.coefficient"
></el-input-number>
</el-form-item>
</el-col>
<el-col :md="24" :sm="24"> <el-col :md="24" :sm="24">
<el-form-item label="计算公式"> <el-form-item label="计算公式">
<el-input <el-input

76
src/views/enm_coal/teamAnalysis.vue
View File

@ -99,33 +99,23 @@ export default {
//月目标 //月目标
let paramsGoal = {}; let paramsGoal = {};
paramsGoal.page = 0; paramsGoal.page = 0;
paramsGoal.mgroup = that.query.mgroup; this.$API.mtm.mgroup.list
that.$API.mtm.goal.list.req(paramsGoal).then((ress) => { .req({page:0, search:"煤磨"})
if (ress.length > 0) { .then((res) =>{
let monthGoal = []; that.query.mgroup = res[0].id;
ress.forEach((goal) => { let params = {};
if (goal.goal_cate_name == "单位产品分布电耗（KW·h/t）") { params.page = 0;
monthGoal[0] = goal.goal_val; params.year = year;
monthGoal[1] = goal.goal_val_2; params.mgroup = that.query.mgroup;
monthGoal[2] = goal.goal_val_3; this.$API.mtm.goal.list.req(params).then((res) => {
monthGoal[3] = goal.goal_val_4; let data = [];
monthGoal[4] = goal.goal_val_5; if (res.length > 0) {
monthGoal[5] = goal.goal_val_6; data = res[0];
monthGoal[6] = goal.goal_val_7;
monthGoal[7] = goal.goal_val_8;
monthGoal[8] = goal.goal_val_9;
monthGoal[9] = goal.goal_val_10;
monthGoal[10] = goal.goal_val_11;
monthGoal[11] = goal.goal_val_12;
monthGoal[12] = goal.goal_val_12;
that.monthGoal = monthGoal;
} }
console.log(data);
that.getData(data);
}); });
this.getData(); });
} else {
this.getData();
}
});
}, },
methods: { methods: {
getData(goalData) { getData(goalData) {
@ -181,25 +171,25 @@ export default {
arr.push(item.total_production); arr.push(item.total_production);
arr.push(item.production_hour); arr.push(item.production_hour);
arr.push(item.run_rate); arr.push(item.run_rate);
arr.push(item.production_cost_unit);
//质量 //质量
arr[5] =
item.出磨煤粉_细度_rate_pass !== undefined && item.出磨煤粉_细度_rate_pass !== null
? item.出磨煤粉_细度_rate_pass
: "/";
arr[6] = arr[6] =
item.煤粉_细度_rate_pass != null item.出磨煤粉_水分_rate_pass !== undefined && item.出磨煤粉_水分_rate_pass !== null
? item.煤粉_细度_rate_pass ? item.出磨煤粉_水分_rate_pass
: "/"; : "/";
//设备
arr[7] = arr[7] =
item.煤粉_水分_rate_pass != null item.煤磨排风机_consume_unit !== undefined && item.煤磨排风机_consume_unit !== null
? item.煤粉_水分_rate_pass
: "/";
//设备
arr[8] =
item.煤磨排风机_consume_unit != null
? item.煤磨排风机_consume_unit ? item.煤磨排风机_consume_unit
: "/"; : "/";
let keyVale = "goal_val_" + n; let keyVale = "goal_val_" + n;
arr[9] = item.elec_consume_unit; //当期值（KW·h/t） arr[8] = item.elec_consume_unit; //当期值（KW·h/t）
arr[10] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 arr[9] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取
arr[11] = item.celec_consume_unit - arr[10]; //当期与目标差值（KW·h/t） arr[10] = item.celec_consume_unit - arr[9]; //当期与目标差值（KW·h/t）
let ind_pre = 0, let ind_pre = 0,
huanqi = 0, huanqi = 0,
huanqicha = 0, huanqicha = 0,
@ -213,19 +203,19 @@ export default {
} else { } else {
ind_pre = n - 1; ind_pre = n - 1;
huanqi = wrapArr[ind_pre] huanqi = wrapArr[ind_pre]
? wrapArr[ind_pre].elec_consume_unit ? wrapArr[ind_pre].elec_consume_unit>=0
? wrapArr[ind_pre].elec_consume_unit ? wrapArr[ind_pre].elec_consume_unit
: "/" : "/"
: "/"; : "/";
} }
arr[12] = huanqi; //环期值（KW·h/t）上个月的值 arr[11] = huanqi; //环期值（KW·h/t）上个月的值
if (huanqi !== "/") { if (huanqi !== "/") {
huanqicha = item.celec_consume_unit - huanqi; huanqicha = item.celec_consume_unit - huanqi;
} else { } else {
huanqicha = item.celec_consume_unit; huanqicha = item.celec_consume_unit;
} }
arr[13] = huanqicha; //当期与环期差值（KW·h/t） arr[12] = huanqicha; //当期与环期差值（KW·h/t）
arr[14] = arr[13] =
huanqi != "/" ? (huanqicha / huanqi) * 100 : 0; //环比增长率（%） huanqi != "/" ? (huanqicha / huanqi) * 100 : 0; //环比增长率（%）
if (wrapArr0[n]) { if (wrapArr0[n]) {
tongqicha = tongqicha =
@ -236,8 +226,8 @@ export default {
tongqicha = item.celec_consume_unit; tongqicha = item.celec_consume_unit;
tongqi = 0; tongqi = 0;
} }
arr[15] = tongqi; //同比增长率（%） arr[14] = tongqi; //同比增长率（%）
arr[16] = 0; //同比增长率（%） arr[15] = 0.0; //得分
wrapArr[ind] = arr; wrapArr[ind] = arr;
}); });
console.log(wrapArr); console.log(wrapArr);

20
src/views/enm_coal/workshopAnalysis.vue
View File

@ -142,11 +142,17 @@ export default {
that.monthGoal = monthGoal; that.monthGoal = monthGoal;
} }
}); });
this.getData();
} else { } else {
this.getData(); this.getData();
} }
}); });
this.$API.mtm.mgroup.list
.req({ page: 0, search: "煤磨" })
.then((res) => {
console.log("煤磨", res);
that.query.mgroup = res[0].id;
this.getData();
});
}, },
methods: { methods: {
// 动态绑定Class // 动态绑定Class
@ -203,7 +209,7 @@ export default {
that.monthGoal[ind] !== undefined that.monthGoal[ind] !== undefined
? that.monthGoal[ind] ? that.monthGoal[ind]
: "/"; : "/";
wrapArr[ind] = arr; wrapArr.push(arr);
}); });
wrapArr.forEach((item, index) => { wrapArr.forEach((item, index) => {
let arrs = []; let arrs = [];
@ -214,20 +220,20 @@ export default {
//当期与目标差值（KW·h/t） //当期与目标差值（KW·h/t）
let diff = 0; let diff = 0;
if (item[2] !== "/") { if (item[2] !== "/") {
diff = item[1] - item[2]; diff = (item[1] - item[2]).toFixed(2);
} else { } else {
diff = "/"; diff = "/";
} }
arrs[3] = diff; arrs[3] = diff;
//环期值（KW·h/t）上个月的值 //环期值（KW·h/t）上个月的值
let lastNum = 0; let lastNum = 0;
if (index > 1) { if (index > 0) {
let num = index - 1; let num = index - 1;
if ( if (
wrapArr[num] && wrapArr[num] &&
wrapArr[num].elec_consume_unit wrapArr[num][1]
) { ) {
lastNum = wrapArr[num].elec_consume_unit; lastNum = wrapArr[num][1];
} else { } else {
lastNum = "/"; lastNum = "/";
} }
@ -241,7 +247,7 @@ export default {
let lastDiff = 0; let lastDiff = 0;
if (arrs[1] !== "/" && arrs[4] !== "/") { if (arrs[1] !== "/" && arrs[4] !== "/") {
lastDiff = arrs[1] - arrs[4]; lastDiff = (arrs[1] - arrs[4]).toFixed(2);
} else { } else {
lastDiff = "/"; lastDiff = "/";
} }

1
src/views/enm_energy/electric.vue
View File

@ -1,4 +1,3 @@
<!-- 全厂电量统计 -->
<template> <template>
<div class="app-container"> <div class="app-container">
<el-header> <el-header>

8
src/views/enm_kiln/power.vue
View File

@ -485,9 +485,10 @@ export default {
obj.mgroup__name = "回转窑"; obj.mgroup__name = "回转窑";
obj.page = 0; obj.page = 0;
obj.enabled = 1; obj.enabled = 1;
obj.material__code__in = "elec,elec_0";
obj.ep_monitored__isnull = 0;
obj.need_display = 1; obj.need_display = 1;
obj.ordering = "report_sortstr"; obj.ordering = "report_sortstr";
obj.material__code__in = "elec,elec_0";
this.$API.enm.mpoint.list.req(obj).then((res) => { this.$API.enm.mpoint.list.req(obj).then((res) => {
console.log("mpoints", res); console.log("mpoints", res);
let arr = []; let arr = [];
@ -730,7 +731,10 @@ export default {
data.forEach((item) => { data.forEach((item) => {
let ind = item.month_s - 1; let ind = item.month_s - 1;
let index = that.mpoints.indexOf(item.mpoint_name); //第几个mpoint let index = that.mpoints.indexOf(item.mpoint_name); //第几个mpoint
seriesData[index][ind] = item.elec_consume_unit; if(index != undefined){
seriesData[index][ind] = item.elec_consume_unit;
}
}); });
let options = { ...that.option3 }; let options = { ...that.option3 };
for (let j = 0; j < that.mpoints.length; j++) { for (let j = 0; j < that.mpoints.length; j++) {

9
src/views/enm_kiln/workshopAnalysis.vue
View File

@ -480,7 +480,8 @@ export default {
//当期与目标差值（KW·h/t） //当期与目标差值（KW·h/t）
let diff = 0; let diff = 0;
if (arrs[2] !== "/") { if (arrs[2] !== "/") {
diff = arrs[1] - arrs[2]; diff = (arrs[1] - arrs[2]).toFixed(2)
;
} else { } else {
diff = "/"; diff = "/";
} }
@ -507,7 +508,7 @@ export default {
let lastDiff = 0; let lastDiff = 0;
if (arrs[1] !== "/" && arrs[4] !== "/") { if (arrs[1] !== "/" && arrs[4] !== "/") {
lastDiff = arrs[1] - arrs[4]; lastDiff = (arrs[1] - arrs[4]).toFixed(2);
} else { } else {
lastDiff = "/"; lastDiff = "/";
} }
@ -519,7 +520,7 @@ export default {
lastNum !== "/" && lastNum !== "/" &&
lastNum !== 0 lastNum !== 0
) { ) {
lastRate = (lastDiff / lastNum) * 100; lastRate = ((lastDiff / lastNum) * 100).toFixed(2);
} else { } else {
lastRate = "/"; lastRate = "/";
} }
@ -628,7 +629,7 @@ export default {
: "/"; : "/";
} }
if (arrs3[1] !== "/" && lastNum3 !== "/") { if (arrs3[1] !== "/" && lastNum3 !== "/") {
lastDiff3 = arrs3[1] - lastNum3; lastDiff3 = (arrs3[1] - lastNum3).toFixed(2);
} else { } else {
lastDiff3 = "/"; lastDiff3 = "/";
} }

20
src/views/enm_mill/workshopAnalysis.vue
View File

@ -197,11 +197,12 @@ export default {
this.$API.mtm.mgroup.list this.$API.mtm.mgroup.list
.req({ page: 0, search: "水泥磨" }) .req({ page: 0, search: "水泥磨" })
.then((res) => { .then((res) => {
console.log("水泥磨", res);
that.query.mgroup = res[0].id; that.query.mgroup = res[0].id;
//月目标 //月目标
this.getMonthGoal(); this.getMonthGoal();
this.getData();
}); });
}, },
methods: { methods: {
// 动态绑定Class // 动态绑定Class
@ -229,6 +230,7 @@ export default {
that.$API.mtm.goal.list.req(paramsGoal).then((ress) => { that.$API.mtm.goal.list.req(paramsGoal).then((ress) => {
if (ress.length > 0) { if (ress.length > 0) {
let monthGoal = []; let monthGoal = [];
let monthGoal2 = [];
ress.forEach((goal) => { ress.forEach((goal) => {
if ( if (
goal.goal_cate_name == "单位产品分布电耗（KW·h/t）" goal.goal_cate_name == "单位产品分布电耗（KW·h/t）"
@ -266,8 +268,7 @@ export default {
monthGoal2[12] = goal.goal_val_12; monthGoal2[12] = goal.goal_val_12;
that.monthGoal2 = monthGoal2; that.monthGoal2 = monthGoal2;
} }
}); })
this.getData();
} else { } else {
this.getData(); this.getData();
} }
@ -312,7 +313,7 @@ export default {
that.monthGoal[ind] !== undefined that.monthGoal[ind] !== undefined
? that.monthGoal[ind] ? that.monthGoal[ind]
: "/"; : "/";
wrapArr[ind] = arr; wrapArr.push(arr);
}); });
wrapArr.forEach((item, index) => { wrapArr.forEach((item, index) => {
let ind = item.month_s; let ind = item.month_s;
@ -327,13 +328,14 @@ export default {
//当期与环期差值（KW·h/t） //当期与环期差值（KW·h/t）
let lastNum = 0, let lastNum = 0,
lastDiff = 0; lastDiff = 0;
if (index > 1) { if (index > 0) {
let num = index - 1; let num = index - 1;
if ( if (
wrapArr[num] && wrapArr[num] &&
wrapArr[num].elec_consume_unit wrapArr[num][1]
) { ) {
lastNum = wrapArr[num].elec_consume_unit; lastNum = wrapArr[num][1];
} else { } else {
lastNum = "/"; lastNum = "/";
} }
@ -351,7 +353,7 @@ export default {
//环比增长率（%） //环比增长率（%）
let lastRate = 0; let lastRate = 0;
if ( if (
lastDiff == "/" && lastDiff !== "/" &&
lastNum !== "/" && lastNum !== "/" &&
lastNum !== 0 lastNum !== 0
) { ) {
@ -360,7 +362,7 @@ export default {
lastRate = "/"; lastRate = "/";
} }
arrs[7] = lastRate; arrs[7] = lastRate;
//同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit // 同比增长率（%）需要当前值-上一年同一个月的值即wrapArr0[ind].elec_consume_unit
let sameRate = 0; let sameRate = 0;
if ( if (
wrapArr0[index] && wrapArr0[index] &&

10
src/views/enm_report/costing.vue
View File

@ -125,7 +125,7 @@ export default {
methods: { methods: {
//获取工段列表 //获取工段列表
getMgroup() { getMgroup() {
this.$API.mtm.mgroup.list.req({ page: 0 }).then(res => { this.$API.mtm.mgroup.list.req({ page: 0, cate: 'section' }).then(res => {
res.forEach(item => { res.forEach(item => {
if (item.name !== '煤磨' && item.name !== '水泥包装') { if (item.name !== '煤磨' && item.name !== '水泥包装') {
this.mgroupOptions.push(item); this.mgroupOptions.push(item);
@ -133,7 +133,8 @@ export default {
}) })
this.mgroupOptions = this.mgroupOptions.reverse(); this.mgroupOptions = this.mgroupOptions.reverse();
this.query.mgroup = this.mgroupOptions[0].id; this.query.mgroup = this.mgroupOptions[0].id;
this.tableName = '电石渣干粉核算' this.tableName = this.mgroupOptions[0].name;
this.getTableData();
}) })
}, },
//班组列表 //班组列表
@ -143,7 +144,8 @@ export default {
}) })
}, },
mgroupChange(value) { mgroupChange(value) {
let arr = this.mgroupOptions.filter(item => { if(value){
let arr = this.mgroupOptions.filter(item => {
return item.id == value return item.id == value
}) })
let name = arr[0].name; let name = arr[0].name;
@ -156,6 +158,8 @@ export default {
} else if (name == '水泥磨') { } else if (name == '水泥磨') {
this.tableName = '水泥核算' this.tableName = '水泥核算'
} }
}
}, },
//查询类型 //查询类型

9
src/views/enm_report/quality.vue
View File

@ -216,8 +216,9 @@
that.header3 = ['比表面积','SO3','掺量'];//检测项 that.header3 = ['比表面积','SO3','掺量'];//检测项
that.header4 = ['平均值','检次','合次','及格率','平均值','检次','合次','及格率','平均值','检次','合次','及格率'];//检测项 that.header4 = ['平均值','检次','合次','及格率','平均值','检次','合次','及格率','平均值','检次','合次','及格率'];//检测项
} }
let params = {}; let params = {page: 0};
let arr = []; let arr = [];
if(that.query.type==0){//日 if(that.query.type==0){//日
arr = that.query.month.split('-'); arr = that.query.month.split('-');
params.year_s = arr[0]; params.year_s = arr[0];
@ -229,7 +230,7 @@
} }
params.mgroup__belong_dept = that.query.belong_dept; params.mgroup__belong_dept = that.query.belong_dept;
this.$API.enm.enstat.req(params).then((res) => { this.$API.enm.enstat.req(params).then((res) => {
let data = res.results; let data = res;
let wrapArr = []; let wrapArr = [];
let innerArr = []; let innerArr = [];
let ind = 0; let ind = 0;
@ -292,14 +293,14 @@
itemArr[ind] = item3.val_avg.toFixed(2); itemArr[ind] = item3.val_avg.toFixed(2);
itemArr.push(item3.num_test) itemArr.push(item3.num_test)
itemArr.push(item3.num_ok) itemArr.push(item3.num_ok)
let pass = (item3.rate_pass*100).toFixed(2); let pass = (item3.rate_pass).toFixed(2);
pass= pass+'%'; pass= pass+'%';
itemArr.push(pass) itemArr.push(pass)
}else{ }else{
itemArr.push(item3.val_avg.toFixed(2)) itemArr.push(item3.val_avg.toFixed(2))
itemArr.push(item3.num_test) itemArr.push(item3.num_test)
itemArr.push(item3.num_ok) itemArr.push(item3.num_ok)
let pass = (item3.rate_pass*100).toFixed(2); let pass = (item3.rate_pass).toFixed(2);
pass= pass+'%'; pass= pass+'%';
itemArr.push(pass) itemArr.push(pass)
} }

12
src/views/enm_rm/teamAnalysis.vue
View File

@ -63,7 +63,7 @@
<th>CaO（%）</th> <th>CaO（%）</th>
<th>循环风机（KW·h/t）</th> <th>循环风机（KW·h/t）</th>
<th>尾排风机（KW·h/t）</th> <th>尾排风机（KW·h/t）</th>
<th>废气风机（KW·h/t）</th> <th>立磨主电机（KW·h/t）</th>
<th>当期值（KW·h/t）</th> <th>当期值（KW·h/t）</th>
<th>目标值（KW·h/t）</th> <th>目标值（KW·h/t）</th>
@ -216,18 +216,18 @@ export default {
item.循环风机_consume_unit != null item.循环风机_consume_unit != null
? item.循环风机_consume_unit ? item.循环风机_consume_unit
: "/"; : "/";
arr[13] = arr[14] =
item.尾排风机_consume_unit != null item.尾排风机_consume_unit != null
? item.尾排风机_consume_unit ? item.尾排风机_consume_unit
: "/"; : "/";
arr[13] = arr[15] =
item.废气风机_consume_unit != null item.立磨主电机_consume_unit != null
? item.废气风机_consume_unit ? item.立磨主电机_consume_unit
: "/"; : "/";
// //
arr[16] = item.elec_consume_unit; //当期值（KW·h/t） arr[16] = item.elec_consume_unit; //当期值（KW·h/t）
let keyVale = "goal_val_" + n; let keyVale = "goal_val_" + n;
arr[17] = goalData[keyVale]; //目标值（KW·h/t）//需要接口获取 arr[17] = goalData[keyVale]?goalData[keyVale]:0; //目标值（KW·h/t）//需要接口获取
arr[18] = item.celec_consume_unit - arr[16]; //当期与目标差值（KW·h/t） arr[18] = item.celec_consume_unit - arr[16]; //当期与目标差值（KW·h/t）
let ind_pre = 0, let ind_pre = 0,
huanbi = 0; huanbi = 0;

10
src/views/enm_rm/workshopAnalysis.vue
View File

@ -126,6 +126,7 @@ export default {
that.query.mgroup = res[0].id; that.query.mgroup = res[0].id;
//月目标 //月目标
that.getMonthGoal(); that.getMonthGoal();
that.getData();
}); });
}, },
methods: { methods: {
@ -174,7 +175,6 @@ export default {
that.monthGoal = monthGoal; that.monthGoal = monthGoal;
} }
}); });
this.getData();
} else { } else {
this.getData(); this.getData();
} }
@ -218,7 +218,7 @@ export default {
that.monthGoal[ind] !== undefined that.monthGoal[ind] !== undefined
? that.monthGoal[ind] ? that.monthGoal[ind]
: "/"; : "/";
wrapArr[ind] = arr; wrapArr.push(arr);
}); });
wrapArr.forEach((item, index) => { wrapArr.forEach((item, index) => {
let arrs = []; let arrs = [];
@ -236,13 +236,13 @@ export default {
arrs[3] = diff; arrs[3] = diff;
//环期值（KW·h/t）上个月的值 //环期值（KW·h/t）上个月的值
let lastNum = 0; let lastNum = 0;
if (index > 1) { if (index > 0) {
let num = index - 1; let num = index - 1;
if ( if (
wrapArr[num] && wrapArr[num] &&
wrapArr[num].elec_consume_unit wrapArr[num][1]
) { ) {
lastNum = wrapArr[num].elec_consume_unit; lastNum = wrapArr[num][1];
} else { } else {
lastNum = "/"; lastNum = "/";
} }

4
src/views/enm_slag/workshopAnalysis.vue
View File

@ -238,9 +238,9 @@ export default {
let num = index - 1; let num = index - 1;
if ( if (
wrapArr[num] && wrapArr[num] &&
wrapArr[num].elec_consume_unit wrapArr[num][1]
) { ) {
lastNum = wrapArr[num].elec_consume_unit; lastNum = wrapArr[num][1];
} else { } else {
lastNum = "/"; lastNum = "/";
} }

10
src/views/login/components/passwordForm.vue
View File

@ -133,10 +133,12 @@ export default {
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms)); that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
if (this.redirect) { // 去除重定向因客户不理解
base_dashboard = this.redirect; // if (this.redirect) {
} // base_dashboard = this.redirect;
else if (base_dashboard == null || base_dashboard == undefined) { // }
// else
if (base_dashboard == null || base_dashboard == undefined) {
base_dashboard = '/dashboard' base_dashboard = '/dashboard'
} }
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) { if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {

9
src/views/login/components/phoneForm.vue
View File

@ -102,10 +102,11 @@ export default {
that.$TOOL.data.set("USER_INFO", res1); that.$TOOL.data.set("USER_INFO", res1);
that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms)); that.$TOOL.data.set("PERMISSIONS", Object.keys(res1.perms));
let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard; let base_dashboard = this.$TOOL.data.get('BASE_INFO').base.base_dashboard;
if (this.redirect) { // if (this.redirect) {
base_dashboard = this.redirect; // base_dashboard = this.redirect;
} // }
else if (base_dashboard == null || base_dashboard == undefined) { // else
if (base_dashboard == null || base_dashboard == undefined) {
base_dashboard = '/dashboard' base_dashboard = '/dashboard'
} }
if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) { if (this.$TOOL.data.get('BASE_INFO').base.base_name_short.indexOf('曲阳') != -1) {