diff --git a/main.js b/main.js
index 95e3c91..4c6bfe3 100644
--- a/main.js
+++ b/main.js
@@ -8,7 +8,7 @@ import {
} from '@escook/request-miniprogram'
Vue.config.productionTip = false
uni.$http = $http
-$http.baseUrl = 'http://local.gunshiiot.com:18083'
+$http.baseUrl = 'http://223.75.53.141:83'
// 请求拦截器
$http.beforeRequest = function (options) {
if (options.url.indexOf('/doLogin') == -1) {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 23f0da3..39a3331 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -157,7 +157,7 @@
getImgFlow(imgUrl) {
if (imgUrl) {
uni.request({
- url: 'http://local.gunshiiot.com:18083' +
+ url: 'http://223.75.53.141:83' +
`/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 1b49a2a..d8c12f8 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://local.gunshiiot.com:18083/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例,非真实的接口地址
+ url: 'http://223.75.53.141:83/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例,非真实的接口地址
filePath: url,
name: 'file',
formData: {
diff --git a/pages/personInfo/personInfo.vue b/pages/personInfo/personInfo.vue
index 867cc1d..2fd3c8f 100644
--- a/pages/personInfo/personInfo.vue
+++ b/pages/personInfo/personInfo.vue
@@ -99,7 +99,7 @@
getImgFlow(imgUrl) {
uni.request({
- url: 'http://local.gunshiiot.com:18083' +
+ url: 'http://223.75.53.141:83' +
`/gunshiApp/tsg/common/download/resource?resource=${imgUrl}`,
responseType: 'arraybuffer',
success: (res) => {
diff --git a/pages/sjc/index.vue b/pages/sjc/index.vue
index e1ba69d..b0b486c 100644
--- a/pages/sjc/index.vue
+++ b/pages/sjc/index.vue
@@ -1,89 +1,180 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/skInfo/detail/index.vue b/pages/skInfo/detail/index.vue
index 414cf59..5d5cde1 100644
--- a/pages/skInfo/detail/index.vue
+++ b/pages/skInfo/detail/index.vue
@@ -4,7 +4,8 @@
fontSize:'18px'
}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
-
+
+
diff --git a/pages/skInfo/detail/tzcs.vue b/pages/skInfo/detail/tzcs.vue
index a94ade0..93b2cce 100644
--- a/pages/skInfo/detail/tzcs.vue
+++ b/pages/skInfo/detail/tzcs.vue
@@ -94,16 +94,34 @@
this.list = selectData[e]
if (e == 0) {
this.keyObj = this.skInfo;
- } else if (e == 1 || e == 2 || e == 6) {
- this.getDbData(e)
- } else if (e == 3) {
- this.getyhdData()
- } else if (e == 4 || e == 5) {
- this.getfdData(e)
- } else {
- this.getfxdData(e)
+ }else{
+ this.getOtherData()
+ }
+ // else if (e == 1 || e == 2 || e == 6) {
+ // this.getDbData(e)
+ // } else if (e == 3) {
+ // this.getyhdData()
+ // } else if (e == 4 || e == 5) {
+ // this.getfdData(e)
+ // } else {
+ // this.getfxdData(e)
+ // }
+ },
+
+
+ async getOtherData() {
+ try {
+ const {
+ data
+ } = await uni.$http.get('/gunshiApp/tsg/attResBuilding/info')
+ if (data.code == 200) {
+ this.keyObj = data.data
+ }
+ } catch (error) {
+
}
},
+
// 主坝,副坝,拦洪坝
async getDbData(e) {
try {
diff --git a/pages/skInfo/waterDatail/index.vue b/pages/skInfo/waterDatail/index.vue
index c6a2fa3..f804030 100644
--- a/pages/skInfo/waterDatail/index.vue
+++ b/pages/skInfo/waterDatail/index.vue
@@ -126,18 +126,34 @@ export default {
mask: true,
});
try {
- const { data } = await uni.$http.post("/gunshiApp/tsg/stWaterR/list", {
- stcd: this.stcd,
- startTime: moment(this.stm).format("YYYY-MM-DD HH:mm:ss"),
- endTime: moment(this.etm).format("YYYY-MM-DD HH:mm:ss"),
- isAsc: false,
- orderField: "tm",
- });
+ const { data } = await uni.$http.post(
+ "/gunshiApp/tsg/stWaterRReorganize/list",
+ {
+ searchType: 1,
+ startTime: moment(this.stm).format("YYYY-MM-DD HH:mm:ss"),
+ endTime: moment(this.etm).format("YYYY-MM-DD HH:mm:ss"),
+ isAsc: false,
+ orderField: "tm",
+ }
+ );
if (data.code == 200) {
uni.hideLoading();
-
- this.tableData = [...data.data];
+ let newData = [];
+ if (this.name == "灌溉供水") {
+ newData = data.data.map((item) => ({
+ ...item,
+ v: item.ecologyV,
+ q: item.ecologyQ,
+ }));
+ } else {
+ newData = data.data.map((item) => ({
+ ...item,
+ v: item.lifeV,
+ q: item.lifeQ,
+ }));
+ }
+ this.tableData = [...newData];
}
} catch (error) {
uni.$showMsg();
diff --git a/pages/skInfo/waterDatail/jcOptions.js b/pages/skInfo/waterDatail/jcOptions.js
index 76980ac..aff3e9d 100644
--- a/pages/skInfo/waterDatail/jcOptions.js
+++ b/pages/skInfo/waterDatail/jcOptions.js
@@ -8,7 +8,7 @@ export default function DrpOption(data,num) {
const maxS = Math.ceil(Math.max(...data?.map(s => s.v)));
let eopts = {
title: {
- text: `时段总水量:${num.value}${num.unit}m³`,
+ text: `时段总水量:${num.value.toFixed(2)}${num.unit || '万'}m³`,
top: "0%",
right: "12%",
textStyle: {
diff --git a/pages/staticData.js b/pages/staticData.js
index 927690a..d9f5384 100644
--- a/pages/staticData.js
+++ b/pages/staticData.js
@@ -3,7 +3,7 @@
export default {
0:[{
name: "所在河流(水系)名称",
- key: "rvName"
+ key: "basName"
},
{
name: "倒水全流域面积(km²)",
@@ -101,166 +101,166 @@ export default {
1: [
{
name: "坝顶高程(m)",
- key:"damTopElev"
+ key:"mainCrestElevation"
},
{
name: "坝顶长度(m)",
- key:"damTopLen"
+ key:"mainCrestLength"
},
{
name: "坝顶宽度(m)",
- key:"damTopWid"
+ key:"mainCrestWidth"
},
{
name: "最大坝高(m)",
- key:"damMaxHeig"
+ key:"mainMaxHeight"
}
],
2: [
{
name: "坝顶高程(m)",
- key:"damTopElev"
+ key:"auxCrestElevation"
},
{
name: "坝顶长度(m)",
- key:"damTopLen"
+ key:"auxCrestLength"
},
{
name: "坝顶宽度(m)",
- key:"damTopWid"
+ key:"auxCrestWidth"
},
{
name: "最大坝高(m)",
- key:"damMaxHeig"
+ key:"auxMaxHeight"
}
],
3: [
{
- name: "堰鼎样式",
- key:"crestType"
+ name: "堰顶型式",
+ key:"spillwayCrestType"
},
{
name: "地基特性",
- key:"foundCharacter"
+ key:"spillwayFoundation"
},
{
name: "溢流堰顶高程(m)",
- key:"crestEle"
+ key:"spillwayCrestElevation"
},
{
name: "溢流堰净宽(m)",
- key:"netWidth"
+ key:"spillwayNetWidth"
},
{
name: "消能形式",
- key:"elimMethod"
+ key:"spillwayEnergyDissipation"
},
{
name: "校验洪水下泄流量(m³/s)",
- key:"caliQ"
+ key:"spillwayCheckFloodDischarge"
},
{
name: "设计洪水下泄流量(m³/s)",
- key:"desQ"
+ key:"spillwayDesignFloodDischarge"
},
{
name: "消能防冲下泄流量(m³/s)",
- key:"elimQ"
+ key:"spillwayScouringDischarge"
}
],
4: [
{
name: "型式",
- key:"buildType"
+ key:"irrigationType"
},
{
name: "地基特性",
- key:"foundCharacter"
+ key:"irrigationFoundation"
},
{
name: "进口地板高程(m)",
- key:"inletEle"
+ key:"irrigationInletElevation"
},
{
name: "断面尺寸(m)",
- key:"sectionSize"
+ key:"irrigationCrossSection"
},
{
name: "洞长(m)",
- key:"tunnelLen"
+ key:"irrigationLength"
},
{
name: "设计流量(m³/s)",
- key:"desQ"
+ key:"irrigationDesignFlow"
},
{
name: "进口闸门型式",
- key:"valveType"
+ key:"irrigationGateType"
},
{
name: "进口启闭机型式",
- key:"ocType"
+ key:"irrigationHoistType"
}
],
5: [
{
name: "型式",
- key:"buildType"
+ key:"emptyingType"
},
{
name: "衬砌型式",
- key:"liningType"
+ key:"emptyingLiningType"
},
{
name: "地基特性",
- key:"foundCharacter"
+ key:"emptyingFoundation"
},
{
name: "进口地板高程(m)",
- key:"inletEle"
+ key:"emptyingInletElevation"
},
{
name: "断面尺寸(m)",
- key:"sectionSize"
+ key:"emptyingCrossSection"
},
{
name: "洞长(m)",
- key:"tunnelLen"
+ key:"emptyingLength"
},
{
name: "设计流量(m³/s)",
- key:"desQ"
+ key:"emptyingDesignFlow"
},
{
name: "进口闸门型式",
- key:"valveType"
+ key:"emptyingGateType"
},
{
name: "进口启闭机型式",
- key:"ocType"
+ key:"emptyingHoistType"
}
],
6: [
{
name: "坝顶高程(m)",
- key:"damTopElev"
+ key:"floodControlCrestElevation"
},
{
name: "坝顶长度(m)",
- key:"damTopLen"
+ key:"floodControlCrestLength"
},
{
name: "坝顶宽度(m)",
- key:"damTopWid"
+ key:"floodControlCrestWidth"
},
{
name: "最大坝高(m)",
- key:"damMaxHeig"
+ key:"floodControlMaxHeight"
}
],7: [
{
name: "防汛路长度(m)",
- key:"floodRoadLen"
+ key:"roadLength"
},
{
name: "路面宽度(m)",
diff --git a/pages/upgrade/index.vue b/pages/upgrade/index.vue
index d65f800..6665655 100644
--- a/pages/upgrade/index.vue
+++ b/pages/upgrade/index.vue
@@ -86,7 +86,7 @@
if (this.info.url) {
this.isStartDownload = true
//开始下载App
- const baseUrl = `http://local.gunshiiot.com:18083/gunshiApp/tsg/common/download/resource?resource=${this.info.url}`
+ const baseUrl = `http://223.75.53.141:83/gunshiApp/tsg/common/download/resource?resource=${this.info.url}`
downloadApp(baseUrl, current => {
//下载进度监听
this.hasProgress = true
diff --git a/pages/utils/tool.js b/pages/utils/tool.js
index 15f69a0..d42d564 100644
--- a/pages/utils/tool.js
+++ b/pages/utils/tool.js
@@ -81,7 +81,7 @@ export function numberFormat(value) {
param.unit = ''
} else {
i = Math.floor(Math.log(value) / Math.log(k));
- param.value = ((value / Math.pow(k, i))).toFixed(2);
+ param.value = ((value / Math.pow(k, i))).toFixed(1);
param.unit = sizes[i];
}
console.log(param)
diff --git a/pages/wtcl/detail/index.vue b/pages/wtcl/detail/index.vue
index 2652216..b0cfd82 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://local.gunshiiot.com:18083/gunshiApp/tsg/inspect/task/file/upload/singleSimple', // 仅为示例,非真实的接口地址
+ url: 'http://223.75.53.141:83/gunshiApp/tsg/inspect/task/file/upload/singleSimple', // 仅为示例,非真实的接口地址
filePath: url,
name: 'file',
formData: {
diff --git a/pages/wtcl/index.vue b/pages/wtcl/index.vue
index e36cd66..9ac5856 100644
--- a/pages/wtcl/index.vue
+++ b/pages/wtcl/index.vue
@@ -76,8 +76,8 @@
showTime1:false,
start: '请选择开始时间',
end: '请选择结束时间',
- stm:moment().startOf('year').format('YYYY-MM-DD'),
- etm:moment().format('YYYY-MM-DD'),
+ stm:'',
+ etm:'',
list: [
]
};
diff --git a/pages/wxyh/formZdy/formBottom.vue b/pages/wxyh/formZdy/formBottom.vue
index 7106c7f..5089d7a 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://local.gunshiiot.com:18083/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例,非真实的接口地址
+ url: 'http://223.75.53.141:83/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 421a94e..714db16 100644
--- a/pages/xcrw/detail/dbForm.vue
+++ b/pages/xcrw/detail/dbForm.vue
@@ -370,7 +370,7 @@
uploadFilePromise(url, name, index, index1) {
return new Promise((resolve, reject) => {
let a = uni.uploadFile({
- url: 'http://local.gunshiiot.com:18083/gunshiApp/tsg/inspect/task/file/upload/singleSimple', // 仅为示例,非真实的接口地址
+ url: 'http://223.75.53.141:83/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 1b49a2a..d8c12f8 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://local.gunshiiot.com:18083/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例,非真实的接口地址
+ url: 'http://223.75.53.141:83/gunshiApp/tsg/maintain/service/file/upload/singleSimple', // 仅为示例,非真实的接口地址
filePath: url,
name: 'file',
formData: {
diff --git a/pages/zhjs/subnvue/index.nvue b/pages/zhjs/subnvue/index.nvue
index 5d2da43..670e2e7 100644
--- a/pages/zhjs/subnvue/index.nvue
+++ b/pages/zhjs/subnvue/index.nvue
@@ -497,7 +497,6 @@
this.getVideoList();
this.getRainList();
this.getWaterList();
- console.log(wgs84ToGcj02(114.7632670,31.4934740))
}
}