admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-05-13 21:41:33 +08:00
parent ac9ac9919e
commit dac88e57f1
7 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/qiun-data-charts/qiun-data-charts.vue
View File

@ -1341,6 +1341,7 @@ export default {
},
//==============以下是uCharts的方法====================
ucinit(newVal, oldVal, owner, instance){
if(!(newVal && oldVal)) return;
if(JSON.stringify(newVal) == JSON.stringify(oldVal)){
return;
}

12
main.js
View File

@ -44,8 +44,8 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.138:5173' // 工作流地址
// Vue.prototype.work_url = 'http://139.9.66.234:5173' // 工作流地址
// Vue.prototype.work_url = 'http://192.168.34.126:5173' // 工作流地址
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
@ -86,13 +86,13 @@ if (process.env.NODE_ENV === 'development') {
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）
Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
// Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
// Vue.prototype.url_config = 'http://42.180.188.17:9809/' // 鞍钢线上地址
Vue.prototype.url_config = 'http://42.180.188.17:11211/' // 鞍钢线上测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段
// Vue.prototype.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://42.180.188.17:19997' // 工作流线上地址
Vue.prototype.work_url = 'http://42.180.188.17:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南

2
pages/projectEnd/dangerBigProject/index.vue
View File

@ -24,7 +24,7 @@
<view class="list-content">
<view class="list-info">
类别：{{item.engineeringTypeName}}
<view class="info-status" v-if="item.dangerType == 2">超危</view>
<view class="info-status" v-if="item.issuperdanger">超危</view>
</view>
</view>
</view>

20
pages/projectEnd/qualityManage/analysisAlarm.vue
View File

@ -25,7 +25,7 @@
<view class="count-statistics">
<view class="top-title">
<view class="line"></view>
<text>分包单位统计TOP10</text>
<text>分包单位质量隐患统计</text>
<view class="right-date">
<uni-datetime-picker v-model="timeCombo.timeRange2" type="daterange" rangeSeparator="至"
@change="e => confirmTimeRange(e,2)" />
@ -33,7 +33,7 @@
</view>
<view class="count-content">
<div class="chart-content">
<qiun-data-charts type="column" :opts="opts" :chartData="chartData" v-if="chartData.categories && chartData.categories.length > 0"/>
<qiun-data-charts type="column" :ontouch="true" :opts="opts" :chartData="chartData" v-if="chartData.categories && chartData.categories.length > 0"/>
<view class="noData" v-else>
<image class="noDataImg" src="../../../static/noData.png"></image>
<view>暂无数据</view>
@ -394,12 +394,14 @@
"#ea7ccc"
],
padding: [15, 15, 0, 5],
enableScroll: false,
enableScroll: true,
legend: {
show: false
},
xAxis: {
disableGrid: true
disableGrid: true,
itemCount: 5,
scrollShow: true
},
yAxis: {
data: [{
@ -702,7 +704,7 @@
}
})
},
// 分包单位TOP10
// 分包单位质量隐患统计
getStatsByEnterpriseFn() {
let that = this
let requestData = {
@ -718,12 +720,16 @@
data: requestData,
method: "post",
success(res) {
console.log(res, "获取分包单位TOP10")
console.log(res, "获取分包单位质量隐患统计")
let responseData = res.result.records;
let categoriesArr = [];
let dataArr = [];
responseData.map(item => {
categoriesArr.push(item.enterpriseName.substring(0,8) + '...')
if(item.enterpriseName.length == 4){
categoriesArr.push(item.enterpriseName)
} else {
categoriesArr.push(item.enterpriseName.substring(0,4) + '...')
}
dataArr.push(item.totalNum)
})
let chartObj = {

12
pages/projectEnd/qualityManage/index.vue
View File

@ -57,21 +57,21 @@
<view class="overLeft">常用模块</view>
<view class="modulesList">
<view class="menu" @click="goList(1)">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;" src="@/static/newZlgl1.png"></image>
<image class="icon" style="width: 30px; height: 30px;" src="@/static/newZlgl1.png"></image>
<view>检查台账</view>
</view>
<view class="menu" @click="addBtn">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;" src="@/static/newZlgl2.png"></image>
<image class="icon" style="width: 30px; height: 30px;" src="@/static/newZlgl2.png"></image>
<view>新增检查</view>
</view>
<view class="menu" @click="addPrjcet">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;" src="@/static/xmzlzj.jpg"></image>
<image class="icon" style="width: 30px; height: 30px;" src="@/static/xmzlzj.jpg"></image>
<view>项目质量自检</view>
</view>
<!-- <view class="menu" @click="qualityAlarm">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;" src="@/static/qualityAlarm.png"></image>
<view class="menu" @click="qualityAlarm">
<image class="icon" style="width: 30px; height: 30px;" src="@/static/qualityAlarm.png"></image>
<view>质量分析预警</view>
</view> -->
</view>
</view>
</view>

20
pages/projectEnd/safeSame/analysisAlarm.vue
View File

@ -25,7 +25,7 @@
<view class="count-statistics">
<view class="top-title">
<view class="line"></view>
<text>分包单位统计TOP10</text>
<text>分包单位安全隐患统计</text>
<view class="right-date">
<uni-datetime-picker v-model="timeCombo.timeRange2" type="daterange" rangeSeparator="至"
@change="e => confirmTimeRange(e,2)" />
@ -33,7 +33,7 @@
</view>
<view class="count-content">
<div class="chart-content">
<qiun-data-charts type="column" :opts="opts" :chartData="chartData" v-if="chartData.categories && chartData.categories.length > 0"/>
<qiun-data-charts type="column" :ontouch="true" :opts="opts" :chartData="chartData" v-if="chartData.categories && chartData.categories.length > 0"/>
<view class="noData" v-else>
<image class="noDataImg" src="../../../static/noData.png"></image>
<view>暂无数据</view>
@ -394,12 +394,14 @@
"#ea7ccc"
],
padding: [15, 15, 0, 5],
enableScroll: false,
enableScroll: true,
legend: {
show: false
},
xAxis: {
disableGrid: true
disableGrid: true,
itemCount: 5,
scrollShow: true
},
yAxis: {
data: [{
@ -702,7 +704,7 @@
}
})
},
// 分包单位TOP10
// 分包单位安全隐患统计
getStatsByEnterpriseFn() {
let that = this
let requestData = {
@ -718,12 +720,16 @@
data: requestData,
method: "post",
success(res) {
console.log(res, "获取分包单位TOP10")
console.log(res, "分包单位安全隐患统计")
let responseData = res.result.records;
let categoriesArr = [];
let dataArr = [];
responseData.map(item => {
categoriesArr.push(item.enterpriseName.substring(0,8) + '...')
if(item.enterpriseName.length == 4){
categoriesArr.push(item.enterpriseName)
} else {
categoriesArr.push(item.enterpriseName.substring(0,4) + '...')
}
dataArr.push(item.totalNum)
})
let chartObj = {

10
pages/projectEnd/safeSame/index.vue
View File

@ -57,27 +57,27 @@
<view class="overLeft">常用模块</view>
<view class="modulesList">
<view class="menu" @click="goList(1)">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;"
<image class="icon" style="width: 30px; height: 30px;"
src="@/static/newZlgl1.png"></image>
<view>检查台账</view>
</view>
<view class="menu" @click="addBtn">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;"
<image class="icon" style="width: 30px; height: 30px;"
src="@/static/newZlgl2.png"></image>
<view>新增检查</view>
</view>
<view class="menu" @click="addPrjcet">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;" src="@/static/xmzlzj.jpg">
<image class="icon" style="width: 30px; height: 30px;" src="@/static/xmzlzj.jpg">
</image>
<view>项目安全自检</view>
</view>
<view class="menu" @click="jumpPage">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;"
<image class="icon" style="width: 30px; height: 30px;"
src="@/static/safeMange/danger_check.png"></image>
<view>危大验收</view>
</view>
<view class="menu" @click="qualityAlarm">
<image class="icon" style="width: 30px; height: 30px; margin-right: 7px;" src="@/static/safeAlarm.png">
<image class="icon" style="width: 30px; height: 30px;" src="@/static/safeAlarm.png">
</image>
<view>安全分析预警</view>
</view>