diff --git a/App.vue b/App.vue index 3069563..e711b4f 100644 --- a/App.vue +++ b/App.vue @@ -13,7 +13,7 @@ } else { uni.reLaunch({ url: '/pages/login/login' - // url:'/pages/spjk/index' + // url:'/pages/mypage/mypage' }) console.log(token.secretKey,'App Launch2') } diff --git a/pages.json b/pages.json index 9cae36b..183b220 100644 --- a/pages.json +++ b/pages.json @@ -323,6 +323,12 @@ "style": { "navigationBarTitleText": "" } + }, + { + "path": "pages/ylzList/detail/index", + "style": { + "navigationBarTitleText": "" + } } ], @@ -340,12 +346,6 @@ "selectedIconPath": "static/tabs/home2.png", "text": "首页" }, - { - "pagePath": "pages/addressBook/addressBook", - "iconPath": "/static/tabs/phone_icon@2x.png", - "selectedIconPath": "static/tabs/phone_icon@2x2.png", - "text": "通讯录" - }, { "pagePath": "pages/mypage/mypage", "iconPath": "/static/images/my2_icon@2x.png", diff --git a/pages/aqjc/index.vue b/pages/aqjc/index.vue index ecb702a..8c2dd5f 100644 --- a/pages/aqjc/index.vue +++ b/pages/aqjc/index.vue @@ -71,7 +71,7 @@ import moment from "moment" import drpOption from './jrxOptions'; import JcsjTable from "./jcsjTable" - const stm = moment().subtract(7, 'months').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"); + const stm = moment().subtract(1, 'days').add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"); const etm = moment().add(1, 'hour').set({minute: 0, second: 0}).format("YYYY-MM-DD HH:mm"); export default { diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index 144091a..530bd13 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -8,7 +8,7 @@
-
{{ userList.userName }}
+
{{ userList.nickName }}
{{ userList.dept.deptName || '' }}
@@ -26,7 +26,7 @@
-
+
- +
+ + 用户登录 + + - + - + - 记住用户名和密码 + 记住用户名和密码 - - @@ -37,176 +25,163 @@ - + \ No newline at end of file diff --git a/pages/modifyPassword/modifyPassword.vue b/pages/modifyPassword/modifyPassword.vue index 871fd29..2d87199 100644 --- a/pages/modifyPassword/modifyPassword.vue +++ b/pages/modifyPassword/modifyPassword.vue @@ -11,14 +11,14 @@
- + - - - - + +
@@ -34,10 +34,14 @@ export default { data() { return { + // formData: { + // oldSecretKey: '', + // newSecretKey: '', + // secondSecretKey: '', + // }, formData: { - oldSecretKey: '', - newSecretKey: '', - secondSecretKey: '', + oldPassword: '', + newPassword: '', }, } }, @@ -47,28 +51,33 @@ }, save(formData){ - let new_params = { - userId: '' , - oldSecretKey: '', - newSecretKey: '', - secondSecretKey: '', - } + // let new_params = { + // userId: '' , + // oldSecretKey: '', + // newSecretKey: '', + // secondSecretKey: '', + // } - new_params.oldSecretKey = CryptoJS.MD5(formData.oldSecretKey).toString() - new_params.newSecretKey = CryptoJS.MD5(formData.newSecretKey).toString() - new_params.secondSecretKey = CryptoJS.MD5(formData.secondSecretKey).toString() - new_params.userId = uni.getStorageSync('value').userId + // new_params.oldSecretKey = CryptoJS.MD5(formData.oldSecretKey).toString() + // new_params.newSecretKey = CryptoJS.MD5(formData.newSecretKey).toString() + // new_params.secondSecretKey = CryptoJS.MD5(formData.secondSecretKey).toString() + // new_params.userId = uni.getStorageSync('value').userId // console.log(formData) - uni.$http.post('/gunshiApp/xfflood/user/updateSecretKey',new_params).then(res=>{ + uni.$http.put(`/gunshiApp/xyt/system/user/profile/updatePwd?oldPassword=${formData.oldPassword}&newPassword=${formData.newPassword}`).then(res=>{ console.log(res); if (res.data.code === 200) { uni.showToast({ - title: res.data.description, + title: "修改成功，即将重新登录", icon:'none', duration: 2000 }) - setTimeout(uni.navigateBack(),2500) + setTimeout(() => { + uni.reLaunch({ + url: '/pages/login/login' + // url:'/pages/homeIndex/index' + }) + },2500) } else { uni.showToast({ title: res.data.description, diff --git a/pages/mypage/mypage.vue b/pages/mypage/mypage.vue index c810d64..d148949 100644 --- a/pages/mypage/mypage.vue +++ b/pages/mypage/mypage.vue @@ -10,8 +10,8 @@ >
-
{{this.userList.userName}}
-
{{this.userList.orgList[0].orgName}}
+
{{this.userList.nickName}}
+
{{this.userList.dept.deptName}}
@@ -31,7 +31,7 @@
-
+
版本号
@@ -45,16 +45,11 @@ + .userinfo { + border-radius: 5px; + display: flex; + flex-direction: row; + margin-top: 5vh; + margin-left: 2vw; + margin-bottom: 2vh; + align-items: center; + width: 95%; + height: 6vh; + background-color: #007afd; + + } + + .icon { + width: 6vw; + height: 6vh; + align-items: center; + line-height: 6vh; + } + + .Header { + display: flex; + flex-direction: row; + flex: 0.95; + justify-content: center; + color: white; + font-size: 20px; + } + + .info { + margin: 1vh; + + } + + .listContainer { + height: 6vh; + line-height: 8vh; + } + + .button { + margin-top: 60vh; + border-radius: 10px; + display: flex; + flex-direction: column-reverse; + width: 92%; + height: 6vh; + font-size: 20px; + color: white; + background-color: #007afd; + } + + .slot-image { + margin-top: 12px; + width: 40px; + height: 40px; + border-radius: 50%; + } + \ No newline at end of file diff --git a/pages/skDetail/tjsj/tjsj.vue b/pages/skDetail/tjsj/tjsj.vue index 3c9c003..f7a4880 100644 --- a/pages/skDetail/tjsj/tjsj.vue +++ b/pages/skDetail/tjsj/tjsj.vue @@ -95,12 +95,6 @@ + \ No newline at end of file diff --git a/pages/skInfo/detail/index.vue b/pages/skInfo/detail/index.vue index 4ecff59..d88e39c 100644 --- a/pages/skInfo/detail/index.vue +++ b/pages/skInfo/detail/index.vue @@ -1,39 +1,36 @@ + \ No newline at end of file diff --git a/pages/skInfo/detail/krqx/chartOptions.js b/pages/skInfo/detail/krqx/chartOptions.js new file mode 100644 index 0000000..76efa7e --- /dev/null +++ b/pages/skInfo/detail/krqx/chartOptions.js @@ -0,0 +1,80 @@ +import {GetInterval} from "../../../../utils/tools" +export default function DrpOption(data) { + const maxVal = Math.ceil(Math.max(...data.map(obj => obj.rz))) + const minVal = Math.floor(Math.min(...data.map(obj => obj.rz))) + const maxValX = Math.max(...data.map(obj => obj.w)) + const minValX = Math.min(...data.map(obj => obj.w)) + let arr = [] + + data.forEach(item=>{ + arr.push([item.w,item.rz]) + }) + let eopts = { + tooltip: { + trigger: 'axis', + }, + grid: [ + { + top: "12%", + left: "12%", + right: "18%", + bottom: "8%" + }, + ], + xAxis: [ + { + name: "库容(万m³)", + nameGap: 5, + type: 'value', + min:Math.floor(minValX / 5) *5, + max:Math.ceil(maxValX / 5) *5, + interval:GetInterval(minValX,maxValX), + data: data.map(o => o.w), + splitLine: { + show: false + }, + } + ], + yAxis: [ + { + type: 'value', + name: "库水位(m)", + minInterval:1, + splitLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.25, + type: 'dotted' + } + }, + axisLabel: { + color: '#333', + fontSize: 12, + }, + axisLine: { + show: true + }, + axisTick: { + show: true, + }, + min: minVal, + max: maxVal + } + ], + }; + let chartData = { + series: [ + { + type: 'line', + color: "#007AFD", + data: arr, + smooth: true + }, + ] + }; + return { + eopts, + chartData + } +} \ No newline at end of file diff --git a/pages/skInfo/detail/krqx/index.vue b/pages/skInfo/detail/krqx/index.vue new file mode 100644 index 0000000..c9955a2 --- /dev/null +++ b/pages/skInfo/detail/krqx/index.vue @@ -0,0 +1,56 @@ + + + \ No newline at end of file diff --git a/pages/skInfo/detail/krqx/jcsjTable.vue b/pages/skInfo/detail/krqx/jcsjTable.vue new file mode 100644 index 0000000..dd7a4bd --- /dev/null +++ b/pages/skInfo/detail/krqx/jcsjTable.vue @@ -0,0 +1,85 @@ + + + + + \ No newline at end of file diff --git a/pages/skInfo/detail/tzcs.vue b/pages/skInfo/detail/tzcs.vue new file mode 100644 index 0000000..fe4f9e5 --- /dev/null +++ b/pages/skInfo/detail/tzcs.vue @@ -0,0 +1,119 @@ + + + \ No newline at end of file diff --git a/pages/xcrw/index.vue b/pages/xcrw/index.vue index bf5c4aa..1f0cf55 100644 --- a/pages/xcrw/index.vue +++ b/pages/xcrw/index.vue @@ -87,7 +87,7 @@ this.getData() }, handleStartTime(e){ - let time = moment(e.value).format("YYYY-MM-DD HH:mm") + let time = moment(e.value).format("YYYY-MM-DD HH:mm") this.stm = time this.showTime = false }, diff --git a/pages/ylzList/detail/index.vue b/pages/ylzList/detail/index.vue new file mode 100644 index 0000000..b151bb3 --- /dev/null +++ b/pages/ylzList/detail/index.vue @@ -0,0 +1,172 @@ + + + + \ No newline at end of file diff --git a/pages/ylzList/detail/jcOptions.js b/pages/ylzList/detail/jcOptions.js new file mode 100644 index 0000000..fbdbf4b --- /dev/null +++ b/pages/ylzList/detail/jcOptions.js @@ -0,0 +1,181 @@ + +import echarts from 'echarts/lib/echarts'; +export default function DrpOption(echartData) { + console.log("echartData",echartData); + + let totalDrp = 0; + const DRPLEVEL = [10, 20, 50, 100, 250]; + const maxVal = DRPLEVEL.find(o => o > totalDrp); + const xMaxVal = echartData?.actual ? DRPLEVEL.find(o => { + let max = Math.max(...echartData?.actual || []) + return o > max + }):maxVal + // const xMaxVal = Math.ceil(Math.max(...echartData.actual)) + 2 + const yMaxVal = echartData?.actual ? DRPLEVEL.find(o => { + let max = Math.max(...echartData?.total) + return o > max + }): maxVal + let eopts = { + tooltip: { + trigger: 'axis', + }, + grid: { + x: 40, + y: 30, + x2: 30, + y2: 28, + borderWidth: 0 + }, + legend: { + // 显示图例 + show: true, + // 图例的位置 + data: ['实测', '累计'] + }, + calculable: true, + xAxis: [ + { + type: 'category', + data: echartData.time, + splitLine: { + show: false + }, + axisLabel: { + color: '#333', + fontSize: 12, + format:"jcDataFormat" + }, + axisLine: { + lineStyle: { + color: '#07a6ff', + width: 0.5, + } + }, + axisTick: { + show: false, + }, + } + ], + yAxis: [ + { + type: 'value', + position: 'left', + name:"雨量mm", + splitLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.25, + type: 'dashed' + } + }, + axisLabel: { + color: '#333', + fontSize: 12, + }, + axisLine: { + show: false + }, + axisTick: { + show: false, + }, + min: 0, + max: xMaxVal + }, + { + type: 'value', + position: 'right', + name:"累计mm", + splitLine: { + show: true, + lineStyle: { + color: '#07a6ff', + width: 0.25, + type: 'dashed' + } + }, + axisLabel: { + color: '#333', + fontSize: 12, + }, + axisLine: { + show: false + }, + axisTick: { + show: false, + }, + min: 0, + max: yMaxVal + } + ], + }; + let chartData = { + series: [ + { + name: '实测', + type: 'bar', + barWidth: '60%', + data: echartData.actual, + itemStyle: { + normal: { + barBorderRadius: [3, 3, 0, 0], + color: new echarts.graphic.LinearGradient( + 0, 0, 0, 1, + [ + { offset: 0, color: '#3876cd' }, + { offset: 0.5, color: '#45b4e7' }, + { offset: 1, color: '#54ffff' } + ] + ), + }, + }, + label: { + show: false, + }, + markPoint: { + data: [ + { type: 'max', name: '最大值', symbol: 'circle', symbolSize: 1, symbolOffset: [0, -12] }, + ] + }, + }, + { + yAxisIndex: 1, + name: '累计', + type: 'line', + showSymbol: false, + label: { + show: false, + }, + data: echartData.total, + lineStyle: { + normal: { + width: 1, + } + }, + areaStyle: { + normal: { + color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{ + offset: 0, + color: 'rgba(3, 194, 236, 0.3)' + }, { + offset: 0.8, + color: 'rgba(3, 194, 236, 0)' + } + ], false), + shadowColor: 'rgba(0, 0, 0, 0.1)', + shadowBlur: 10 + } + }, + itemStyle: { + normal: { + color: '#03C2EC' + } + }, + } + ] + }; + return { + eopts, + chartData + } +} \ No newline at end of file diff --git a/pages/ylzList/detail/jcTable.vue b/pages/ylzList/detail/jcTable.vue new file mode 100644 index 0000000..6687c1b --- /dev/null +++ b/pages/ylzList/detail/jcTable.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file diff --git a/pages/ylzList/detail/tjsjTable.vue b/pages/ylzList/detail/tjsjTable.vue new file mode 100644 index 0000000..527de70 --- /dev/null +++ b/pages/ylzList/detail/tjsjTable.vue @@ -0,0 +1,139 @@ + + + + + diff --git a/pages/ylzList/index.vue b/pages/ylzList/index.vue index ce19010..b291430 100644 --- a/pages/ylzList/index.vue +++ b/pages/ylzList/index.vue @@ -1,5 +1,5 @@