feat(): 新增汛情简报

main.js

@@ -8,7 +8,8 @@ import {
 } from '@escook/request-miniprogram'
 Vue.config.productionTip = false
 uni.$http = $http
-$http.baseUrl = 'http://223.75.53.141:83'
+// $http.baseUrl = 'http://223.75.53.141:83'
+$http.baseUrl = 'http://local.gunshiiot.com:18083'
 // 请求拦截器
 $http.beforeRequest = function (options) {
 	if (options.url.indexOf('/doLogin') == -1) {

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" : {

pages.json

@@ -201,6 +201,18 @@
         "navigationBarTitleText": ""
       }
     },
+    {
+      "path": "pages/briefList/index",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+     {
+      "path": "pages/briefList/detail/index",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
     {
       "path": "pages/messageList/detail/index",
       "style": {

pages/briefList/detail/index.vue

@@ -0,0 +1,204 @@
+<template>
+  <view
+    :style="{ height: '100vh', overflow: 'hidden', backgroundColor: '#f0f0f0' }"
+  >
+    <u-navbar
+      title="汛情简报"
+      :autoBack="true"
+      :titleStyle="{
+        fontSize: '18px',
+      }"
+      :height="44"
+      :safeAreaInsetTop="true"
+      leftIconSize="20"
+      leftIconColor="rgb(153, 153, 153)"
+    >
+    </u-navbar>
+    <view
+      class=""
+      style="
+        margin-top: 44px;
+        background-color: #f0f0f0;
+        border-top: 1px solid #f0f0f0;
+      "
+    >
+      <view
+        class=""
+        v-for="item in list"
+        style="margin: 10px; background-color: #fff; padding: 10px"
+      >
+        <view class="contentItem">
+          <view class="itemC">
+            <text>标题</text>
+            <text>{{ getTitleDate(item.date) }}汛情简报</text>
+          </view>
+          <view class="itemC">
+            <text>发布时间</text>
+            <text>{{ item.date }}</text>
+          </view>
+          <view class="itemC">
+            <view class="itemNo" style="flex-direction: column">
+              <text>消息内容</text>
+              <view class="textContent">
+                <span style="margin-left: 15px">{{ briefTime(item.date) }}</span
+                >8时，过去24小时最大累计降雨量
+                <span class="xqjb-redColor">{{ item.drp24Sum }}mm</span>(<span
+                  class="xqjb-redColor"
+                  >{{ item.sumStnm }}</span
+                >)，最大点雨量
+                <span class="xqjb-redColor">{{ item.drp24Max }}mm/h</span>(<span
+                  class="xqjb-redColor"
+                  >{{ item.maxStnm }},{{ raimTime(item.maxTm) }}</span
+                >)。当前水库水位
+                <span class="xqjb-redColor">{{ item.rz8 }}m</span
+                >，汛限水位(<span>{{ item.flLowLimLev }}m</span>)，较昨日
+                <span class="xqjb-redColor"
+                  >{{ increaseWater(item.rz8, item.rzYesterday8) }}m</span
+                >，库容达
+                <span class="xqjb-redColor">{{ item.w }}万m³</span>。--
+                <span>{{ endDataString(item.date) }}</span>
+              </view>
+              <!-- <u--textarea
+                v-model="item.content"
+                placeholder="请输入内容"
+                disabled
+              ></u--textarea> -->
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <u-calendar
+      :show="show"
+      mode="range"
+      @confirm="confirm"
+      @cancel="cancel"
+    ></u-calendar>
+  </view>
+</template>
+
+<script>
+import moment from "moment";
+
+export default {
+  data() {
+    return {
+      show: false,
+      model: {
+        stm: "",
+        etm: "",
+      },
+      list: [],
+    };
+  },
+  onLoad(options) {
+    console.log("JSON.parse(options.item)", JSON.parse(options.item));
+
+    this.list.push(JSON.parse(options.item));
+  },
+  methods: {
+    endDataString(date) {
+      return moment(date).subtract(1, "days").format("YYYY-MM-DD 08:00");
+    },
+    increaseWater(rz8, rzYesterday8) {
+      let values = "";
+      if (rz8 && rzYesterday8) {
+        let dob = (rz8 - rzYesterday8).toFixed(2);
+        values = dob > 0 ? `上涨${Math.abs(dob)}` : `下降${Math.abs(dob)}`;
+      }
+      return values;
+    },
+    raimTime(maxTm) {
+      return maxTm ? moment(maxTm).format("D日H时") : "";
+    },
+    briefTime(date) {
+      return date ? moment(date).format("YYYY年M月D日") : "";
+    },
+    getTitleDate(date) {
+      return date ? moment(date).subtract(1, "days").format("YYYY-MM-DD") : "";
+    },
+    confirm(e) {
+      console.log(e);
+      this.model.stm = e[0];
+      this.model.etm = e[1];
+      this.show = false;
+    },
+    cancel() {
+      this.show = false;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.xqjb-redColor {
+  color: #db001b;
+}
+.myTitleStyle {
+  font-size: 30px;
+  background-color: red;
+  height: 200px;
+}
+
+.tabsClass {
+  margin-top: 44px;
+  height: 44px;
+  padding: 0 40px;
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
+}
+
+.item {
+  padding-bottom: 10px;
+  display: flex;
+  align-items: center;
+  // justify-content: space-between;
+  .blueTiao {
+    background-color: #007aff;
+    width: 5px;
+    height: 16px;
+    margin-right: 10px;
+  }
+  .title {
+    border-width: 0px;
+    font-family: "微软雅黑 Bold", "微软雅黑 Regular", "微软雅黑", sans-serif;
+    font-weight: 700;
+    font-style: normal;
+    font-size: 15px;
+    color: #666666;
+  }
+
+  .titleRight {
+    display: flex;
+    .border {
+      border-width: 0px;
+      background-color: rgba(236, 245, 255, 1);
+      box-sizing: border-box;
+      border-width: 1px;
+      border-style: solid;
+      border-color: rgba(187, 220, 255, 1);
+      border-radius: 5px;
+      box-shadow: none;
+      width: 58px;
+      height: 25px;
+      color: #689fff;
+      text-align: center;
+    }
+  }
+}
+.contentItem {
+  margin-top: 15px;
+  .itemC {
+    display: flex;
+    justify-content: space-between;
+    display: flex;
+    color: #666666;
+    padding: 10px;
+    border-bottom: 1px solid #f0f0f0;
+  }
+  .itemNo {
+    color: #666666;
+    padding: 10px;
+  }
+}
+</style>

pages/briefList/index.vue

@@ -0,0 +1,259 @@
+<template>
+  <view
+    :style="{ height: '100vh', overflow: 'hidden', backgroundColor: '#f0f0f0' }"
+  >
+    <u-status-bar></u-status-bar>
+    <u-navbar
+      title="汛情简报"
+      :autoBack="true"
+      :titleStyle="{
+        fontSize: '18px',
+      }"
+      :height="44"
+      :safeAreaInsetTop="true"
+      leftIconSize="20"
+      leftIconColor="rgb(153, 153, 153)"
+    >
+    </u-navbar>
+    <view
+      class=""
+      style="
+        margin-top: 44px;
+        background-color: #f0f0f0;
+        border-top: 1px solid #f0f0f0;
+      "
+    >
+      <view style="padding:0 10px,backgroundColor:#fff">
+        <view
+          class="time-ranger"
+          style="padding: 10px; margin-bottom: 0; background-color: #fff"
+        >
+          <view class="start-time">
+            <text>开始时间</text>
+            <text
+              @click="showTime = true"
+              style="margin-left: 10%; color: #3399ef"
+              >{{ startTime }}</text
+            >
+          </view>
+          <view class="end-time">
+            <text>结束时间</text>
+            <text
+              @click="showTime1 = true"
+              style="margin: 0 10%; color: #3399ef"
+              >{{ endTime }}</text
+            >
+            <view class="search-btn" @click="searchTm"> 搜索 </view>
+          </view>
+        </view>
+      </view>
+      <view
+        style="height: calc(100vh - 180px); overflow-y: auto"
+        v-if="list.length !== 0"
+      >
+        <view
+          class=""
+          v-for="(item, index) in list"
+          :key="index"
+          style="margin: 10px; background-color: #fff; padding: 10px"
+          @click="toDetail(item)"
+        >
+          <view class="item">
+            <view class="align-center">
+              <view class="title">
+                {{ getTitleDate(item.date) }}
+              </view>
+            </view>
+          </view>
+          <view class="contentItem">
+            <view class="itemC">
+              <span style="margin-left: 30px">{{
+                getBriefTime(item.date)
+              }}</span
+              >8时，过去24小时最大累计降雨量
+              <span class="xqjb-redColor">{{ item.drp24Sum }}mm</span>(<span
+                class="xqjb-redColor"
+                >{{ item.sumStnm }}</span
+              >)，最大点雨量
+              <span class="xqjb-redColor">{{ item.drp24Max }}mm/h</span>（...
+            </view>
+          </view>
+        </view>
+      </view>
+      <view
+        style="
+          height: calc(100vh - 150px);
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          background-color: #fff;
+        "
+        v-else
+      >
+        <image src="../../static/empty.png" mode=""></image>
+      </view>
+    </view>
+    <u-datetime-picker
+      :show="showTime"
+      v-model="stm"
+      mode="datetime"
+      @confirm="showTime = false"
+      @cancel="showTime = false"
+    ></u-datetime-picker>
+    <u-datetime-picker
+      :show="showTime1"
+      v-model="etm"
+      mode="datetime"
+      @confirm="showTime1 = false"
+      @cancel="showTime1 = false"
+    ></u-datetime-picker>
+  </view>
+</template>
+
+<script>
+import moment from "moment";
+const startData = moment().subtract(7, "days").format("YYYY-MM-DD");
+const endData = moment().format("YYYY-MM-DD");
+export default {
+  data() {
+    return {
+      minDate: moment().startOf("year").valueOf(),
+      maxDate: moment().valueOf(),
+      show: false,
+      showTime: false,
+      showTime1: false,
+      start: startData,
+      end: endData,
+      stm: startData,
+      etm: endData,
+      userList: uni.getStorageSync("value").data,
+      list: [],
+    };
+  },
+  onShow(options) {
+    this.getList();
+  },
+
+  computed: {
+    startTime: function () {
+      return this.stm ? moment(this.stm).format("YYYY-MM-DD") : this.start;
+    },
+    endTime: function () {
+      return this.etm ? moment(this.etm).format("YYYY-MM-DD") : this.end;
+    },
+  },
+  methods: {
+    getTitleDate(date) {
+      return date ? moment(date).subtract(1, "days").format("YYYY-MM-DD") : "";
+    },
+    getBriefTime(date) {
+      return date ? moment(date).format("YYYY年M月D日") : "";
+    },
+    searchTm() {
+      this.getList();
+    },
+    getList() {
+      const startDate1 = moment(this.stm).format("YYYY-MM-DD");
+      const endDate1 = moment(this.etm).format("YYYY-MM-DD");
+      uni.$http
+        .get(
+          `/gunshiApp/tsg/resBrief/getResBriefList?startDate=${startDate1}&endDate=${endDate1}`
+        )
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.list = res.data.data;
+          }
+        });
+    },
+    confirm(e) {
+      console.log(e);
+      this.model.start = e[0];
+      this.model.end = e[1];
+      this.show = false;
+    },
+    cancel() {
+      this.show = false;
+    },
+    toDetail(item) {
+      console.log(item);
+      uni.navigateTo({
+        url: "/pages/briefList/detail/index?item=" + JSON.stringify(item),
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.uni-input-placeholder {
+  text-align: center;
+}
+
+.myTitleStyle {
+  font-size: 30px;
+  background-color: red;
+  height: 200px;
+}
+
+.tabsClass {
+  margin-top: 44px;
+  height: 44px;
+  padding: 0 40px;
+  border-top: 1px solid #eee;
+  border-bottom: 1px solid #eee;
+}
+
+.item {
+  // border-bottom: 1px solid #f0f0f0;
+  padding-bottom: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .blueTiao {
+    background-color: #2a7efa;
+    width: 8px;
+    height: 8px;
+    border-radius: 50%;
+    margin-right: 10px;
+  }
+
+  .title {
+    border-width: 0px;
+    font-family: "微软雅黑 Bold", "微软雅黑 Regular", "微软雅黑", sans-serif;
+    font-weight: 700;
+    font-style: normal;
+    font-size: 15px;
+    color: #666666;
+  }
+
+  .titleRight {
+    display: flex;
+
+    .border {
+      border-width: 0px;
+      background-color: rgba(236, 245, 255, 1);
+      box-sizing: border-box;
+      border-width: 1px;
+      border-style: solid;
+      border-color: rgba(187, 220, 255, 1);
+      border-radius: 5px;
+      box-shadow: none;
+      width: 58px;
+      height: 25px;
+      color: #689fff;
+      text-align: center;
+    }
+  }
+}
+
+.contentItem {
+  .itemC {
+    color: #666666;
+    padding: 10px;
+  }
+  .xqjb-redColor {
+    color: #db001b;
+  }
+}
+</style>

pages/homeIndex/index.vue

@@ -4,86 +4,153 @@
     <view class="info">
       <div class="left">
         <div class="icon">
-					<image style="width: 100%; height: 100%; border-radius: 50%" :src="default_src" mode="aspectFill">
+          <image
+            style="width: 100%; height: 100%; border-radius: 50%"
+            :src="default_src"
+            mode="aspectFill"
+          >
           </image>
         </div>
         <div class="info_name">
           <div v-if="userList.userName">{{ userList.nickName }}</div>
           <div v-if="userList.dept">
-						{{ userList.dept.deptName || '' }}
+            {{ userList.dept.deptName || "" }}
           </div>
         </div>
       </div>
       <div class="right">
-				<u-icon name="bell-fill" size="30" color="#fff" @click="todetailmessgae()">
+        <u-icon
-
+          name="bell-fill"
+          size="30"
+          color="#fff"
+          @click="todetailmessgae()"
+        >
         </u-icon>
-				<u-badge bgColor=" #de2433" :offset='[25,20]' :value="messagelist.length" :absolute='true'></u-badge>
+        <u-badge
+        v-if="messagelist"
+          bgColor=" #de2433"
+          :offset="[25, 20]"
+          :value="messagelist.length"
+          :absolute="true"
+        ></u-badge>
       </div>
     </view>
     <!-- nav -->
-		<view class="navBar" style="display: flex;flex-wrap: wrap;">
+    <view class="navBar" style="display: flex; flex-wrap: wrap">
       <div class="navList" v-for="(item, index) in getNavList" :key="index">
-				<div @click="myNavigateTo(item.url,item.value)"
+        <div
-					style="display:flex;flex-direction: column;align-items: center;">
+          @click="myNavigateTo(item.url, item.value)"
+          style="display: flex; flex-direction: column; align-items: center"
+        >
           <div class="navIcon">
-						<image style="width: 100%; height: 100%" :src="item.icon" mode="aspectFit"></image>
+            <image
-						<div class="readStatus" v-show="
+              style="width: 100%; height: 100%"
+              :src="item.icon"
+              mode="aspectFit"
+            ></image>
+            <div
+              class="readStatus"
+              v-show="
                 (warnStatus && item.key == 2) ||
-                (handleStatus && item.key ==6) ||(xcStatus && item.key == 5) 
+                (handleStatus && item.key == 6) ||
-              "></div>
+                (xcStatus && item.key == 5)
+              "
+            ></div>
           </div>
           <div class="navTxt">{{ item.value }}</div>
         </div>
       </div>
     </view>
+    <view class="warn" @click="todetailBriefmessgae()">
+      <view style="display: flex; align-items: center;justify-content: space-between;">
+        <view class="xqjb-title-left">
+          <view
+            style="
+              width: 8rpx;
+              height: 30rpx;
+              margin-right: 16rpx;
+              vertical-align: middle;
+              background-color: #0297d7;
+            "
+          ></view
+          ><span style="color: #000">汛情简报</span>
+        </view>
+        <view >{{startDate}}</view>
+      </view>
+      <view class="textContent">
+				<span style="margin-left: 30px;">{{briefTime}}</span>8时，过去24小时最大累计降雨量
+				<span class="xqjb-redColor" >{{resBriefObj.drp24Sum}}mm</span>(<span class="xqjb-redColor">{{resBriefObj.sumStnm}}</span>)，最大点雨量
+				<span class="xqjb-redColor">{{resBriefObj.drp24Max}}mm/h</span>(<span class="xqjb-redColor">{{resBriefObj.maxStnm}}，{{raimTime}}</span>)。当前水库水位
+				<span class="xqjb-redColor">{{resBriefObj.rz8}}m</span>，汛限水位(<span>{{resBriefObj.flLowLimLev}}m</span>)，较昨日
+				<span class="xqjb-redColor">{{increaseWater}}m</span>，库容达
+				<span class="xqjb-redColor">{{resBriefObj.w}}万m³</span>。--
+				<span>{{endDataString}}</span>
+			</view>
+    </view>
     <view class="warn">
       <sk-info />
     </view>
     <view class="warn1" v-for="item in Ylzlist" :key="item.stnm">
-			<ylz-list :item='item' />
+      <ylz-list :item="item" />
     </view>
     <view class="warn1" v-for="item in swzList" :key="item.stcd">
-			<SwzList :item='item'/>
+      <SwzList :item="item" />
     </view>
-		<view class="info_24"
+    <view
-			:style="{display:'flex',justifyContent:'center',alignItems:'center',padding:'5px 0',margin:'0'}">
+      class="info_24"
-			<image :style="{width:'20px',height:'20px',marginRight:'10px'}" src="../../static/logoc.png"></image>
+      :style="{
+        display: 'flex',
+        justifyContent: 'center',
+        alignItems: 'center',
+        padding: '5px 0',
+        margin: '0',
+      }"
+    >
+      <image
+        :style="{ width: '20px', height: '20px', marginRight: '10px' }"
+        src="../../static/logoc.png"
+      ></image>
       <div>技术支持: 湖北鲧石物联科技有限公司</div>
     </view>
   </view>
 </template>
 
 <script>
-	import moment from 'moment'
+import moment from "moment";
-	const warnStm = moment().subtract(1, "days").format("YYYY-MM-DD HH:mm:ss")
+const warnStm = moment().subtract(1, "days").format("YYYY-MM-DD HH:mm:ss");
-	const warnetm = moment().format("YYYY-MM-DD HH:mm:ss")
+const warnetm = moment().format("YYYY-MM-DD HH:mm:ss");
-	const stm = moment().startOf('year').format("YYYY-MM-DD HH:mm:ss");
+const stm = moment().startOf("year").format("YYYY-MM-DD HH:mm:ss");
 const etm = moment().format("YYYY-MM-DD HH:mm:ss");
-	import SkInfo from '../skInfo/index.vue'
+const startDate = moment().subtract(1,'days').format("YYYY-MM-DD");
-	import YlzList from '../ylzList/index.vue'
+const endDate = moment().format("YYYY-MM-DD");
-	import SwzList from "../sws/index.vue"
+import SkInfo from "../skInfo/index.vue";
+import YlzList from "../ylzList/index.vue";
+import SwzList from "../sws/index.vue";
 let timer = null;
 export default {
   components: {
     SkInfo,
     YlzList,
-			SwzList
+    SwzList,
   },
   data() {
     return {
       Ylzlist: [],
-				userList: uni.getStorageSync('value'),
+      userList: uni.getStorageSync("value"),
-				default_src: uni.getStorageSync('avatar'),
+      default_src: uni.getStorageSync("avatar"),
       messagelist: [],
       xcStatus: false,
       ylzList: [],
       swzList: [],
+			resBriefObj:{},
+			startDate,
+			endDate,
       warnStatus: false, //预警
       handleStatus: false, //问题处理
-			}
+    };
   },
   onPullDownRefresh() {
+		this.getresBriefList();
     this.getYjData();
     this.getXcrwData();
     this.getHandleData();
@@ -96,111 +163,151 @@
     getNavList() {
       return [
         {
-						value: '综合监视',
+          value: "综合监视",
           key: 1,
-						icon: '../../static/tabs/zhjs.png',
+          icon: "../../static/tabs/zhjs.png",
-						url: '/pages/zhjs/index'
+          url: "/pages/zhjs/index",
         },
         {
-						value: '预警',
+          value: "预警",
           key: 2,
-						icon: '../../static/tabs/yujing_icon@2x2.png',
+          icon: "../../static/tabs/yujing_icon@2x2.png",
-						url: '/pages/yj/index'
+          url: "/pages/yj/index",
         },
         {
-						value: '视频监控',
+          value: "视频监控",
           key: 3,
-						icon: '../../static/tabs/spjk.png',
+          icon: "../../static/tabs/spjk.png",
-						url: '/pages/spjk/index'
+          url: "/pages/spjk/index",
         },
         {
-						value: '安全监测',
+          value: "安全监测",
           key: 4,
-						icon: '../../static/tabs/aqjc.png',
+          icon: "../../static/tabs/aqjc.png",
-						url: '/pages/aqjc/index'
+          url: "/pages/aqjc/index",
         },
         {
-						value: '巡查任务',
+          value: "巡查任务",
           key: 5,
-						icon: '../../static/tabs/xcrw.png',
+          icon: "../../static/tabs/xcrw.png",
-						url: '/pages/xcrw/index'
+          url: "/pages/xcrw/index",
         },
         {
-          	value: '问题处理',
+          value: "问题处理",
           key: 6,
-          	icon: '../../static/tabs/wtcl.png',
+          icon: "../../static/tabs/wtcl.png",
-          	url: '/pages/wtcl/index'
+          url: "/pages/wtcl/index",
+        },
+      ];
+    },
+		briefTime(){
+			return this.resBriefObj.date ? moment(this.resBriefObj.date).format('YYYY年M月D日') :''
+		},
+		raimTime(){
+			return this.resBriefObj.maxTm ? moment(this.resBriefObj.maxTm).format('D日H时') :''
+		},
+		increaseWater(){
+			const {rz8,rzYesterday8} = this.resBriefObj
+			let values = ''
+			if(rz8 && rzYesterday8){
+        let dob = Math.abs((rz8-rzYesterday8).toFixed(2))
+				values = dob > 0? `上涨${Math.abs(dob)}`:`下降${Math.abs(dob)}`
 			}
-				]
+			return values
+		},
+		endDataString(){
+			return moment(this.endDate).format('YYYY-MM-DD 08:00');
 		}
   },
   methods: {
     getYlzList() {
-				uni.$http.post('/gunshiApp/tsg/stPptnRReal/list').then(res => {
+      uni.$http.post("/gunshiApp/tsg/stPptnRReal/list").then((res) => {
         if (res.data.code == 200) {
-						this.Ylzlist = res.data.data
+          this.Ylzlist = res.data.data;
         }
-				})
+      });
+    },
+		// 获取汛情简报数据
+		  getresBriefList() {
+      uni.$http.get(`/gunshiApp/tsg/resBrief/getResBriefList?startDate=${startDate}&endDate=${endDate}`).then((res) => {
+        if (res.data.code == 200) {
+					  this.resBriefObj = res.data.data[0];
+        }
+      });
     },
     getList() {
-				uni.$http.post('/gunshiApp/tsg/messageCenter/list', {
+      uni.$http
-					start: '',
+        .post("/gunshiApp/tsg/messageCenter/list", {
-					end: ''
+          start: "",
-				}).then(res => {
+          end: "",
-					if (res.data.code == 200) {
-						this.messagelist = res.data.data
-					}
         })
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.messagelist = res.data.data;
+          }
+        });
     },
     getSwList() {
-				uni.$http.post('/gunshiApp/tsg/reservoir/water/listV2',{sources:['SW','SK']}).then(res=>{
+      uni.$http
-					this.swzList=res.data.data
+        .post("/gunshiApp/tsg/reservoir/water/listV2", {
+          sources: ["SW", "SK"],
         })
+        .then((res) => {
+          this.swzList = res.data.data;
+        });
     },
     todetailmessgae() {
       uni.navigateTo({
-					url: '/pages/messageList/index'
+        url: "/pages/messageList/index",
-				})
+      });
+    },
+ todetailBriefmessgae() {
+      uni.navigateTo({
+        url: "/pages/briefList/index",
+      });
     },
-
     async setInsert(menu2) {
       try {
         const params = {
-						createId: uni.getStorageSync('value').userId,
+          createId: uni.getStorageSync("value").userId,
           loginType: 1,
-						menu1: '首页',
+          menu1: "首页",
-						menu2: menu2 || '首页',
+          menu2: menu2 || "首页",
-					}
+        };
-					const {
+        const { data } = await uni.$http.post(
-						data
+          "/gunshiApp/tsg/visitMenuLog/insert",
-					} = await uni.$http.post('/gunshiApp/tsg/visitMenuLog/insert', params)
+          params
+        );
       } catch (error) {}
     },
     myNavigateTo(url, menu2) {
       uni.navigateTo({
-					url: url // 跳转到对应路径的页面
+        url: url, // 跳转到对应路径的页面
-				})
+      });
-				this.setInsert(menu2)
+      this.setInsert(menu2);
     },
 
     // 问题处理
     async getHandleData() {
       let params = {
-      		"pageSo": {
+        pageSo: {
-      			"pageSize": 10,
+          pageSize: 10,
-      			"pageNumber": 1
+          pageNumber: 1,
         },
-      		"dateTimeRangeSo": {
+        dateTimeRangeSo: {
           start: stm,
-      			end: etm
+          end: etm,
         },
-      		"isHandle": 0,
+        isHandle: 0,
-      		"inspectUserId": uni.getStorageSync('value').userId
+        inspectUserId: uni.getStorageSync("value").userId,
-      	}
+      };
       try {
-      		const res = await uni.$http.post("/gunshiApp/tsg/inspect/detail/page", params)
+        const res = await uni.$http.post(
-      		if (res.data.data.records.length > 0) {
+          "/gunshiApp/tsg/inspect/detail/page",
-      			this.handleStatus = true
+          params
+        );
+        if (res.data.data.records?.length > 0) {
+          this.handleStatus = true;
         }
       } catch (error) {
         uni.$showMsg();
@@ -210,19 +317,17 @@
     async getYjData() {
       const params = {
         start: warnStm,
-					end: warnetm
+        end: warnetm,
-				}
+      };
       try {
-					const res = await uni.$http.post("/gunshiApp/tsg/stQxWarnR/home/warn", params)
+        const res = await uni.$http.post(
-					const {
+          "/gunshiApp/tsg/stQxWarnR/home/warn",
-						flowWarn,
+          params
-						pressWarn,
+        );
-						qxWarn,
+        const { flowWarn, pressWarn, qxWarn, shiftWarn } = res.data.data;
-						shiftWarn
+        const arr = [...flowWarn, ...pressWarn, ...qxWarn, ...shiftWarn];
-					} = res.data.data
+        if (arr?.length > 0) {
-					const arr = [...flowWarn, ...pressWarn, ...qxWarn, ...shiftWarn]
+          this.warnStatus = true;
-					if (arr.length > 0) {
-						this.warnStatus = true
         }
       } catch (error) {
         uni.$showMsg();
@@ -230,21 +335,24 @@
     },
     // 巡查任务
     async getXcrwData() {
-				const userId = uni.getStorageSync('value').userId
+      const userId = uni.getStorageSync("value").userId;
       const params = {
         dateRangeSo: {
           start: stm,
           end: etm,
         },
         inspectUserId: userId,
-					statusList: [0, 1]
+        statusList: [0, 1],
-				}
+      };
       try {
-					const res = await uni.$http.post("/gunshiApp/tsg/inspect/task/list", params)
+        const res = await uni.$http.post(
-					if (res.data.data.length > 0) {
+          "/gunshiApp/tsg/inspect/task/list",
-						this.xcStatus = true
+          params
+        );
+        if (res.data.data?.length > 0) {
+          this.xcStatus = true;
         } else {
-						this.xcStatus = false
+          this.xcStatus = false;
         }
       } catch (error) {
         uni.$showMsg();
@@ -254,6 +362,7 @@
 
   onLoad() {
     this.getYlzList();
+		this.getresBriefList();
   },
 
   onShow() {
@@ -264,19 +373,27 @@
       that.getList();
     }, 10000);
     this.getHandleData();
-			this.setInsert()
+    this.setInsert();
     this.getYjData();
-			this.getSwList()
+    this.getSwList();
+		this.getresBriefList();
   },
   onHide() {
-			clearInterval(timer)
+    clearInterval(timer);
     timer = null;
   },
-
+};
-	}
 </script>
 
 <style lang="scss" scoped>
+
+.xqjb-redColor{
+	color:#db001b
+}
+.xqjb-title-left{
+	display: flex;
+	align-items: center;
+}
 .container {
   position: relative;
   font-size: 14px;
@@ -284,7 +401,6 @@
   background-color: #f3f5f8;
   height: 100%;
   overflow: auto;
-
 }
 
 .info {

pages/mypage/mypage.vue

@@ -6,8 +6,8 @@
 				</image>
 			</div>
 			<div class="user">
-				<div class="username">{{this.userList.nickName}}</div>
+				<div class="username">{{userList.nickName}}</div>
-				<div class="userresponse">{{this.userList.dept.deptName}}</div>
+				<div class="userresponse">{{userList.dept.deptName}}</div>
 			</div>
 		</view>
 		<view class="funcBar">
@@ -48,6 +48,7 @@
 			url: '/pages/modifyPassword/modifyPassword'
 		},
 	]
+  console.log(uni.getStorageSync('value'));
 	export default {
 		data() {
 			return {

pages/skInfo/index.vue

@@ -61,8 +61,8 @@
 				stStcd:'',
 				shStcd:'',
 				imageList:[],
-				baseUrl:'http://223.75.53.141:9102/test.by-lyf.tmp',
+				baseUrl:'http://223.75.53.141:83',
-				showImg:'../../static/empty.png'
+				showImg:'../../static/nopic.png'
 				
 			}
 		},

pages/upgrade/index.vue

@@ -86,7 +86,8 @@
                 if (this.info.url) {
                     this.isStartDownload = true
                          //开始下载App
-                    const baseUrl = `http://223.75.53.141:83/gunshiApp/tsg/common/download/resource?resource=${this.info.url}`     
+                    // 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}`
                     downloadApp(baseUrl, current => {
                         //下载进度监听
                         this.hasProgress = true