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

fix: BUG修改

Browse Source
This commit is contained in:
cjp 2023-07-26 09:49:30 +08:00
parent 386153089d
commit e9862f5245
8 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,11 +72,12 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新 // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址 // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
// axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上 // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1) // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式 // axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
// axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/ // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
// axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:8188' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:30001' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:30002' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地 // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖 // axios.defaults.baseURL ='http://61.145.163.135:12345' //坪山沙湖
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上

8
src/components/account.vue
View File

@ -70,16 +70,16 @@
class="width_100" class="width_100"
@click="goProjectBackstage" @click="goProjectBackstage"
v-if=" v-if="
$route.path.indexOf('/projectIndex') == -1 || $route.path.indexOf('/equipmentCenterIndx') == -1 &&
($route.path.indexOf('/equipmentCenterIndx') == -1 &&
$store.state.userInfo.accountType != 5 && $store.state.userInfo.accountType != 5 &&
$store.state.userInfo.accountType != 6 && $store.state.userInfo.accountType != 6 &&
$store.state.userInfo.enterProjectBackType == 0) $store.state.userInfo.enterProjectBackType === 0
" "
> >
<img src="@/assets/images/xmht.png" width="15px" height="15px" /> <img src="@/assets/images/xmht.png" width="15px" height="15px" />
<!-- $t("message.companyDiagram.projectBackEnd") --> <!-- $t("message.companyDiagram.projectBackEnd") -->
<span>{{ projectBackground }}</span> <span>{{ projectBackground }}
</span>
</div> </div>
<!-- 设备中台 --> <!-- 设备中台 -->
<div <div

4
src/store/index.js
View File

