diff --git a/main.js b/main.js index 90df911..fd774f1 100644 --- a/main.js +++ b/main.js @@ -9,8 +9,8 @@ import { Vue.config.productionTip = false uni.$http = $http // $http.baseUrl = 'http://223.75.53.141:83' -// $http.baseUrl = 'http://local.gunshiiot.com:18083' -$http.baseUrl = 'http://192.168.66.27:24105' +$http.baseUrl = 'http://local.gunshiiot.com:18083' +// $http.baseUrl = 'http://192.168.66.27:24105' // 请求拦截器 $http.beforeRequest = function (options) { if (options.url.indexOf('/doLogin') == -1) { diff --git a/manifest.json b/manifest.json index 49baf01..d081ef4 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "檀树岗水库", "appid" : "__UNI__33ED56F", "description" : "", - "versionName" : "1.0.0", + "versionName" : "1.0.1", "versionCode" : 1, "transformPx" : false, "app-plus" : { diff --git a/pages.json b/pages.json index 866e480..1bd87fa 100644 --- a/pages.json +++ b/pages.json @@ -200,6 +200,12 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "pages/yj/detail/byTable", + "style": { + "navigationBarTitleText": "" + } }, { "path": "pages/messageList/index", diff --git a/pages/aqjc/jrxOptions.js b/pages/aqjc/jrxOptions.js index db70091..4a5c0c5 100644 --- a/pages/aqjc/jrxOptions.js +++ b/pages/aqjc/jrxOptions.js @@ -170,22 +170,25 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { [63, data[alltype[2]]], [87, data[alltype[3]]] ] : - type == "1"? - [ - [xValue, data?.rz], - [49, data[alltype[0]]], - [57, data[alltype[1]]], - [67, data[alltype[2]]], - [89, data[alltype[3]]] - ]: - [ - [xValue, data?.rz], - [51.6, data[alltype[0]]], - [53.6, data[alltype[1]]], - [73, data[alltype[2]]], - [85, data[alltype[3]]] - ] - : [] + type == "1" ? + [ + [xValue, data?.rz], + [49, data[alltype[0]]], + [57, data[alltype[1]]], + [67, data[alltype[2]]], + [89, data[alltype[3]]] + ] : + [ + [xValue, data?.rz], + [51.6, data[alltype[0]]], + [53.6, data[alltype[1]]], + [73, data[alltype[2]]], + [85, data[alltype[3]]] + ] + : []; + const filteredArray = line.filter(subArray => { + return subArray.every(item => item !== null && item !== undefined); + }); let eopts = { toolbox: { show: true, @@ -430,7 +433,7 @@ export default function jrxOptions(data = {}, type = "1",typeName='1') { lineStyle: { color: '#5487FF', }, - data: line + data: filteredArray }, ] } diff --git a/pages/login/login.vue b/pages/login/login.vue index e513ff4..09ad2bd 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -157,7 +157,7 @@ getImgFlow(imgUrl) { if (imgUrl) { uni.request({ - url: 'http://223.75.53.141:83' + + url: uni.$http.baseUrl + `/gunshiApp/tsg/common/download/resource?resource=${imgUrl}`, responseType: 'arraybuffer', success: (res) => { diff --git a/pages/mypage/compents/xcrw/detail/formZdy.vue b/pages/mypage/compents/xcrw/detail/formZdy.vue index d8c12f8..3a084c5 100644 --- a/pages/mypage/compents/xcrw/detail/formZdy.vue +++ b/pages/mypage/compents/xcrw/detail/formZdy.vue @@ -107,7 +107,7 @@ export default { uploadFilePromise(url,name) { return new Promise((resolve, reject) => { let a = uni.uploadFile({ - url: 'http://223.75.53.141:83/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址 + url: uni.$http.baseUrl +'/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址 filePath: url, name: 'file', formData: { diff --git a/pages/newAqjc/byTable.vue b/pages/newAqjc/byTable.vue index 6bcbee7..2aee964 100644 --- a/pages/newAqjc/byTable.vue +++ b/pages/newAqjc/byTable.vue @@ -13,7 +13,7 @@
{{item.obDate}} - {{item.mnNo}} + {{item.order}} {{ simpleData(item.status) }}
diff --git a/pages/personInfo/personInfo.vue b/pages/personInfo/personInfo.vue index 2fd3c8f..d1f879b 100644 --- a/pages/personInfo/personInfo.vue +++ b/pages/personInfo/personInfo.vue @@ -99,7 +99,7 @@ getImgFlow(imgUrl) { uni.request({ - url: 'http://223.75.53.141:83' + + url: uni.$http.baseUrl + `/gunshiApp/tsg/common/download/resource?resource=${imgUrl}`, responseType: 'arraybuffer', success: (res) => { diff --git a/pages/sjc/byTable.vue b/pages/sjc/byTable.vue index 6bcbee7..2aee964 100644 --- a/pages/sjc/byTable.vue +++ b/pages/sjc/byTable.vue @@ -13,7 +13,7 @@
{{item.obDate}} - {{item.mnNo}} + {{item.order}} {{ simpleData(item.status) }}
diff --git a/pages/skInfo/index.vue b/pages/skInfo/index.vue index 122c2dd..a7647d6 100644 --- a/pages/skInfo/index.vue +++ b/pages/skInfo/index.vue @@ -61,7 +61,7 @@ stStcd:'', shStcd:'', imageList:[], - baseUrl:'http://223.75.53.141:83', + baseUrl:uni.$http.baseUrl, showImg:'../../static/skimg.png' } diff --git a/pages/upgrade/index.vue b/pages/upgrade/index.vue index ceb403f..280b71e 100644 --- a/pages/upgrade/index.vue +++ b/pages/upgrade/index.vue @@ -87,7 +87,7 @@ this.isStartDownload = true //开始下载App // const baseUrl = `http://223.75.53.141:83/gunshiApp/tsg/${this.info.url}` - const baseUrl = `http://local.gunshiiot.com:18083/gunshiApp/tsg/${this.info.url}` + const baseUrl = uni.$http.baseUrl+`/gunshiApp/tsg/${this.info.url}` downloadApp(baseUrl, current => { //下载进度监听 this.hasProgress = true diff --git a/pages/wtcl/detail/index.vue b/pages/wtcl/detail/index.vue index b0cfd82..82c0802 100644 --- a/pages/wtcl/detail/index.vue +++ b/pages/wtcl/detail/index.vue @@ -195,7 +195,7 @@ uploadFilePromise(url, name) { return new Promise((resolve, reject) => { let a = uni.uploadFile({ - url: 'http://223.75.53.141:83/gunshiApp/tsg/inspect/task/file/upload/singleSimple', // 仅为示例，非真实的接口地址 + url: uni.$http.baseUrl +'/gunshiApp/tsg/inspect/task/file/upload/singleSimple', // 仅为示例，非真实的接口地址 filePath: url, name: 'file', formData: { diff --git a/pages/wxyh/formZdy/formBottom.vue b/pages/wxyh/formZdy/formBottom.vue index 5089d7a..1f90249 100644 --- a/pages/wxyh/formZdy/formBottom.vue +++ b/pages/wxyh/formZdy/formBottom.vue @@ -142,7 +142,7 @@ uploadFilePromise(url,name) { return new Promise((resolve, reject) => { let a = uni.uploadFile({ - url: 'http://223.75.53.141:83/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址 + url: uni.$http.baseUrl +'/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址 filePath: url, name: 'file', formData: { diff --git a/pages/xcrw/detail/dbForm.vue b/pages/xcrw/detail/dbForm.vue index 714db16..758d495 100644 --- a/pages/xcrw/detail/dbForm.vue +++ b/pages/xcrw/detail/dbForm.vue @@ -134,19 +134,19 @@ item.childen = item.children.map(i => { i.handlePics?.map(item1=>{ - item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath + item1.url ='http://223.75.53.141:9100/gs-tsg' + item1.filePath return item1 }) i.handleVideos?.map(item1=>{ - item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath + item1.url ='http://223.75.53.141:9100/gs-tsg' + item1.filePath return item1 }) i.inspectPics?.map(item1=>{ - item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath + item1.url ='http://223.75.53.141:9100/gs-tsg' + item1.filePath return item1 }) i.inspectVideos?.map(item1=>{ - item1.url ='http://223.75.53.141:9102/test.by-lyf.tmp' + item1.filePath + item1.url ='http://223.75.53.141:9100/gs-tsg' + item1.filePath return item1 }) if (!i.handlePics) { @@ -370,7 +370,7 @@ uploadFilePromise(url, name, index, index1) { return new Promise((resolve, reject) => { let a = uni.uploadFile({ - url: 'http://223.75.53.141:83/gunshiApp/tsg/inspect/task/file/upload/singleSimple', // 仅为示例，非真实的接口地址 + url: uni.$http.baseUrl +'/gunshiApp/tsg/inspect/task/file/upload/singleSimple', // 仅为示例，非真实的接口地址 filePath: url, name: 'file', formData: { diff --git a/pages/xcrw/detail/formZdy.vue b/pages/xcrw/detail/formZdy.vue index d8c12f8..186b378 100644 --- a/pages/xcrw/detail/formZdy.vue +++ b/pages/xcrw/detail/formZdy.vue @@ -107,7 +107,7 @@ export default { uploadFilePromise(url,name) { return new Promise((resolve, reject) => { let a = uni.uploadFile({ - url: 'http://223.75.53.141:83/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址 + url: uni.$http.baseUrl +'/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例，非真实的接口地址 filePath: url, name: 'file', formData: { diff --git a/pages/yj/detail/byTable.vue b/pages/yj/detail/byTable.vue new file mode 100644 index 0000000..3dc7d66 --- /dev/null +++ b/pages/yj/detail/byTable.vue @@ -0,0 +1,137 @@ + + + + + \ No newline at end of file diff --git a/pages/yj/index.vue b/pages/yj/index.vue index 968c2e4..36c2309 100644 --- a/pages/yj/index.vue +++ b/pages/yj/index.vue @@ -1,28 +1,28 @@ \ No newline at end of file