fix: BUG修改
This commit is contained in:
parent
3eacd353b2
commit
ac9ac9919e
8
main.js
8
main.js
@ -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,8 +2,8 @@
|
||||
"name" : "智慧安全", //中建四局
|
||||
"appid" : "__UNI__4AA4101",
|
||||
"description" : "",
|
||||
"versionName" : "1.5.2",
|
||||
"versionCode" : 152,
|
||||
"versionName" : "1.5.3",
|
||||
"versionCode" : 153,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
||||
14
pages.json
14
pages.json
@ -472,8 +472,11 @@
|
||||
{
|
||||
"path": "pages/projectEnd/qualityManage/analysisAlarm",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
"navigationBarTitleText": "质量管理",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "default",
|
||||
"navigationBarBackgroundColor": "#2B8DF3",
|
||||
"navigationBarTextStyle":"white"//标题栏字体颜色
|
||||
}
|
||||
},
|
||||
{
|
||||
@ -486,8 +489,11 @@
|
||||
{
|
||||
"path": "pages/projectEnd/safeSame/analysisAlarm",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
"navigationBarTitleText": "安全管理",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "default",
|
||||
"navigationBarBackgroundColor": "#2B8DF3",
|
||||
"navigationBarTextStyle":"white"//标题栏字体颜色
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<headers class="fixedheader" :showBack="true">
|
||||
<!-- <headers class="fixedheader" :showBack="true">
|
||||
<view class="headerName">
|
||||
质量管理
|
||||
</view>
|
||||
</headers>
|
||||
</headers> -->
|
||||
<view class="count-statistics">
|
||||
<view class="top-title">
|
||||
<view class="line"></view>
|
||||
@ -165,8 +165,8 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="question-content">
|
||||
<qiun-data-charts type="bar" :opts="questionOpts" :chartData="questionChartData" v-if="questionChartData.categories"/>
|
||||
<view class="noData" v-else>
|
||||
<qiun-data-charts type="bar" :opts="questionOpts" :chartData="questionChartData" v-show="questionChartData.categories"/>
|
||||
<view class="noData" v-show="!questionChartData.categories">
|
||||
<image class="noDataImg" src="../../../static/noData.png"></image>
|
||||
<view>暂无数据</view>
|
||||
</view>
|
||||
@ -520,6 +520,9 @@
|
||||
]
|
||||
};
|
||||
that.questionChartData = JSON.parse(JSON.stringify(chartObj));
|
||||
setTimeout(function(){
|
||||
that.$forceUpdate();
|
||||
},500)
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -720,7 +723,7 @@
|
||||
let categoriesArr = [];
|
||||
let dataArr = [];
|
||||
responseData.map(item => {
|
||||
categoriesArr.push(item.enterpriseName)
|
||||
categoriesArr.push(item.enterpriseName.substring(0,8) + '...')
|
||||
dataArr.push(item.totalNum)
|
||||
})
|
||||
let chartObj = {
|
||||
@ -796,9 +799,7 @@
|
||||
padding: 30rpx 20rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-top: 100rpx;
|
||||
background-color: #F4F5FD;
|
||||
|
||||
.fixedheader {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<view class="content">
|
||||
<headers class="fixedheader" :showBack="true">
|
||||
<!-- <headers class="fixedheader" :themeType="true" :showBack="true">
|
||||
<view class="headerName">
|
||||
安全管理
|
||||
</view>
|
||||
</headers>
|
||||
</headers> -->
|
||||
<view class="count-statistics">
|
||||
<view class="top-title">
|
||||
<view class="line"></view>
|
||||
@ -165,8 +165,8 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="question-content">
|
||||
<qiun-data-charts type="bar" :opts="questionOpts" :chartData="questionChartData" v-if="questionChartData.categories"/>
|
||||
<view class="noData" v-else>
|
||||
<qiun-data-charts type="bar" :opts="questionOpts" :chartData="questionChartData" v-show="questionChartData.categories"/>
|
||||
<view class="noData" v-show="!questionChartData.categories">
|
||||
<image class="noDataImg" src="../../../static/noData.png"></image>
|
||||
<view>暂无数据</view>
|
||||
</view>
|
||||
@ -520,6 +520,9 @@
|
||||
]
|
||||
};
|
||||
that.questionChartData = JSON.parse(JSON.stringify(chartObj));
|
||||
setTimeout(function(){
|
||||
that.$forceUpdate();
|
||||
},500)
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -720,7 +723,7 @@
|
||||
let categoriesArr = [];
|
||||
let dataArr = [];
|
||||
responseData.map(item => {
|
||||
categoriesArr.push(item.enterpriseName)
|
||||
categoriesArr.push(item.enterpriseName.substring(0,8) + '...')
|
||||
dataArr.push(item.totalNum)
|
||||
})
|
||||
let chartObj = {
|
||||
@ -797,9 +800,7 @@
|
||||
padding: 30rpx 20rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
padding-top: 100rpx;
|
||||
background-color: #F4F5FD;
|
||||
|
||||
.fixedheader {
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user