diff --git a/index.html b/index.html
index c3ff205..8bd05f0 100644
--- a/index.html
+++ b/index.html
@@ -12,6 +12,7 @@
+
diff --git a/main.js b/main.js
index 111564f..85d5ee8 100644
--- a/main.js
+++ b/main.js
@@ -13,13 +13,8 @@ $http.beforeRequest = function (options) {
uni.showLoading({
title: '数据加载中'
})
- if (options.url.indexOf('/my/') !== -1) {
- options.header = {
- Authorization: store.state.address.token
- }
- console.log(options.header)
- }
- if (options.url.indexOf('/getLoginInfo') !== -1) {
+
+ if (options.url.indexOf('/doLogin') == -1) {
options.header = {
'gs-token': uni.getStorageSync('Gs-Token')
}
diff --git a/manifest.json b/manifest.json
index 4d7c03a..949c906 100644
--- a/manifest.json
+++ b/manifest.json
@@ -16,7 +16,9 @@
"autoclose" : true,
"delay" : 0
},
- "modules" : {},
+ "modules" : {
+ "VideoPlayer" : {}
+ },
/* 模块配置 */
"distribute" : {
/* 应用发布信息 */
@@ -60,7 +62,7 @@
"usingComponents" : true
},
"vueVersion" : "2",
- "h5": {
- "template": "template.html"
+ "h5" : {
+ "template" : "template.html"
}
}
diff --git a/package-lock.json b/package-lock.json
index e94f375..bb1346d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,10 +7,10 @@
"": {
"dependencies": {
"@escook/request-miniprogram": "^0.2.1",
+ "crypto-js": "^4.2.0",
"echarts": "^4.9.0",
"es6-promise": "^4.2.8",
"flv.js": "^1.6.2",
- "crypto-js": "^4.2.0",
"moment": "^2.30.1"
}
},
@@ -19,6 +19,11 @@
"resolved": "https://registry.npmmirror.com/@escook/request-miniprogram/-/request-miniprogram-0.2.1.tgz",
"integrity": "sha512-ueWV5YsaEm/ycQZuEjMiA88GFMhfBQSjy9GrP9omy4xAQajkGTbYIlnhzsDfWzRPmRC1fKmAiKMrCVcgS+SHcQ=="
},
+ "node_modules/crypto-js": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+ "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+ },
"node_modules/echarts": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-4.9.0.tgz",
@@ -41,11 +46,6 @@
"webworkify-webpack": "^2.1.5"
}
},
- "node_modules/crypto-js": {
- "version": "4.2.0",
- "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
- "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
- },
"node_modules/moment": {
"version": "2.30.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
@@ -71,6 +71,11 @@
"resolved": "https://registry.npmmirror.com/@escook/request-miniprogram/-/request-miniprogram-0.2.1.tgz",
"integrity": "sha512-ueWV5YsaEm/ycQZuEjMiA88GFMhfBQSjy9GrP9omy4xAQajkGTbYIlnhzsDfWzRPmRC1fKmAiKMrCVcgS+SHcQ=="
},
+ "crypto-js": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
+ "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+ },
"echarts": {
"version": "4.9.0",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-4.9.0.tgz",
@@ -93,11 +98,6 @@
"webworkify-webpack": "^2.1.5"
}
},
- "crypto-js": {
- "version": "4.2.0",
- "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.2.0.tgz",
- "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
- },
"moment": {
"version": "2.30.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
diff --git a/pages.json b/pages.json
index f8f4b65..d634a9c 100644
--- a/pages.json
+++ b/pages.json
@@ -4,12 +4,12 @@
},
"pages": [
{
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
+ "path" : "pages/login/login",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
}
- },
+ },
{
"path": "pages/rain/rain",
"style": {
@@ -44,13 +44,7 @@
"navigationBarTitleText" : ""
}
},
- {
- "path" : "pages/login/login",
- "style" :
- {
- "navigationBarTitleText" : ""
- }
- },
+
{
"path" : "pages/forewarning/forewarning",
"style" :
@@ -85,8 +79,8 @@
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
- }
-
+ },
+ "onMessage": "handleMessage"
},
{
"path" : "pages/rain/rain",
@@ -125,32 +119,26 @@
"enablePullDownRefresh": false
}
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
}
- }
+
],
"tabBar": {
"color": "#333333",
"selectedColor": "#eb4450",
"list": [
- {
- "pagePath": "pages/index/index",
- "iconPath": "/static/tabs/my2_icon@2x.png",
- "selectedIconPath": "static/tabs/my2_icon@2x.png",
- "text": "pages"
- },
{
"pagePath": "pages/homeIndex/index",
"iconPath": "/static/tabs/首页@2x.png",
"selectedIconPath": "static/tabs/首页2@2x.png",
"text": "首页"
},
+ {
+ "pagePath": "pages/addressBook/addressBook",
+ "iconPath": "/static/tabs/my2_icon@2x.png",
+ "selectedIconPath": "static/tabs/my2_icon@2x.png",
+ "text": "通讯录"
+ },
{
"pagePath": "pages/mypage/mypage",
"iconPath": "/static/images/my1.png",
diff --git a/pages/hdDetail/spjk/spjk.vue b/pages/hdDetail/spjk/spjk.vue
index 3f4df08..8683ad3 100644
--- a/pages/hdDetail/spjk/spjk.vue
+++ b/pages/hdDetail/spjk/spjk.vue
@@ -9,17 +9,13 @@
>
-
-
-
+
+
+
-
-
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 0362985..08f501b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -79,6 +79,7 @@
if (res.data.data){
uni.setStorageSync('Gs-Token', res.data.data)
uni.$http.get('/gunshiApp/xfflood/getLoginInfo').then(res=>{
+ console.log("sss",res.data.data);
uni.setStorageSync('value', res.data.data)
})
}
diff --git a/pages/rain/rain.vue b/pages/rain/rain.vue
index 33eeac0..0c5ac99 100644
--- a/pages/rain/rain.vue
+++ b/pages/rain/rain.vue
@@ -17,12 +17,13 @@
+
{{selecetItem.adnm == "全部" ? "咸丰县" : selecetItem.adnm || columns[0][0].adnm}}
-
+
+
{{selecetItem1.basName == "全部" ? "流域" : selecetItem1.basName || "流域"}}
+
@@ -167,6 +170,9 @@
import Table from "./Table"
import filter from "../../static/images/filter.png"
import moment from "moment"
+ import {disType} from "../utils/dicType.js"
+ const adcd = uni.getStorageSync('value').adcd
+ const type = disType(adcd)
export default {
data() {
return {
@@ -206,7 +212,7 @@
etm:"",//结束时间
columns: //政区下拉
[
- [{"adnm": "咸丰县", "adcd": "422826100000000"}],[]
+ [{"adnm": "咸丰县", "adcd":adcd }],[]
],
columnData: [[]],
columns1:[[]], //流域选择,
@@ -216,6 +222,7 @@
basCode:'',
source:["SH","SW","QX","SK"],
stArg:'',
+ adcd:type == 1 ? undefined :adcd,
etm:moment().set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm"),
stm:moment().subtract(1, 'day').set({ hour: 8, minute: 0, second: 0, millisecond: 0 }).format("YYYY-MM-DD HH:mm")
}
@@ -230,6 +237,9 @@
stm:moment().subtract(this.formData.timeType, 'hours').format("YYYY-MM-DD HH:mm"),
etm:moment().format("YYYY-MM-DD HH:mm")
}
+ },
+ limit(){
+ return disType(adcd)
}
},
watch:{
diff --git a/pages/skDetail/skDetail.vue b/pages/skDetail/skDetail.vue
index c9f5ead..423af21 100644
--- a/pages/skDetail/skDetail.vue
+++ b/pages/skDetail/skDetail.vue
@@ -112,6 +112,7 @@