diff --git a/App.vue b/App.vue index fbbc67da..7ce29980 100644 --- a/App.vue +++ b/App.vue @@ -14,8 +14,8 @@ } else { // this.globalData.siteUrl = 'http://182.90.224.147:100/' //演示平台 // this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南 - this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通 - // this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 + // this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通 + this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 // this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地 // this.globalData.siteUrl = 'http://8.142.139.165:7080/' // 湖里 // this.globalData.siteUrl = "http://58.34.63.88:9090/" @@ -31,6 +31,7 @@ // this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地 // Vue.prototype.url_config = 'http://124.71.87.250/' // this.globalData.siteUrl = 'http://58.250.210.4:9090/' + // this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通 } } else { @@ -43,8 +44,8 @@ // this.globalData.siteUrl = 'http://182.90.224.147:100/' // 演示 // this.globalData.siteUrl = 'http://124.71.178.44:8012/' // 河南 // this.globalData.siteUrl = 'http://192.168.34.148:6023/' //广西联通/本地 - this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通 - // this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 + // this.globalData.siteUrl = 'http://182.90.224.237:7000/' //广西联通 + this.globalData.siteUrl = 'http://124.71.67.160:8088/' //中建四局 // this.globalData.siteUrl = "http://58.34.63.88:9090/" // this.globalData.siteUrl = 'http://124.71.178.44:9000/' // Vue.prototype.url_config = 'http://192.168.34.125:6023/' @@ -58,6 +59,7 @@ // this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地 // Vue.prototype.url_config = 'http://124.71.87.250/' // Vue.prototype.url_config = 'http://58.250.210.4:9090/' + // this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通 } } diff --git a/main.js b/main.js index c477eb30..319836bd 100644 --- a/main.js +++ b/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://139.9.66.234:8/' // 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://124.71.67.160:8088/'//中建四局 + // 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://192.168.34.148:6023' //广西联通/本地 // Vue.prototype.url_config = 'http://223.82.100.80: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://182.90.224.147:100/' //演示平台 // this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地 + // this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通 } } 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://139.9.66.234:8/' // 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://124.71.67.160:8088/' //中建四局 + // 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://192.168.34.148:6023' //广西联通/本地 // Vue.prototype.url_config = 'http://223.82.100.80: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://124.71.87.250/' // this.globalData.siteUrl = 'http://192.168.34.116:6023/'//邱平毅本地 + // this.globalData.siteUrl = 'http://182.90.224.147:18170/'//瑞士恒通 } } diff --git a/manifest.json b/manifest.json index fb190d3a..7424cc90 100644 --- a/manifest.json +++ b/manifest.json @@ -27,7 +27,7 @@ "SQLite" : {}, "FaceID" : {}, "Fingerprint" : {}, - "Push" : {} + "Speech" : {} }, /* 应用发布信息 */ "distribute" : { diff --git a/pages/projectEnd/safeManage/addExamine.vue b/pages/projectEnd/safeManage/addExamine.vue index 785c95c1..a708cbdf 100644 --- a/pages/projectEnd/safeManage/addExamine.vue +++ b/pages/projectEnd/safeManage/addExamine.vue @@ -46,7 +46,7 @@ *隐患类别 - {{addForm.examineEntry ? addForm.examineEntry : "--请选择隐患--"}} + {{addForm.examineEntry !=''? addForm.examineEntry : "--请选择隐患--"}} @@ -533,11 +533,13 @@ day = day > 9 ? day : '0' + day; return `${year}-${month}-${day}`; }, - checkDanger() { + checkDanger(val) { + + console.log('点击触发了吗========='); if (!this.isDisabled) { - if (uni.getStorageSync('dangerData')) { - uni.removeStorageSync('dangerData'); - } + // if (uni.getStorageSync('dangerData')) { + // uni.removeStorageSync('dangerData'); + // } uni.navigateTo({ url: "./dangerLibrary" }) @@ -736,8 +738,9 @@ uni.showToast({ title: '保存成功' }) - _this.restForm() - uni.navigateBack({}) + uni.navigateTo({ + url: "./safeIndex" + }) } console.log(res.result) } diff --git a/pages/projectEnd/safeManage/dangerLibrary.vue b/pages/projectEnd/safeManage/dangerLibrary.vue index 209ee074..2f78b54d 100644 --- a/pages/projectEnd/safeManage/dangerLibrary.vue +++ b/pages/projectEnd/safeManage/dangerLibrary.vue @@ -38,11 +38,12 @@ - {{item.hiddenDangerName}} + {{item.hiddenDangerName}} + @@ -212,11 +213,30 @@ }); }, checkNav(val){ + console.log('点击事件触发了吗',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){ this.$refs.dialogs.showFn() @@ -257,6 +277,7 @@ // console.log(val) }, checkDetail(val){ + console.log('val的数据',val); val.title = this.navList[this.leftIndex].hiddenDangerName uni.setStorageSync('dangerData', val); uni.navigateBack({})