@ -44,8 +44,8 @@ export default new Vuex.Store({
state: { state: {
PAGESIZRS: [10, 20, 30, 50], PAGESIZRS: [10, 20, 30, 50],
UPLOADURL:'http://192.168.34.221:12360/upload/image',// 郭圣雄 UPLOADURL:'http://192.168.34.221:30001/upload/image/',// 郭圣雄
FILEURL:'http://192.168.34.221:12360/image/',//郭圣雄 FILEURL:'http://192.168.34.221:30001/image/',//郭圣雄
// UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
// FILEURL:'http://10.0.1.43:6023/image/',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试
BASEURL: baseUrl BASEURL: baseUrl

8
src/views/companyAdmin/bigScreen/index.vue
View File

@ -124,7 +124,7 @@
<li> <li>
<span>质量</span> <span>质量</span>
<p> <p>
待整改：<b>{{ qualityCount.notCloseNum }}</b> 待整改：<b>{{ qualityCount.rectificationNum }}</b>
</p> </p>
<p> <p>
整改率：<b>{{ qualityCount.completeRatio }}%</b> 整改率：<b>{{ qualityCount.completeRatio }}%</b>
@ -133,7 +133,7 @@
<li> <li>
<span>安全</span> <span>安全</span>
<p> <p>
待整改：<b>{{ securityCount.notRectificationNum }}</b> 待整改：<b>{{ securityCount.rectificationNum }}</b>
</p> </p>
<p> <p>
整改率：<b>{{ securityCount.completeRatio }}%</b> 整改率：<b>{{ securityCount.completeRatio }}%</b>
@ -583,7 +583,7 @@ export default {
selectProjectWorkAndInspectCount({ selectProjectWorkAndInspectCount({
projectSn: data.projectSn, projectSn: data.projectSn,
}).then((res) => { }).then((res) => {
console.log(res); console.log('大屏项目',res);
if (res.code == 200) { if (res.code == 200) {
this.personCount = res.result.personCount; this.personCount = res.result.personCount;
this.attendancePerson = this.personCount.attendancePerson; this.attendancePerson = this.personCount.attendancePerson;
@ -653,7 +653,7 @@ export default {
sn: this.projectSn, sn: this.projectSn,
}; };
selectCompanyProjectTypeCountApi(data).then((res) => { selectCompanyProjectTypeCountApi(data).then((res) => {
// console.log(res.result) console.log('大屏顶部数据',res.result)
if (res.code == 200) { if (res.code == 200) {
this.companyProjectData = res.result; this.companyProjectData = res.result;
this.projectCount = res.result.count; this.projectCount = res.result.count;

6
src/views/companyAdmin/bigScreen/leftMenu.vue
View File

@ -268,6 +268,7 @@ export default {
} }
arr.sort(sortNum) arr.sort(sortNum)
this.newProjectData = arr this.newProjectData = arr
console.log("项目概览数据",arr)
if (this.pageType == 1 ){ if (this.pageType == 1 ){
this.$nextTick(()=>{ this.$nextTick(()=>{
this.createEchart1(); this.createEchart1();
@ -468,6 +469,7 @@ export default {
let data1 = [], let data1 = [],
data2 = [], data2 = [],
data3 = []; data3 = [];
console.log("左上角数据",this.projectData)
this.projectData.list.forEach((item)=>{ this.projectData.list.forEach((item)=>{
for(let j = 1; j < 13; j++){ for(let j = 1; j < 13; j++){
if(Number(item.monthTitle.split('-')[1]) == j){ if(Number(item.monthTitle.split('-')[1]) == j){
@ -593,7 +595,7 @@ export default {
} }
] ]
} }
// console.log("左上角项目概览数据",data1,data2,data3)
echart1.setOption(this.option1); echart1.setOption(this.option1);
}, },
createEchart2(){ createEchart2(){
@ -949,7 +951,7 @@ export default {
.seamless-warp{ .seamless-warp{
width: 100%; width: 100%;
height: 164px; height: 80px;
overflow: auto; overflow: auto;
li:nth-child(2n){ li:nth-child(2n){
background: rgba(2, 251, 226, 0.07); background: rgba(2, 251, 226, 0.07);

12
src/views/companyAdmin/bigScreen/rightMenu.vue
View File

@ -19,9 +19,10 @@
<div class="list-item" v-if="pageType == 1"> <div class="list-item" v-if="pageType == 1">
<div class="item-content"> <div class="item-content">
<div class="item-title"><span></span>巡检情况</div> <div class="item-title"><span></span>巡检情况</div>
<div class="item-detail">暂无数据 <div class="item-detail">
<!-- <div class="condition-title">检查总数<span>208</span></div> <!-- 暂无数据 -->
<div ref="echart1" style="width:100%; height:148px"></div> --> <div class="condition-title">检查总数<span>208</span></div>
<div ref="echart1" style="width:100%; height:148px"></div>
</div> </div>
</div> </div>
</div> </div>
@ -29,8 +30,9 @@
<div class="list-item" v-if="pageType == 1"> <div class="list-item" v-if="pageType == 1">
<div class="item-content"> <div class="item-content">
<div class="item-title"><span></span>累计预警工程排行</div> <div class="item-title"><span></span>累计预警工程排行</div>
<div class="item-detail">暂无数据 <div class="item-detail">
<!-- <div ref="echart2" style="width:100%; height:177px"></div> --> <!-- 暂无数据 -->
<div ref="echart2" style="width:100%; height:177px"></div>
</div> </div>
</div> </div>
</div> </div>

18
src/views/projectAdmin/dataBoard/laborManage.vue
View File

@ -593,9 +593,9 @@ export default {
}).then((res) => { }).then((res) => {
console.log('在场人员', res) console.log('在场人员', res)
this.inSecenList = res.result this.inSecenList = res.result
this.timer = window.setTimeout(() => { // this.timer = window.setTimeout(() => {
this.selectProjectPresentWorkerList() // this.selectProjectPresentWorkerList()
}, 5000) // }, 5000)
}) })
}, },
//项目人员统计 //项目人员统计
@ -610,17 +610,17 @@ export default {
var json2 = this.statisticsCount.workercount var json2 = this.statisticsCount.workercount
var yData1 = [ var yData1 = [
json1.age18, json1.age18,
json1.age18to25, json1.age18to25 + json1.age25to35 + json1.age35to45,
json1.age25to35, // json1.age25to35,
json1.age35to45, // json1.age35to45,
json1.age45to60, json1.age45to60,
json1.age60 json1.age60
] ]
var yData2 = [ var yData2 = [
json2.age18, json2.age18,
json2.age18to25, json2.age18to25 + json1.age25to35 + json1.age35to45,
json2.age25to35, // json2.age25to35,
json2.age35to45, // json2.age35to45,
json2.age45to60, json2.age45to60,
json2.age60 json2.age60
] ]

6
src/views/projectFront/highModulus/pointManage.vue
View File

@ -164,8 +164,7 @@
<el-input <el-input
size="medium" size="medium"
v-model="scope.row.warningValue" v-model="scope.row.warningValue"
onkeyup="if(isNaN(value))execCommand('undo')" type="number"
onafterpaste="if(isNaN(value))execCommand('undo')"
oninput="if(value.length>3)value=value.slice(0,3)" oninput="if(value.length>3)value=value.slice(0,3)"
></el-input> ></el-input>
</template> </template>
@ -179,8 +178,7 @@
<el-input <el-input
size="medium" size="medium"
v-model="scope.row.alarmValue" v-model="scope.row.alarmValue"
onkeyup="if(isNaN(value))execCommand('undo')" type="number"
onafterpaste="if(isNaN(value))execCommand('undo')"
oninput="if(value.length>3)value=value.slice(0,3)" oninput="if(value.length>3)value=value.slice(0,3)"
></el-input> ></el-input>
</template> </template>