admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-rain

Browse Source
This commit is contained in:
Rain 2024-06-28 11:27:29 +08:00
commit c24f3282d3
4 changed files with 60 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/store/index.js
View File

@ -52,19 +52,19 @@ export default new Vuex.Store({
// FILEURL:'http://182.90.224.237:51234/image/', // FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地 // FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 // UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 // FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地) // WORKFLOWURL: "http://192.168.34.129:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl ? BASEURL: baseUrl ?
// baseUrl : baseUrl :
// window.location.protocol + "//" + window.location.host + "/", //正式环境 window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 UPLOADURL: window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址

66
src/views/projectAdmin/projectIndex.vue
View File

@ -12,26 +12,10 @@
> >
<!-- <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> --> <!-- <div class="module_title">{{$t('message.homeLayout.existingProducts')}}</div> -->
<div class="projectIndex" id="projectIndex"> <div class="projectIndex" id="projectIndex">
<template <template v-for="(item, index) in list">
v-for="(item, index) in list"> <div style="width: 100%;height: 1px;" v-if="index == 0 || (index > 0 && list[index - 1].labelName != item.labelName)"></div>
<div <div class="moduleBox" v-if="item.operation" >
style="width: 100%;height: 1px;" <div class="module_title" v-if=" index == 0 || (index > 0 && list[index - 1].labelName != item.labelName)">
v-if="
index == 0 ||
(index > 0 && list[index - 1].labelName != item.labelName)
"
></div>
<div
class="moduleBox"
v-if="item.operation"
>
<div
class="module_title"
v-if="
index == 0 ||
(index > 0 && list[index - 1].labelName != item.labelName)
"
>
{{ item.labelName }} {{ item.labelName }}
</div> </div>
<div <div
@ -341,26 +325,27 @@ export default {
// 新用户功能模块 // 新用户功能模块
if(this.$store.state.userInfo.accountType == 10){ if(this.$store.state.userInfo.accountType == 10){
getNewUserAllModulePageApi({ getNewUserAllModulePageApi({
projectSn: this.projectSn, projectSn: this.projectSn,
userId: this.$store.state.userInfo.userId, userId: this.$store.state.userInfo.userId,
moduleType: 2, moduleType: 2,
}).then((res) => { }).then((res) => {
if (res.success) { if (res.success) {
var all = res.result.moduleList; var all = res.result.moduleList;
console.log("all", all); console.log("all", all);
all.forEach((element, index) => { all.forEach((element, index) => {
all[index].operation = false; all[index].operation = false;
res.result.menuList.forEach((element2) => { res.result.menuList.forEach((element2) => {
console.log(element2,77888) console.log(element2,77888)
if (element2.moduleId == element.moduleId) { if (element2.moduleId == element.moduleId) {
all[index].operation = true; all[index].operation = true;
} }
});
}); });
}); console.log("all111", all);
console.log("all111", all); // this.list = all;
this.list = all; this.list = all.filter(item => item.plugin != 'contractors');//承包商模块不需要在后台显示，以此过滤掉该后台模块
} }
}); });
} else { } else {
getAllModuleApi({ getAllModuleApi({
moduleType: 2, moduleType: 2,
@ -378,7 +363,8 @@ export default {
} }
}); });
}); });
this.list = all; // this.list = all;
this.list = all.filter(item => item.plugin != 'contractors');//承包商模块不需要在后台显示，以此过滤掉该后台模块
} }
}); });
} }

50
src/views/projectFront/entryCode/myHome.vue
View File

@ -58,14 +58,14 @@
:style="{ 'color': fontColor, fontSize: backimgFontSize * 0.9 + 'px' }" :style="{ 'color': fontColor, fontSize: backimgFontSize * 0.9 + 'px' }"
> >
<p v-if="WorkerInfo.safeScore >= 90">无风险</p> <p v-if="WorkerInfo.safeScore >= 80">无风险</p>
<p v-if="WorkerInfo.safeScore >= 80 && WorkerInfo.safeScore < 90"><i <p v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"><i
v-if="WorkerInfo.safeScore < 90" v-if="WorkerInfo.safeScore < 80"
class="el-icon-warning" class="el-icon-warning"
:style="{ 'color': fontColor }" :style="{ 'color': fontColor }"
></i>低风险</p> ></i>低风险</p>
<p v-if="WorkerInfo.safeScore < 80"><i <p v-if="WorkerInfo.safeScore < 60"><i
v-if="WorkerInfo.safeScore < 90" v-if="WorkerInfo.safeScore < 80"
class="el-icon-warning" class="el-icon-warning"
:style="{ 'color': fontColor }" :style="{ 'color': fontColor }"
></i>高风险</p> ></i>高风险</p>
@ -101,7 +101,7 @@
<div <div
class="text" class="text"
v-if="WorkerInfo.safeScore >= 90 && backimgwidth != 0" v-if="WorkerInfo.safeScore >= 80 && backimgwidth != 0"
:style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px' }" :style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px' }"
> >
通过后台查询到，您无扣分风险 通过后台查询到，您无扣分风险
@ -109,7 +109,7 @@
<div <div
class="text2" class="text2"
v-if="WorkerInfo.safeScore < 90 && backimgwidth != 0" v-if="WorkerInfo.safeScore < 80 && backimgwidth != 0"
:style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', paddingBottom: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px', width: backimgFontSize * 13.35 + 'px' }" :style="{ 'color': fontColor, paddingTop: backimgFontSize * 0.3 + 'px', paddingBottom: backimgFontSize * 0.3 + 'px', height: backimgFontSize * 7 + 'px', width: backimgFontSize * 13.35 + 'px' }"
> >
<div <div
@ -134,25 +134,25 @@
</div> </div>
<div <div
class="foot" class="foot"
v-if="WorkerInfo.safeScore >= 90" v-if="WorkerInfo.safeScore >= 80"
:style="{ 'color': fontColor, 'left': '40%', paddingTop: backimgFontSize * 0.4 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }" :style="{ 'color': fontColor, 'left': '40%', paddingTop: backimgFontSize * 0.4 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
> >
可通行 可通行
</div> </div>
<div <div
class="foot" class="foot"
v-if="WorkerInfo.safeScore >= 80 && WorkerInfo.safeScore < 90" v-if="WorkerInfo.safeScore >= 60 && WorkerInfo.safeScore < 80"
:style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
>
安全分已经低于90分
</div>
<div
class="foot"
v-if="WorkerInfo.safeScore < 80"
:style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }" :style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
> >
安全分已经低于80分 安全分已经低于80分
</div> </div>
<div
class="foot"
v-if="WorkerInfo.safeScore < 60"
:style="{ 'color': fontColor, 'left': '21%', paddingTop: backimgFontSize * 0.2 + 'px', fontSize: backimgFontSize * 0.9 + 'px' }"
>
安全分已经低于60分
</div>
</div> </div>
</div> </div>
@ -323,33 +323,33 @@ export default {
this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}`; this.currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
}, },
setImg (fenshu) { setImg (fenshu) {
if (fenshu >= 90) { if (fenshu >= 80) {
this.srcImgUrl = this.imgUrl.img1; this.srcImgUrl = this.imgUrl.img1;
} else if (fenshu >= 80 && fenshu < 90) { } else if (fenshu >= 60 && fenshu < 80) {
this.srcImgUrl = this.imgUrl.img2; this.srcImgUrl = this.imgUrl.img2;
} else if (fenshu < 80) { } else if (fenshu < 60) {
this.srcImgUrl = this.imgUrl.img3; this.srcImgUrl = this.imgUrl.img3;
} }
}, },
setColor (fenshu) { setColor (fenshu) {
if (fenshu >= 90) { if (fenshu >= 80) {
this.fontColor = "green"; this.fontColor = "green";
} else if (fenshu >= 80 && fenshu < 90) { } else if (fenshu >= 60 && fenshu < 80) {
// this.fontColor = "rgb(255, 230, 0)"; // this.fontColor = "rgb(255, 230, 0)";
this.fontColor = "#D47300" this.fontColor = "#D47300"
} else if (fenshu < 80) { } else if (fenshu < 60) {
// this.fontColor = "red"; // this.fontColor = "red";
this.fontColor = "#EA3941" this.fontColor = "#EA3941"
} }
}, },
setCodeColor (fenshu) { setCodeColor (fenshu) {
if (fenshu >= 90) { if (fenshu >= 80) {
this.codeColor = "green"; this.codeColor = "green";
} else if (fenshu >= 80 && fenshu < 90) { } else if (fenshu >= 60 && fenshu < 80) {
// this.fontColor = "rgb(255, 230, 0)"; // this.fontColor = "rgb(255, 230, 0)";
this.codeColor = "#F7C409" this.codeColor = "#F7C409"
} else if (fenshu < 80) { } else if (fenshu < 60) {
// this.fontColor = "red"; // this.fontColor = "red";
this.codeColor = "#F0212A" this.codeColor = "#F0212A"
} }

2
src/views/projectFront/safetyEducation/securityRiskAnalysis.vue
View File

@ -83,7 +83,7 @@
infinite-scroll-disabled="disabled"> infinite-scroll-disabled="disabled">
<el-row class="tablelist-box" v-for="(ele, index) in workerList" :key="index"> <el-row class="tablelist-box" v-for="(ele, index) in workerList" :key="index">
<el-col v-for="item in ele" :key="item.id" <el-col v-for="item in ele" :key="item.id"
:class="{ 'bg-ecf': item.safeScore >= 90, 'bg-fcf': item.safeScore >= 80, 'bg-ffe': item.safeScore < 80 }" :class="{ 'bg-ecf': item.safeScore >= 80, 'bg-fcf': item.safeScore >= 60, 'bg-ffe': item.safeScore < 60 }"
@click.native="onDeductScore(item)" :span="4">{{ item.workerName }}</el-col> @click.native="onDeductScore(item)" :span="4">{{ item.workerName }}</el-col>
</el-row> </el-row>
<!-- <el-row class="tablelist-box"> <!-- <el-row class="tablelist-box">