Skip to content

G
gassafety-progress
Commit 01c90c2c authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress into master

parents d92daedf 326fd455
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 35 deletions
gassafetyprogress-system/src/main/resources/mapper/system/SysUserMapper.xml
View file @ 01c90c2c
......@@ -185,7 +185,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
u.user_id,
u.dept_id,
u.user_name
u.user_name,
u.nick_name
FROM
sys_user u
LEFT JOIN sys_user_post up ON u.user_id = up.user_id
......
gassafetyprogress-system/src/main/resources/mapper/system/TWorkOrderMapper.xml
View file @ 01c90c2c
......@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
info.enterprise_name AS work_assign_enterprose_name,
workOrder.work_assign_enterprose_id,
workOrder.work_assign_man_id,
usr.user_name AS work_assign_man,
usr.nick_name AS work_assign_man,
workOrder.work_status,
workOrder.inspection_date,
workOrder.inspection_route,
......
gassafetyprogress-web/src/components/allCharsCom/Chars.vue
View file @ 01c90c2c
......@@ -12,7 +12,7 @@
<!-- <slot> -->
<!-- 如果是默认值，就显示这个 -->
<div v-if="!options" class="text" :style="{ color: color }">
<span class="num">78</span><span class="fh">%</span>
<span class="num">87</span><span class="fh">%</span>
</div>
<!-- </slot> -->
</div>
......
gassafetyprogress-web/src/views/inspectionWork/workOrder/index.vue
View file @ 01c90c2c
......@@ -265,7 +265,7 @@
<el-option
v-for="item in inspectors"
:key="item.userId "
:label="item.userName"
:label="item.nickName"
:value="item.userId "
></el-option>
</el-select>
......@@ -436,7 +436,7 @@
<el-option
v-for="item in inspectors"
:key="item.userId "
:label="item.userName"
:label="item.nickName"
:value="item.userId "
></el-option>
</el-select>
......@@ -943,11 +943,11 @@ export default {
//获取执行人
selectInspection(userId,type){
if(userId){
let userName = this.inspectors.find(val=>val.userId == userId).userName;
let nickName = this.inspectors.find(val=>val.userId == userId).nickName;
if("edit" == type){
this.form.workAssignMan = userName;
this.form.workAssignMan = nickName;
}else{
this.workForm.workAssignMan = userName;
this.workForm.workAssignMan = nickName;
}
}else{
if("edit" == type){
......
gassafetyprogress-web/src/views/operationMonitor/operationQi/index.vue
View file @ 01c90c2c
......@@ -11,17 +11,17 @@
<div class="botimage">
<img src="../../../assets/mapinages/Group1130.png" alt="" style="width: 100px;height: 100px;margin-top: 30px;">
<div class="ima">
<div style="color: #4CC4E0;font-weight: bolder;">3852</div><span style="color: #fff;">总计</span>
<div style="color: #4CC4E0;font-weight: bolder;">358275</div><span style="color: #fff;">总计</span>
</div>
</div>
<div class="botnum">
<div class="numdiv">
<p style="color: #4CC4E0;">本月新增</p>
<span style="color: #EEC25B;font-size: 30px;">1720</span><span style="color: #4CC4E0;">个</span>
<span style="color: #EEC25B;font-size: 30px;">683</span><span style="color: #4CC4E0;">个</span>
</div>
<div class="numdiv">
<p style="color: #4CC4E0;">本年新增</p>
<span style="color: #EEC25B;font-size: 30px;">2132</span><span style="color: #4CC4E0;">个</span>
<span style="color: #EEC25B;font-size: 30px;">683</span><span style="color: #4CC4E0;">个</span>
</div>
</div>
</div>
......@@ -35,17 +35,17 @@
<div class="botimage">
<img src="../../../assets/mapinages/Group1130.png" alt="" style="width: 100px;height: 100px;margin-top: 30px;">
<div class="ima">
<div style="color: #4CC4E0;font-weight: bolder;">3575</div><span style="color: #fff;">总计</span>
<div style="color: #4CC4E0;font-weight: bolder;">35358275</div><span style="color: #fff;">总计</span>
</div>
</div>
<div class="botnum">
<div class="numdiv">
<p style="color: #4CC4E0;">本月新增</p>
<span style="color: #EEC25B;font-size: 30px;">2570</span><span style="color: #4CC4E0;">个</span>
<span style="color: #EEC25B;font-size: 30px;">6833</span><span style="color: #4CC4E0;">个</span>
</div>
<div class="numdiv">
<p style="color: #4CC4E0;">本年新增</p>
<span style="color: #EEC25B;font-size: 30px;">1005</span><span style="color: #4CC4E0;">个</span>
<span style="color: #EEC25B;font-size: 30px;">623483</span><span style="color: #4CC4E0;">个</span>
</div>
</div>
</div>
......@@ -64,17 +64,17 @@
<div class="botimage">
<img src="../../../assets/mapinages/Group1130.png" alt="" style="width: 100px;height: 100px;margin-top: 30px;">
<div class="ima">
<div style="color: #4CC4E0;font-weight: bolder;">3400</div><span style="color: #fff;">总计</span>
<div style="color: #4CC4E0;font-weight: bolder;">358275</div><span style="color: #fff;">总计</span>
</div>
</div>
<div class="botnum">
<div class="numdiv">
<p style="color: #4CC4E0;">本月新增</p>
<span style="color: #EEC25B;font-size: 30px;">2150</span><span style="color: #4CC4E0;">个</span>
<span style="color: #EEC25B;font-size: 30px;">6843</span><span style="color: #4CC4E0;">个</span>
</div>
<div class="numdiv">
<p style="color: #4CC4E0;">本年新增</p>
<span style="color: #EEC25B;font-size: 30px;">1250</span><span style="color: #4CC4E0;">个</span>
<span style="color: #EEC25B;font-size: 30px;">6483</span><span style="color: #4CC4E0;">个</span>
</div>
</div>
</div>
......
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/Left.vue
View file @ 01c90c2c
......@@ -77,7 +77,7 @@ export default {
}
.title {
text-align: center;
font-size: 21px;
font-size: 24px;
margin-bottom: 7px;
}
.two {
......@@ -88,7 +88,7 @@ export default {
> .right {
}
> div {
font-size: 14px;
font-size: 16px;
flex: 1;
// display: flex;
// flex-direction: column;
......@@ -129,7 +129,7 @@ export default {
.third {
text-align: center;
width: 213px;
margin-bottom: 30px;
margin-bottom: 24px;
}
.fifth {
flex: 1;
......
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/Middle.vue
View file @ 01c90c2c
......@@ -131,7 +131,7 @@ export default {
}
.title {
text-align: center;
font-size: 21px;
font-size: 24px;
margin-bottom: 7px;
}
.two {
......@@ -163,7 +163,7 @@ export default {
.third {
text-align: center;
width: 213px;
margin-bottom: 38px;
margin-bottom: 24px;
}
}
> .right {
......@@ -177,7 +177,7 @@ export default {
}
}
> div {
font-size: 14px;
font-size: 16px;
flex: 1;
// display: flex;
// flex-direction: column;
......@@ -197,7 +197,7 @@ export default {
}
}
.three {
font-size: 14px;
font-size: 16px;
flex: 1;
// background: red;
.chars-box {
......
gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/components/Right.vue
View file @ 01c90c2c
......@@ -15,8 +15,8 @@
<div class="right">进行中</div>
</div>
<div class="three flex">
<div class="left zzz">15</div>
<div class="middle zzz">13</div>
<div class="left zzz">6</div>
<div class="middle zzz">4</div>
<div class="right zzz">2</div>
</div>
......@@ -133,7 +133,7 @@ export default {
}
.title {
text-align: center;
font-size: 21px;
font-size: 24px;
margin-bottom: 22px;
}
.two {
......@@ -158,11 +158,11 @@ export default {
}
}
.three {
font-size: 14px;
margin-bottom: 16px;
font-size: 16px;
margin-bottom: 10px;
> div {
flex: 1;
line-height: 28px;
line-height: 24px;
text-align: center;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment