隐患选项bug修复
This commit is contained in:
parent
8c9ca201e2
commit
c767304ce2
10
App.vue
10
App.vue
@ -14,8 +14,8 @@
|
|||||||
} else {
|
} else {
|
||||||
// this.globalData.siteUrl = 'http://182.90.224.147:100/' //演示平台
|
// this.globalData.siteUrl = 'http://182.90.224.147:100/' //演示平台
|
||||||
// this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南
|
// this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南
|
||||||
this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通
|
// this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通
|
||||||
// this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局
|
this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局
|
||||||
// this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地
|
// this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地
|
||||||
// this.globalData.siteUrl = 'http://8.142.139.165:7080/' // 湖里
|
// this.globalData.siteUrl = 'http://8.142.139.165:7080/' // 湖里
|
||||||
// this.globalData.siteUrl = "http://58.34.63.88:9090/"
|
// this.globalData.siteUrl = "http://58.34.63.88:9090/"
|
||||||
@ -31,6 +31,7 @@
|
|||||||
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
||||||
// Vue.prototype.url_config = 'http://124.71.87.250/'
|
// Vue.prototype.url_config = 'http://124.71.87.250/'
|
||||||
// this.globalData.siteUrl = 'http://58.250.210.4:9090/'
|
// this.globalData.siteUrl = 'http://58.250.210.4:9090/'
|
||||||
|
// this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -43,8 +44,8 @@
|
|||||||
// this.globalData.siteUrl = 'http://182.90.224.147:100/' // 演示
|
// this.globalData.siteUrl = 'http://182.90.224.147:100/' // 演示
|
||||||
// this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南
|
// this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南
|
||||||
// this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地
|
// this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地
|
||||||
this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通
|
// this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通
|
||||||
// this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局
|
this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局
|
||||||
// this.globalData.siteUrl = "http://58.34.63.88:9090/"
|
// this.globalData.siteUrl = "http://58.34.63.88:9090/"
|
||||||
// this.globalData.siteUrl = 'http://124.71.178.44:9000/'
|
// this.globalData.siteUrl = 'http://124.71.178.44:9000/'
|
||||||
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
|
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
|
||||||
@ -58,6 +59,7 @@
|
|||||||
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
||||||
// Vue.prototype.url_config = 'http://124.71.87.250/'
|
// Vue.prototype.url_config = 'http://124.71.87.250/'
|
||||||
// Vue.prototype.url_config = 'http://58.250.210.4:9090/'
|
// Vue.prototype.url_config = 'http://58.250.210.4:9090/'
|
||||||
|
// this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
10
main.js
10
main.js
@ -21,8 +21,8 @@ if (process.env.NODE_ENV === 'development') {
|
|||||||
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
|
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' // 湖里
|
||||||
// Vue.prototype.url_config = 'http://139.9.66.234:8/'
|
// Vue.prototype.url_config = 'http://139.9.66.234:8/'
|
||||||
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
|
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
|
||||||
Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通
|
// Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通
|
||||||
// Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局
|
Vue.prototype.url_config = 'http://124.71.67.160:8088/'//中建四局
|
||||||
// Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地
|
// Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地
|
||||||
// Vue.prototype.url_config = 'http://223.82.100.80:9000/'
|
// Vue.prototype.url_config = 'http://223.82.100.80:9000/'
|
||||||
// Vue.prototype.url_config = 'http://120.236.247.200:9000/'
|
// Vue.prototype.url_config = 'http://120.236.247.200:9000/'
|
||||||
@ -39,6 +39,7 @@ if (process.env.NODE_ENV === 'development') {
|
|||||||
// Vue.prototype.url_config = 'http://124.71.178.44:8012' // 河南
|
// Vue.prototype.url_config = 'http://124.71.178.44:8012' // 河南
|
||||||
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
|
// Vue.prototype.url_config = 'http://182.90.224.147:100/' //演示平台
|
||||||
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
||||||
|
// this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@ -52,8 +53,8 @@ if (process.env.NODE_ENV === 'development') {
|
|||||||
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' //湖里
|
// Vue.prototype.url_config = 'http://8.142.139.165:7080/' //湖里
|
||||||
// Vue.prototype.url_config = 'http://139.9.66.234:8/'
|
// Vue.prototype.url_config = 'http://139.9.66.234:8/'
|
||||||
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
|
// Vue.prototype.url_config = 'http://192.168.34.125:6023/'
|
||||||
Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通
|
// Vue.prototype.url_config = 'http://182.90.224.237:7000/' //广西联通
|
||||||
// Vue.prototype.url_config = 'http://124.71.67.160:8088/' //中建四局
|
Vue.prototype.url_config = 'http://124.71.67.160:8088/' //中建四局
|
||||||
// Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地
|
// Vue.prototype.url_config = 'http://192.168.34.148:6023' //广西联通/本地
|
||||||
// Vue.prototype.url_config = 'http://223.82.100.80:9000/'
|
// Vue.prototype.url_config = 'http://223.82.100.80:9000/'
|
||||||
// Vue.prototype.url_config = 'http://120.236.247.200:9000/'
|
// Vue.prototype.url_config = 'http://120.236.247.200:9000/'
|
||||||
@ -67,6 +68,7 @@ if (process.env.NODE_ENV === 'development') {
|
|||||||
// Vue.prototype.url_config = "http://36.137.53.203:9090/"
|
// Vue.prototype.url_config = "http://36.137.53.203:9090/"
|
||||||
// Vue.prototype.url_config = 'http://124.71.87.250/'
|
// Vue.prototype.url_config = 'http://124.71.87.250/'
|
||||||
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
// this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地
|
||||||
|
// this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,7 +27,7 @@
|
|||||||
"SQLite" : {},
|
"SQLite" : {},
|
||||||
"FaceID" : {},
|
"FaceID" : {},
|
||||||
"Fingerprint" : {},
|
"Fingerprint" : {},
|
||||||
"Push" : {}
|
"Speech" : {}
|
||||||
},
|
},
|
||||||
/* 应用发布信息 */
|
/* 应用发布信息 */
|
||||||
"distribute" : {
|
"distribute" : {
|
||||||
|
|||||||
@ -46,7 +46,7 @@
|
|||||||
<view class="form-item flex">
|
<view class="form-item flex">
|
||||||
<view class="form-lable">*<text>隐患类别</text></view>
|
<view class="form-lable">*<text>隐患类别</text></view>
|
||||||
<view class="text" @click="checkDanger">
|
<view class="text" @click="checkDanger">
|
||||||
<text>{{addForm.examineEntry ? addForm.examineEntry : "--请选择隐患--"}}</text>
|
<text>{{addForm.examineEntry !=''? addForm.examineEntry : "--请选择隐患--"}}</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -533,11 +533,13 @@
|
|||||||
day = day > 9 ? day : '0' + day;
|
day = day > 9 ? day : '0' + day;
|
||||||
return `${year}-${month}-${day}`;
|
return `${year}-${month}-${day}`;
|
||||||
},
|
},
|
||||||
checkDanger() {
|
checkDanger(val) {
|
||||||
|
|
||||||
|
console.log('点击触发了吗=========');
|
||||||
if (!this.isDisabled) {
|
if (!this.isDisabled) {
|
||||||
if (uni.getStorageSync('dangerData')) {
|
// if (uni.getStorageSync('dangerData')) {
|
||||||
uni.removeStorageSync('dangerData');
|
// uni.removeStorageSync('dangerData');
|
||||||
}
|
// }
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: "./dangerLibrary"
|
url: "./dangerLibrary"
|
||||||
})
|
})
|
||||||
@ -736,8 +738,9 @@
|
|||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: '保存成功'
|
title: '保存成功'
|
||||||
})
|
})
|
||||||
_this.restForm()
|
uni.navigateTo({
|
||||||
uni.navigateBack({})
|
url: "./safeIndex"
|
||||||
|
})
|
||||||
}
|
}
|
||||||
console.log(res.result)
|
console.log(res.result)
|
||||||
}
|
}
|
||||||
|
|||||||
@ -38,11 +38,12 @@
|
|||||||
<!-- <template v-slot:title> -->
|
<!-- <template v-slot:title> -->
|
||||||
<view>
|
<view>
|
||||||
<view class="card-title flex">
|
<view class="card-title flex">
|
||||||
<view>{{item.hiddenDangerName}}<!-- <p>(共3个隐患点)</p> --></view>
|
<view @tap="checkNavChildren(item)">{{item.hiddenDangerName}}<!-- <p>(共3个隐患点)</p> --></view>
|
||||||
<view class="flex" style="margin-right: 10px;">
|
<view class="flex" style="margin-right: 10px;">
|
||||||
<!-- <view class="pre-btn" @tap="previewRule">
|
<!-- <view class="pre-btn" @tap="previewRule">
|
||||||
检查依据
|
检查依据
|
||||||
</view> -->
|
</view> -->
|
||||||
|
|
||||||
<uni-icons type="arrowdown" style="transition: all 0.3s linear;" :class="{'down': !item.isShow, 'up': item.isShow}" color="#6C7178" @tap="showCard(item)"/>
|
<uni-icons type="arrowdown" style="transition: all 0.3s linear;" :class="{'down': !item.isShow, 'up': item.isShow}" color="#6C7178" @tap="showCard(item)"/>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
@ -212,11 +213,30 @@
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
checkNav(val){
|
checkNav(val){
|
||||||
|
console.log('点击事件触发了吗',val);
|
||||||
this.leftIndex = val
|
this.leftIndex = val
|
||||||
this.navList[val].children.forEach(item=>{
|
|
||||||
item.isShow = false
|
if(this.navList[val].children && this.navList[val].children.length >= 1) {
|
||||||
|
this.rightNavList = this.navList[val].children
|
||||||
|
console.log('列表数据',this.rightNavLis);
|
||||||
|
|
||||||
|
console.log(this.navList[val].children, '-----分类列表数据')
|
||||||
|
this.navList[val].children.forEach(item=>{
|
||||||
|
item.isShow = false
|
||||||
|
})
|
||||||
|
}else{
|
||||||
|
this.rightNavList = []
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
},
|
||||||
|
checkNavChildren(val) {
|
||||||
|
console.log('子类调用参数',val);
|
||||||
|
val.title = this.navList[this.leftIndex].hiddenDangerName
|
||||||
|
uni.setStorageSync('dangerData', val);
|
||||||
|
uni.navigateTo({
|
||||||
|
url: "./addExamine"
|
||||||
})
|
})
|
||||||
this.rightNavList = this.navList[val].children
|
|
||||||
},
|
},
|
||||||
previewRule(e){
|
previewRule(e){
|
||||||
this.$refs.dialogs.showFn()
|
this.$refs.dialogs.showFn()
|
||||||
@ -257,6 +277,7 @@
|
|||||||
// console.log(val)
|
// console.log(val)
|
||||||
},
|
},
|
||||||
checkDetail(val){
|
checkDetail(val){
|
||||||
|
console.log('val的数据',val);
|
||||||
val.title = this.navList[this.leftIndex].hiddenDangerName
|
val.title = this.navList[this.leftIndex].hiddenDangerName
|
||||||
uni.setStorageSync('dangerData', val);
|
uni.setStorageSync('dangerData', val);
|
||||||
uni.navigateBack({})
|
uni.navigateBack({})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user