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

flx：修改bug

Browse Source
This commit is contained in:
”Rain“ 2024-05-23 20:04:48 +08:00
parent 109b34424f
commit 39e3917d38
5 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assets/js/http.js
View File

@ -84,8 +84,8 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈

2
src/views/projectFront/projectSummary/cooperationUnit.vue
View File

@ -348,6 +348,8 @@
v-model="enterpriseForm.bankcardnumber" v-model="enterpriseForm.bankcardnumber"
:placeholder="$t('message.laborMange.placeholder2')" :placeholder="$t('message.laborMange.placeholder2')"
type="number" type="number"
@wheel.native.prevent
oninput ="value=value.replace(/[^0-9.]/g,'')"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

8
src/views/projectFront/quality/qualityAnalysis.vue
View File

@ -650,7 +650,7 @@ export default {
{ {
name: '重大风险', name: '重大风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.greatFaultLevelNum), data: this.riskList.map(item => item.greatFaultLevelNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(255,0,0,1)', color: 'rgba(255,0,0,1)',
@ -661,7 +661,7 @@ export default {
{ {
name: '较大风险', name: '较大风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.largerRiskNum), data: this.riskList.map(item => item.largerRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(255,153,1,1)', color: 'rgba(255,153,1,1)',
@ -672,7 +672,7 @@ export default {
{ {
name: '一般风险', name: '一般风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.generalRiskNum), data: this.riskList.map(item => item.generalRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(255,255,2,1)', color: 'rgba(255,255,2,1)',
@ -683,7 +683,7 @@ export default {
{ {
name: '低风险', name: '低风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.lowRiskNum), data: this.riskList.map(item => item.lowRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(0,0,255,1)', color: 'rgba(0,0,255,1)',

10
src/views/projectFront/safetyEducation/safetyAnalysis.vue
View File

@ -578,7 +578,7 @@ export default {
// 折线图 // 折线图
lineCharts(el) { lineCharts(el) {
let ageChart = echarts.init(el); let ageChart = echarts.init(el);
console.log(this.riskList)
let option = { let option = {
tooltip: { tooltip: {
trigger: 'axis' trigger: 'axis'
@ -645,7 +645,7 @@ export default {
{ {
name: '重大风险', name: '重大风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.greatFaultLevelNum), data: this.riskList.map(item => item.greatFaultLevelNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(255,0,0,1)', color: 'rgba(255,0,0,1)',
@ -656,7 +656,7 @@ export default {
{ {
name: '较大风险', name: '较大风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.largerRiskNum), data: this.riskList.map(item => item.largerRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(255,153,1,1)', color: 'rgba(255,153,1,1)',
@ -667,7 +667,7 @@ export default {
{ {
name: '一般风险', name: '一般风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.generalRiskNum), data: this.riskList.map(item => item.generalRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(255,255,2,1)', color: 'rgba(255,255,2,1)',
@ -678,7 +678,7 @@ export default {
{ {
name: '低风险', name: '低风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.riskList.map(item => item.lowRiskNum), data: this.riskList.map(item => item.lowRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: 'rgba(0,0,255,1)', color: 'rgba(0,0,255,1)',

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

@ -117,15 +117,15 @@
<div class="box-between1"> <div class="box-between1">
<div>人员扣分记录</div> <div>人员扣分记录</div>
</div> </div>
<div class="dialog-box2" v-for="item in deductScoreInfo.deductScoreList" :key="item.id"> <div class="dialog-main">
<div> <div class="dialog-box2" v-for="item in deductScoreInfo.deductScoreList" :key="item.id">
<div>{{ deductScoreInfo.workerName }}</div> <div>
<div>扣分分数: {{ item.deductScore }}</div> <div>{{ deductScoreInfo.workerName }}</div>
<div>扣分分数: {{ item.deductScore }}</div>
</div>
<div>扣分原因：{{ item.deductReason }}</div>
</div> </div>
<div>扣分原因：{{ item.deductReason }}</div> <div style="position: relative;height: 100%;" v-if="deductScoreInfo.deductScoreList.length == 0">
</div>
<div style="position: relative;height: 50%;">
<div v-if="deductScoreInfo.deductScoreList.length == 0">
<div class="placeholderBox"> <div class="placeholderBox">
<img src="@/assets/images/noData.png" alt="" /> <img src="@/assets/images/noData.png" alt="" />
<p>暂无数据</p> <p>暂无数据</p>
@ -398,7 +398,7 @@ export default {
{ {
name: '低风险', name: '低风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.statsEnterpriseList.map(item => item.lowRiskNum), data: this.statsEnterpriseList.map(item => item.lowRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: '#FFE500', color: '#FFE500',
@ -407,7 +407,7 @@ export default {
{ {
name: '中风险', name: '中风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.statsEnterpriseList.map(item => item.mediumRiskNum), data: this.statsEnterpriseList.map(item => item.mediumRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: '#FF9901', color: '#FF9901',
@ -416,7 +416,7 @@ export default {
{ {
name: '高风险', name: '高风险',
type: 'line', type: 'line',
stack: 'Total', // stack: 'Total',
data: this.statsEnterpriseList.map(item => item.highRiskNum), data: this.statsEnterpriseList.map(item => item.highRiskNum),
itemStyle: { //颜色 默认灰色 itemStyle: { //颜色 默认灰色
color: '#FF0000', color: '#FF0000',
@ -633,17 +633,23 @@ export default {
/deep/ .el-dialog__body { /deep/ .el-dialog__body {
padding-top: 10px; padding-top: 10px;
height: 480px; height: 480px;
overflow: hidden
}
.dialog-main {
overflow-y: scroll; overflow-y: scroll;
height: 65%;
padding-bottom: 20px;
} }
// 美化滚动条 // 美化滚动条
/deep/ .el-dialog__body::-webkit-scrollbar, .dialog-main::-webkit-scrollbar,
/deep/ .el-tabs__content::-webkit-scrollbar { /deep/ .el-tabs__content::-webkit-scrollbar {
width: 6px; width: 6px;
height: 6px; height: 6px;
} }
/deep/ .el-dialog__body::-webkit-scrollbar-track, .dialog-main::-webkit-scrollbar-track,
/deep/ .el-tabs__content::-webkit-scrollbar-track { /deep/ .el-tabs__content::-webkit-scrollbar-track {
width: 6px; width: 6px;
background: rgba(#101F1C, 0.1); background: rgba(#101F1C, 0.1);
@ -652,7 +658,7 @@ export default {
border-radius: 2em; border-radius: 2em;
} }
/deep/ .el-dialog__body::-webkit-scrollbar-thumb, .dialog-main::-webkit-scrollbar-thumb,
/deep/ .el-tabs__content::-webkit-scrollbar-thumb { /deep/ .el-tabs__content::-webkit-scrollbar-thumb {
background-color: rgba(144, 147, 153, .5); background-color: rgba(144, 147, 153, .5);
background-clip: padding-box; background-clip: padding-box;
@ -664,7 +670,7 @@ export default {
cursor: pointer; cursor: pointer;
} }
/deep/ .el-dialog__body::-webkit-scrollbar-thumb:hover, .dialog-main::-webkit-scrollbar-thumb:hover,
/deep/ .el-tabs__content::-webkit-scrollbar-thumb:hover { /deep/ .el-tabs__content::-webkit-scrollbar-thumb:hover {
background-color: rgba(144, 147, 153, .3); background-color: rgba(144, 147, 153, .3);
} }