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

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-04-30 02:35:10 +08:00
parent a5afd084e7
commit a67c9388d3
17 changed files with 117 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.js
View File

@ -79,12 +79,12 @@ if (process.env.NODE_ENV === 'development') {
console.log('生产环境') console.log('生产环境')
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址 // 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://10.168.1.104:11111/' // 线上地址
Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址 // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址
// Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址 Vue.prototype.url_config = 'http://47.93.215.234:11211/' // 鞍钢测试地址
// Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' // 百色三标段
// Vue.prototype.url_config = 'http://192.168.34.221:9111/' // 百色三标段 // 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://47.93.215.234:19997' // 工作流线上地址
// Vue.prototype.work_url = 'http://47.93.215.234:19097' // 工作流测试地址 Vue.prototype.work_url = 'http://47.93.215.234:19097' // 工作流测试地址
// Vue.prototype.work_url = 'http://192.168.34.139:5173' // 工作流地址 // 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://182.90.224.147:100/' //演示平台
// Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南 // Vue.prototype.url_config ='http://124.71.178.44:8012/' // 河南

93
pages.json
View File

@ -457,6 +457,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "pages/projectEnd/safeSame/projectList",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/projectEnd/qualityManage/index", "path": "pages/projectEnd/qualityManage/index",
"style": { "style": {
@ -464,6 +471,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "pages/projectEnd/safeSame/index",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/projectEnd/qualityManage/list", "path": "pages/projectEnd/qualityManage/list",
"style": { "style": {
@ -471,6 +485,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "pages/projectEnd/safeSame/list",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/projectEnd/safeManage/list", "path": "pages/projectEnd/safeManage/list",
"style": { "style": {
@ -485,6 +506,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "pages/projectEnd/safeSame/details",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/projectEnd/safeManage/details", "path": "pages/projectEnd/safeManage/details",
"style": { "style": {
@ -499,6 +527,13 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{
"path": "pages/projectEnd/safeSame/addIssue",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{ {
"path": "pages/projectEnd/carWashManage/index", "path": "pages/projectEnd/carWashManage/index",
"style": { "style": {
@ -584,14 +619,24 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { },
{
"path": "pages/projectEnd/qualityManage/reply", "path": "pages/projectEnd/qualityManage/reply",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, { },
{
"path": "pages/projectEnd/safeSame/reply",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
},
{
"path": "pages/workstation/workstationIndex/workstationIndex", "path": "pages/workstation/workstationIndex/workstationIndex",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
@ -744,6 +789,14 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path": "pages/projectEnd/safeSame/taskList",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}, },
{ {
"path": "pages/projectEnd/wifiQuestion/index", "path": "pages/projectEnd/wifiQuestion/index",
@ -1004,18 +1057,8 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
// {
// "path": "pages/alarmPage/index",
// "style": {
// "navigationBarTitleText": "报警提示",
// "enablePullDownRefresh": true,
// "onReachBottomDistance": 100,
// "navigationBarBackgroundColor": "#3A7BFF",
// "navigationBarTextStyle": "white"
// }
// },
{ {
"path": "pages/alarmPage/indexTwo", "path": "pages/alarmPage/index",
"style": { "style": {
"navigationBarTitleText": "报警提示", "navigationBarTitleText": "报警提示",
"enablePullDownRefresh": true, "enablePullDownRefresh": true,
@ -1419,6 +1462,14 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path": "pages/projectEnd/safeSame/listTow",
"style": {
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
}, },
{ {
"path": "pages/projectEnd/ukashManage/ukashManage", "path": "pages/projectEnd/ukashManage/ukashManage",
@ -1519,22 +1570,6 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path" : "pages/alarmPage/shutting/shutting",
"style" :
{
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
},
{
"path" : "pages/alarmPage/disposition/disposition",
"style" :
{
"navigationBarTitleText" : "",
"enablePullDownRefresh" : false
}
} }
], ],
// "subPackages":[{ // "subPackages":[{

5
pages/projectEnd/projectIndex/projectIndex.vue
View File

@ -638,6 +638,11 @@
url: '../dangerBigProject/index' url: '../dangerBigProject/index'
}) })
break break
case 'safeManageAG':
uni.navigateTo({
url: '../safeSame/index'
})
break
case 'fileManage': case 'fileManage':
uni.navigateTo({ uni.navigateTo({
url: '../../fileManage/fileManage' url: '../../fileManage/fileManage'

14
pages/projectEnd/safeSame/addIssue.vue
View File

@ -8,7 +8,7 @@
</headers> </headers>
<view class="tab flex2"> <view class="tab flex2">
<view class="tabType" @click="radioChange('type1')" :class="checkedTab=='type1'?'checkedTab':'noCheckTab'"> <view class="tabType" @click="radioChange('type1')" :class="checkedTab=='type1'?'checkedTab':'noCheckTab'">
质量问题</view> 安全问题</view>
<view class="tabType" @click="radioChange('type2')" :class="checkedTab=='type2'?'checkedTab':'noCheckTab'"> <view class="tabType" @click="radioChange('type2')" :class="checkedTab=='type2'?'checkedTab':'noCheckTab'">
排查记录</view> 排查记录</view>
</view> </view>
@ -18,7 +18,7 @@
<view> <view>
<radio-group @change="radioChange" class="radio-wrap"> <radio-group @change="radioChange" class="radio-wrap">
<label class="radio"> <label class="radio">
<radio value="type1" checked="true" />质量问题 <radio value="type1" checked="true" />安全问题
</label> </label>
<label class="radio"> <label class="radio">
<radio value="type2" />排查记录 <radio value="type2" />排查记录
@ -550,7 +550,7 @@
basicInfo: {}, basicInfo: {},
selectIndex: null, selectIndex: null,
userInfo: '', userInfo: '',
typeCheck: 'type1', // 类型 type1为质量问题 type2为排查记录 typeCheck: 'type1', // 类型 type1为安全问题 type2为排查记录
listData: [], //分部工程 listData: [], //分部工程
subListData: [], //分项工程 subListData: [], //分项工程
subsectionIndex: -1, //分部工程 subsectionIndex: -1, //分部工程
@ -825,7 +825,7 @@
//获取问题分类 //获取问题分类
getIssueList() { getIssueList() {
this.sendRequest({ this.sendRequest({
url: 'xmgl/dangerTypeRecord/selectDangerTypeAndItemList', url: 'xmgl/xzSecurityDangerTypeRecord/selectDangerTypeAndItemList',
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn, projectSn: this.projectSn,
@ -1301,9 +1301,9 @@
console.log('data.measurePoints=============', data.measurePoints); console.log('data.measurePoints=============', data.measurePoints);
if (this.typeCheck == "type1") { if (this.typeCheck == "type1") {
console.log(data); console.log(data);
// 质量问题 // 安全问题
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/add', url: 'xmgl/xzSecurityQualityInspectionRecord/add',
method: 'post', method: 'post',
data: data, data: data,
success: (res) => { success: (res) => {
@ -1354,7 +1354,7 @@
} }
console.log(data.taskId); console.log(data.taskId);
await this.sendRequest({ await this.sendRequest({
url: 'xmgl/qualityInspectionRecord/add', url: 'xmgl/xzSecurityQualityInspectionRecord/add',
method: 'post', method: 'post',
data: data2, data: data2,
success: (res) => { success: (res) => {

6
pages/projectEnd/safeSame/details.vue
View File

@ -210,7 +210,7 @@
issueInfoList: [], issueInfoList: [],
userInfo: {}, userInfo: {},
entryType: '', entryType: '',
recordType: 1, // 1为质量问题 2为排查记录 recordType: 1, // 1为安全问题 2为排查记录
id: '', id: '',
} }
}, },
@ -243,7 +243,7 @@
getBasicInfo() { getBasicInfo() {
let that = this; let that = this;
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/selectQualityInspectionRecordById', url: 'xmgl/xzSecurityQualityInspectionRecord/selectQualityInspectionRecordById',
method: 'post', method: 'post',
data: { data: {
id: that.id id: that.id
@ -266,7 +266,7 @@
getIssueInfo() { getIssueInfo() {
let that = this; let that = this;
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityRectifyRecord/selectRectifyRecordList', url: 'xmgl/xzSecurityQualityRectifyRecord/selectRectifyRecordList',
method: 'post', method: 'post',
data: { data: {
qualityId: that.id qualityId: that.id

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

@ -2,7 +2,7 @@
<view class="qualityManage"> <view class="qualityManage">
<headers class="fixedheader" :showBack="true"> <headers class="fixedheader" :showBack="true">
<view class="headerName"> <view class="headerName">
质量管理 安全管理
</view> </view>
</headers> </headers>
<view class="problemOverview"> <view class="problemOverview">
@ -66,7 +66,7 @@
</view> </view>
<view class="menu" @click="addPrjcet"> <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; margin-right: 7px;" src="@/static/xmzlzj.jpg"></image>
<view>项目质量自检</view> <view>项目安全自检</view>
</view> </view>
</view> </view>
@ -190,7 +190,7 @@
projectSn: this.projectSn projectSn: this.projectSn
} }
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/list', url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post', method: 'post',
data, data,
success: res => { success: res => {
@ -218,7 +218,7 @@
let userId = JSON.parse(uni.getStorageSync('userInfo')).userId; let userId = JSON.parse(uni.getStorageSync('userInfo')).userId;
//获取我整改的巡查记录数量 //获取我整改的巡查记录数量
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/selectQualityStatistics', url: 'xmgl/xzSecurityQualityInspectionRecord/selectQualityStatistics',
method: 'post', method: 'post',
data: { data: {
projectSn: this.projectSn projectSn: this.projectSn
@ -271,7 +271,7 @@
}) })
}, },
addPrjcet() { addPrjcet() {
// 项目质量自检 // 项目安全自检
uni.navigateTo({ uni.navigateTo({
url: "./projectList" url: "./projectList"
}) })

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

@ -28,7 +28,7 @@
<view class="item" v-if="listData.length>0" v-for="(item,index) in listData" :key="index" <view class="item" v-if="listData.length>0" v-for="(item,index) in listData" :key="index"
@click="goDetails(item.id)"> @click="goDetails(item.id)">
<view class="item_title" v-if="item.recordType == 1 "> <view class="item_title" v-if="item.recordType == 1 ">
<image src="/static/zlwtIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>质量问题 <image src="/static/zlwtIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>安全问题
</view> </view>
<view class="item_title" v-if="item.recordType == 2 "> <view class="item_title" v-if="item.recordType == 2 ">
<image src="/static/pcjlIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>排查记录 <image src="/static/pcjlIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>排查记录
@ -231,7 +231,7 @@
type: 1, type: 1,
value: -1 value: -1
}, { }, {
name: '质量问题', name: '安全问题',
type: 1, type: 1,
value: 1 value: 1
}, { }, {
@ -489,7 +489,7 @@
let that = this; let that = this;
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/list', url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post', method: 'post',
data: that.condition, data: that.condition,
success: res => { success: res => {
@ -547,7 +547,7 @@
let that = this; let that = this;
// uni.showLoading({title: '加载中'}) // uni.showLoading({title: '加载中'})
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/list', url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post', method: 'post',
data: that.condition, data: that.condition,
success: res => { success: res => {
@ -920,7 +920,7 @@
let that = this; let that = this;
// uni.showLoading({title: '加载中'}) // uni.showLoading({title: '加载中'})
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/list', url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post', method: 'post',
data: that.condition, data: that.condition,
success: res => { success: res => {

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

@ -28,7 +28,7 @@
<view class="item" v-if="listData.length>0" v-for="(item,index) in listData" :key="index" <view class="item" v-if="listData.length>0" v-for="(item,index) in listData" :key="index"
@click="goDetails(item.id)"> @click="goDetails(item.id)">
<view class="item_title" v-if="item.recordType == 1 "> <view class="item_title" v-if="item.recordType == 1 ">
<image src="/static/zlwtIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>质量问题 <image src="/static/zlwtIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>安全问题
</view> </view>
<view class="item_title" v-if="item.recordType == 2 "> <view class="item_title" v-if="item.recordType == 2 ">
<image src="/static/pcjlIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>排查记录 <image src="/static/pcjlIcon.png" style="width: 15px;height: 15px;margin-right: 5px;"></image>排查记录
@ -231,7 +231,7 @@
type: 1, type: 1,
value: -1 value: -1
}, { }, {
name: '质量问题', name: '安全问题',
type: 1, type: 1,
value: 1 value: 1
}, { }, {
@ -490,7 +490,7 @@
let that = this; let that = this;
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/list', url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post', method: 'post',
data: that.condition, data: that.condition,
success: res => { success: res => {
@ -548,7 +548,7 @@
let that = this; let that = this;
// uni.showLoading({title: '加载中'}) // uni.showLoading({title: '加载中'})
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/list', url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post', method: 'post',
data: that.condition, data: that.condition,
success: res => { success: res => {
@ -921,7 +921,7 @@
let that = this; let that = this;
// uni.showLoading({title: '加载中'}) // uni.showLoading({title: '加载中'})
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/list', url: 'xmgl/xzSecurityQualityInspectionRecord/list',
method: 'post', method: 'post',
data: that.condition, data: that.condition,
success: res => { success: res => {

2
pages/projectEnd/safeSame/projectList.vue
View File

@ -99,7 +99,7 @@
} }
let _this = this let _this = this
this.sendRequest({ this.sendRequest({
url: 'xmgl/inspectTaskRecord/list', url: 'xmgl/xzSecurityInspectTaskRecord/list',
method: 'post', method: 'post',
data: data, data: data,
success: (res) => { success: (res) => {

2
pages/projectEnd/safeSame/reply.vue
View File

@ -308,7 +308,7 @@ import dateTimePiccker from '@/components/dateTimePicker/index.vue'
// } // }
console.log('data传的参数', data) console.log('data传的参数', data)
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityRectifyRecord/add', url: 'xmgl/xzSecurityQualityRectifyRecord/add',
method: 'post', method: 'post',
data: data, data: data,
success: res => { success: res => {

6
pages/projectEnd/safeSame/taskList.vue
View File

@ -95,7 +95,7 @@
}, },
methods: { methods: {
junpPage(val) { junpPage(val) {
console.log(val, '质量管理') console.log(val, '安全管理')
// if (val.count.inspectNum > 0) { // if (val.count.inspectNum > 0) {
uni.navigateTo({ uni.navigateTo({
url: './listTow?itemS=' + val.id url: './listTow?itemS=' + val.id
@ -124,7 +124,7 @@
} }
let _this = this let _this = this
this.sendRequest({ this.sendRequest({
url: 'xmgl/inspectTaskItemRecord/list', url: 'xmgl/xzSecurityInspectTaskItemRecord/list',
method: 'post', method: 'post',
data: data, data: data,
success: res => { success: res => {
@ -149,7 +149,7 @@
} }
let _this = this let _this = this
this.sendRequest({ this.sendRequest({
url: 'xmgl/qualityInspectionRecord/selectInspectTaskCount', url: 'xmgl/xzSecurityQualityInspectionRecord/selectInspectTaskCount',
method: 'post', method: 'post',
data: data, data: data,
success: res => { success: res => {

4
unpackage/cache/wgt/__UNI__4AA4101/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/cache/wgt/__UNI__4AA4101/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/cache/wgt/__UNI__4AA4101/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

4
unpackage/dist/build/app-plus/app-config-service.js vendored
View File

File diff suppressed because one or more lines are too long

8
unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long