From 849ee99c3f33a4ca14b92e577c210e321f0360d2 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Mon, 11 Nov 2024 13:33:29 +0800
Subject: [PATCH] =?UTF-8?q?styles():=20=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/aqjc/index.vue                          | 767 +++++++++---------
 pages/homeIndex/index.vue                     |  33 +-
 pages/mypage/compents/wtcl/index.vue          |   4 +-
 pages/mypage/compents/xcrw/index.vue          |   4 +-
 pages/skInfo/waterDatail/jcOptions.js         |  13 +-
 pages/wtcl/index.vue                          |   4 +-
 pages/xcrw/index.vue                          |   4 +-
 .../js_sdk/u-charts/config-echarts.js         |   3 +
 8 files changed, 449 insertions(+), 383 deletions(-)

diff --git a/pages/aqjc/index.vue b/pages/aqjc/index.vue
index 9bfef32..03d309f 100644
--- a/pages/aqjc/index.vue
+++ b/pages/aqjc/index.vue
@@ -1,399 +1,444 @@
 <template>
-        <view :style="{height:'100vh',overflow:'hidden',backgroundColor:'#fff'}">
-		<u-status-bar></u-status-bar>
-		<u-navbar title="安全监测" :autoBack="true" :titleStyle="{
+  <view :style="{height:'100vh',overflow:'hidden',backgroundColor:'#fff'}">
+    <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>
-       <picker @change="bindPickerChange"  :range="array" range-key="profileName" style="margin-top:50px;padding: 0 10px;">
-          <view class="uni-input12" > 
-            <view>{{profileName}}</view>
-            <u-icon name="arrow-down-fill" color="#000" size="15" ></u-icon>
-            </view>
-		</picker>
+    </u-navbar>
+    <picker @change="bindPickerChange" :range="array" range-key="profileName" style="margin-top:50px;padding: 0 10px;">
+      <view class="uni-input12">
+        <view>{{profileName}}</view>
+        <u-icon name="arrow-down-fill" color="#000" size="15"></u-icon>
+      </view>
+    </picker>
 
     <view class="jcsj-box">
-    <view class="time-ranger" >
+      <view class="time-ranger">
         <view class="start-time">
-        <text>开始时间</text>
-        <text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
-      </view>
-      <view class="end-time">
-        <text>结束时间</text>
-        <text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
-         <view class="search-btn" @click="searchHandle">
-          搜索
+          <text>开始时间</text>
+          <text @click="showTime=true" style="margin-left:15%;color:#3399ef">{{stm}}</text>
+        </view>
+        <view class="end-time">
+          <text>结束时间</text>
+          <text @click="showTime1=true" style="margin:0 15%;color:#3399ef">{{etm}}</text>
+          <view class="search-btn" @click="searchHandle">
+            搜索
+          </view>
         </view>
-      </view>
 
-    </view>
-    <view class="jcsj-content">
-      <view class="tool-btn">
-        <view class="scale-btn">
-          <button style="margin-right:10px" @click="fd">+</button>
-          <button @click="sx">-</button>
+      </view>
+      <view class="jcsj-content">
+        <view class="tool-btn">
+          <view class="scale-btn">
+            <u-button style="margin-right:10px" @click="fd" class="aqjc-custom-style">+</u-button>
+            <u-button @click="sx" class="aqjc-custom-style">-</u-button>
+          </view>
+          <view class="play-btn">
+            <uni-icons type="videocam" size="40" @click="play"></uni-icons>
+          </view>
         </view>
-        <view class="play-btn">
-          <uni-icons type="videocam" size="40" @click="play"></uni-icons>
+        <view class="jcsj-charts">
+          <movable-area :style="areaStyle">
+            <movable-view @scale="scale" direction="all" :scale-value="scaleValue" scale-min="0.5" scale="true"
+              scale-max="4" out-of-bounds="true">
+              <qiun-data-charts :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
+            </movable-view>
+          </movable-area>
+        </view>
+        <view style="margin-top: 20px;">
+          <JcsjTable :columns="columns" :data="dataSources" :newCol="newCol" :cols2="cols2" />
+        </view>
+
       </view>
-      </view>
-      <view class="jcsj-charts" >
-      <movable-area :style="areaStyle">
-        <movable-view @scale="scale" direction="all" :scale-value="scaleValue" scale-min="0.5" scale="true" scale-max="4" out-of-bounds="true">
-        <qiun-data-charts  :chartData="chartData.chartData" :echartsApp="true" :eopts="chartData.eopts" />
-        </movable-view>
-      </movable-area>
-      </view>
-      <view style="margin-top: 20px;">
-      <JcsjTable :columns="columns"  :data="dataSources" :newCol="newCol" :cols2="cols2"/>
-      </view>
-  
+      <u-datetime-picker :show="showTime" v-model="startTime" mode="datetime" @confirm="handleStartTime"
+        @cancel="showTime=false"></u-datetime-picker>
+      <u-datetime-picker :show="showTime1" v-model="endTime" mode="datetime" @confirm="handleEndTime"
+        @cancel="showTime1=false"></u-datetime-picker>
     </view>
-     <u-datetime-picker
-                :show="showTime"
-                v-model="startTime"
-                mode="datetime"
-                @confirm="handleStartTime"
-                @cancel="showTime=false"
-        ></u-datetime-picker>
-         <u-datetime-picker
-                :show="showTime1"
-                v-model="endTime"
-                mode="datetime"
-                @confirm="handleEndTime"
-                @cancel="showTime1=false"
-        ></u-datetime-picker>
-	   </view>
-     </view>
+  </view>
 </template>
 
 <script>
   import moment from "moment"
   import drpOption from './jrxOptions';
   import JcsjTable from "./jcsjTable"
-  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 {
+  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 {
 
-        data() {
-            return {
-                 startTime:stm,
-                endTime:etm,
-                stm,
-                etm,
-                showTime:false,
-                showTime1:false,
-                array:[],
-                profileCode:'',
-                dbType:'',
-                trData:[],
-                dataSources:[],
-                chartData: {chartData:{},eopts:{}}, 
-                areaStyle:{left:"-450px"},
-                scaleValue:0.5,
-                swiper:false,
-                timer:100, 
-                columns:[],
-                cols1:[
-                  {
-                    title: '序号',
-                    key: 'index',
-                    width: 60,
-                    align: 'center',
-                  },
-                  {
-                    title: '时间',
-                    key: 'time',
-                    width: 120,
-                    align: 'center',
-                  },
-                   { title: '库水位(m)', key: 'rz', dataIndex: 'rz', width: 150, align: "center" },
-                ],
-                cols2:[
-                  {title: '结果分析', key: 'status', dataIndex: 'status', width: 150, align: "center",}
-                ],
-                newCol:[]
-            }
+    data() {
+      return {
+        startTime: stm,
+        endTime: etm,
+        stm,
+        etm,
+        showTime: false,
+        showTime1: false,
+        array: [],
+        profileCode: '',
+        dbType: '',
+        trData: [],
+        dataSources: [],
+        chartData: {
+          chartData: {},
+          eopts: {}
         },
-          components:{
+        areaStyle: {
+          left: "-450px"
+        },
+        scaleValue: 0.5,
+        swiper: false,
+        timer: 100,
+        columns: [],
+        cols1: [{
+            title: '序号',
+            key: 'index',
+            width: 60,
+            align: 'center',
+          },
+          {
+            title: '时间',
+            key: 'time',
+            width: 120,
+            align: 'center',
+          },
+          {
+            title: '库水位(m)',
+            key: 'rz',
+            dataIndex: 'rz',
+            width: 150,
+            align: "center"
+          },
+        ],
+        cols2: [{
+          title: '结果分析',
+          key: 'status',
+          dataIndex: 'status',
+          width: 150,
+          align: "center",
+        }],
+        newCol: []
+      }
+    },
+    components: {
       JcsjTable
     },
-        computed:{
-            profileName(){
-                if(this.array.length > 0){
-                    return this.array.find(item => item.profileCode == this.profileCode).profileName;
-                }else{
-                    return '';
-                }
-            },
+    computed: {
+      profileName() {
+        if (this.array.length > 0) {
+          return this.array.find(item => item.profileCode == this.profileCode).profileName;
+        } else {
+          return '';
+        }
+      },
+    },
+    watch: {
+      profileCode: {
+        handler(newVal, oldVal) {
+          if (newVal) {
+            let name = this.array.find(item => item.profileCode == newVal).profileName;
+            this.dbType = name == "大坝B0+060" ? "1" :
+              name == "大坝B0+090" ? "2" :
+              name == "大坝B0+120" ? "2" : '1'
+              this.getDmTree();
+          }
         },
-        watch:{
-            profileCode:{
-                handler(newVal, oldVal) {
-                    if(newVal){
-                      let name = this.array.find(item => item.profileCode == newVal).profileName;
-                        this.dbType = name == "大坝B0+060" ? "1" :
-                                name == "大坝B0+090" ? "2" :
-                                name == "大坝B0+120" ? "2" : '1'
-                    }
-                },
-                immediate: true,
-            },
-            trData:{
-                handler(newVal, oldVal) {
-                  if(newVal){
-                    this.getTableData()
-                  }
-                },
-                deep: true,
-            },
-            dataSources:{
-                handler(newVal, oldVal) {
-                  if(newVal){
-                    this.chartData = {...drpOption(newVal[0],this.dbType)}
-                  }
-                },
-                deep: true,
-                immediate: true,    
-            },
-            swiper(newVal){
-              console.log("ww", newVal);
-              
-              if(newVal){
-                this.InitialScroll(this.dataSources)
-              }else{
-              clearInterval(this.timer)
+        immediate: true,
+      },
+      trData: {
+        handler(newVal, oldVal) {
+          if (newVal) {
+            this.getTableData()
+          }
+        },
+        deep: true,
+      },
+      dataSources: {
+        handler(newVal, oldVal) {
+          if (newVal) {
+            this.chartData = {
+              ...drpOption(newVal[0], this.dbType)
+            }
+          }
+        },
+        deep: true,
+        immediate: true,
+      },
+      swiper(newVal) {
+        console.log("ww", newVal);
+
+        if (newVal) {
+          this.InitialScroll(this.dataSources)
+        } else {
+          clearInterval(this.timer)
+        }
+      }
+    },
+    methods: {
+      InitialScroll(data) {
+        let index = 0;
+        this.timer = setInterval(() => {
+          console.log("data", data[index % data.length]);
+
+          this.chartData = {
+            ...drpOption(data[index % data.length], this.dbType)
+          }
+          index++;
+        }, 1000)
+      },
+      // 播放
+      play() {
+        this.swiper = !this.swiper;
+      },
+      // 放大回调
+      fd() {
+        if (this.scaleValue == 4) {
+          return;
+        } else {
+          this.scaleValue += 0.1;
+        }
+      },
+      // 缩小回调
+      sx() {
+        if (this.scaleValue == 0.5) {
+          return ''
+        } else {
+          this.scaleValue -= 0.1;
+        }
+      },
+      //  缩放
+      scale(e) {
+        this.areaStyle.left = -(e.detail.scale + 1) * 450 + 'px';
+      },
+      searchHandle() {
+        this.getTableData();
+      },
+      handleStartTime(e) {
+        let time = moment(e.value).format("YYYY-MM-DD HH:mm")
+        console.log("time", time);
+
+        this.stm = time
+        this.showTime = false
+      },
+      handleEndTime(e) {
+        let time = moment(e.value).format("YYYY-MM-DD HH:mm")
+        this.etm = time;
+        this.showTime1 = false
+      },
+      handleRanger(e) {
+        console.log(e);
+        this.tm = [...e]
+      },
+      bindPickerChange(e) {
+        this.profileCode = this.array[e.target.value].profileCode
+      },
+      //  获取监测点数据
+      async getMonthData() {
+        try {
+          const {
+            data
+          } = await uni.$http.post(
+            `/gunshiApp/xyt/attDamProfile/list`, )
+          if (data.code == 200) {
+            this.array = data.data
+            this.profileCode = data.data[0].profileCode;
+          }
+        } catch (e) {
+          uni.$showMsg();
+        }
+      },
+
+      // 获取坝面上点位数据
+      async getTableData() {
+        try {
+          const {
+            data
+          } = await uni.$http.post(
+            "/gunshiApp/xyt/osmoticPressR/infiltra/line", {
+              stationCodes: this.trData,
+              dateTimeRangeSo: {
+                start: moment(this.stm).format("YYYY-MM-DD HH:mm:00"),
+                end: moment(this.etm).format("YYYY-MM-DD HH:mm:00"),
               }
             }
-        },
-        methods:{
-          InitialScroll(data){
-            let index = 0; 
-            this.timer = setInterval(() => {
-              console.log("data",data[index % data.length]);
-              
-              this.chartData = {...drpOption(data[index % data.length],this.dbType)}
-              index++;
-            },1000)
-          },
-          // 播放
-          play(){
-            this.swiper = !this.swiper;
-          },
-          // 放大回调
-          fd(){
-            if(this.scaleValue == 4){
-              return;
-            }else{
-               this.scaleValue += 0.1;
-            }
-          },
-          // 缩小回调
-          sx(){
-            if(this.scaleValue == 0.5){
-              return''
-            }else{
-              this.scaleValue -= 0.1;
-            }
-          },
-            //  缩放
-              scale(e){
-                this.areaStyle.left = -(e.detail.scale + 1) * 450 + 'px';
-              },
-               searchHandle(){
-                this.getTableData();
-               }, 
-               handleStartTime(e){
-                let time = moment(e.value).format("YYYY-MM-DD HH:mm")
-                console.log("time",time);
-                
-                this.stm = time
-                this.showTime = false
-              }, 
-              handleEndTime(e){
-                 let time = moment(e.value).format("YYYY-MM-DD HH:mm")
-                 this.etm = time;
-                this.showTime1 = false
-              },
-              handleRanger(e){
-                console.log(e);
-                this.tm = [...e]
-              },
-              bindPickerChange(e) {
-                this.profileCode = this.array[e.target.value].profileCode
-            },
-               //  获取监测点数据
-             async getMonthData(){
-                try{ 
-                  const {data} = await uni.$http.post(
-                  `/gunshiApp/xyt/attDamProfile/list`,)
-                  if(data.code == 200){
-                    this.array =data.data
-                    this.profileCode = data.data[0].profileCode;
-                  }
-                }catch(e){      
-                 uni.$showMsg();
-                }
-              },
+          )
+          if (data.code == 200) {
+            let newArr = [];
+            let newData = data.data.map((s, i) => {
+              newArr.push(s.list.map(c => ({
+                [c.stationCode]: c.value || '-',
+                tm: c.tm,
 
-            // 获取坝面上点位数据
-            async getTableData(){
-                try {
-                    const {data} = await uni.$http.post(
-                        "/gunshiApp/xyt/osmoticPressR/infiltra/line",
-                        {
-                            stationCodes:this.trData,
-                            dateTimeRangeSo:
-                            {
-                               start:moment(this.stm).format("YYYY-MM-DD HH:mm:00"),
-                               end:moment(this.etm).format("YYYY-MM-DD HH:mm:00"),
-                            }
-                        }
-                    )
-                     if(data.code == 200){
-                         let newArr = [];
-                          let newData = data.data.map((s, i) => {
-                           newArr.push(s.list.map(c => ({
-                             [c.stationCode]: c.value || '-',
-                             tm: c.tm,
-
-                            })))
-                            return {
-                              tm: s.tm,
-                              rz: s.rz,
-                              status: s.status || '',
-                              inx:i+1
-                            }
-                          })
-                          let filterData = newArr.filter(s => s.length > 0).flat()
-                          let result = newData.map(s => {
-                            let tm1 = s.tm;
-                            let r = filterData.filter(t => {
-                             return t.tm == tm1
-                            })
-                            let obj = {};
-                            r.forEach(s1 => {
-                             obj = {...s1,...obj}
-                            })
-                            return {
-                              ...s,
-                              ...obj,
-                            }
-                          })
-              let res1 = result.map(item => ({...item,rz:(item.rz - 100).toFixed(2)})) //为了测试  最后需要删除
-                        this.dataSources = [...res1];
-                    }
-                } catch (error) {
-                     uni.$showMsg();
+              })))
+              return {
+                tm: s.tm,
+                rz: s.rz,
+                status: s.status || '',
+                inx: i + 1
+              }
+            })
+            let filterData = newArr.filter(s => s.length > 0).flat()
+            let result = newData.map(s => {
+              let tm1 = s.tm;
+              let r = filterData.filter(t => {
+                return t.tm == tm1
+              })
+              let obj = {};
+              r.forEach(s1 => {
+                obj = {
+                  ...s1,
+                  ...obj
                 }
-            },
-            // 获取各点
-            async getDmTree(){
-                try {
-                    const {data} = await uni.$http.post("/gunshiApp/xyt/attDamProfile/tree")
-                    if(data.code == 200){
-                      console.log("data",data);
-                      
-                        let filterData = data.data.filter(s => s.profileCode == this.profileCode)
-                        this.trData = filterData[0]?.children; 
-                        const newCol = filterData[0]?.children.map(s => ({
-                          title: `${s}(m)`,
-                          key: s,
-                          dataIndex: s,
-                          width: 150,
-                          align: "center",
-                      }))
-                      this.columns=[...this.cols1,...newCol,...this.cols2]
-                      this.newCol = newCol;
-                    }
-                } catch (error) {
-                     uni.$showMsg();
-                }
-            },
+              })
+              return {
+                ...s,
+                ...obj,
+              }
+            })
+            let res1 = result.map(item => ({
+              ...item,
+              rz: (item.rz - 100).toFixed(2)
+            })) //为了测试  最后需要删除
+            this.dataSources = [...res1];
+          }
+        } catch (error) {
+          uni.$showMsg();
+        }
+      },
+      // 获取各点
+      async getDmTree() {
+        try {
+          const {
+            data
+          } = await uni.$http.post("/gunshiApp/xyt/attDamProfile/tree")
+          if (data.code == 200) {
+            console.log("data", data);
 
-            // 拖动回调
-            onChange(e){
-              console.log(e); 
-            },
-        },
-        mounted() {
-            this.getMonthData()
-            this.getDmTree()
-        },
-    }
+            let filterData = data.data.filter(s => s.profileCode == this.profileCode)
+            this.trData = filterData[0].children;
+            const newCol = filterData[0].children.map(s => ({
+              title: `${s}(m)`,
+              key: s,
+              dataIndex: s,
+              width: 150,
+              align: "center",
+            }))
+            this.columns = [...this.cols1, ...newCol, ...this.cols2]
+            this.newCol = newCol;
+          }
+        } catch (error) {
+          uni.$showMsg();
+        }
+      },
+
+      // 拖动回调
+      onChange(e) {
+        console.log(e);
+      },
+    },
+    mounted() {
+      this.getMonthData()
+      this.getDmTree()
+    },
+  }
 </script>
 
 <style lang="scss" scoped>
-    .uni-input12{
-       display:flex;
-       justify-content: center;
-       column-gap: 30px;
-       align-items: center;
-       padding:5px 0;
-       border: 1px solid #f2f2f2;
-       border-left: none;
-       border-right: none;
+  .uni-input12 {
+    display: flex;
+    justify-content: center;
+    column-gap: 30px;
+    align-items: center;
+    padding: 5px 0;
+    border: 1px solid #f2f2f2;
+    border-left: none;
+    border-right: none;
     //    background-image: '../../static/images/';
-    }
-    .jcsj-box{
-  padding: 0 10px;
-  .time-ranger{
-    // display: flex;
-    // align-items: center;
-    margin-bottom: 10px;
-     .start-time, .end-time{
-      display: flex;
-      align-items: center;
-      padding: 10px 0;
-      border-bottom: 1px solid #dfdfdf;
-    }
-    .search-btn{
-      margin: 3px 0 0 5px;
-      // color: #3399ef;
-    }
   }
-   .jcsj-content{
-    max-height:100vh;
-    width: 100%;
-    overflow-y:auto;
-    overflow-x: hidden;
-    .tool-btn{
-      display: flex;
-      justify-content: space-between;
-      align-items: "center";
-      padding: 5px ;
-      .scale-btn{
+
+  .jcsj-box {
+    padding: 0 10px;
+
+    .time-ranger {
+      // display: flex;
+      // align-items: center;
+      margin-bottom: 10px;
+
+      .start-time,
+      .end-time {
         display: flex;
-        button{
-          height: 40px;
+        align-items: center;
+        padding: 10px 0;
+        border-bottom: 1px solid #dfdfdf;
+      }
+
+      .search-btn {
+        margin: 3px 0 0 5px;
+        // color: #3399ef;
+      }
+    }
+
+    .jcsj-content {
+      max-height: 100vh;
+      width: 100%;
+      overflow-y: auto;
+      overflow-x: hidden;
+
+      .tool-btn {
+        display: flex;
+        justify-content: space-between;
+        align-items: "center";
+        padding: 5px;
+
+        .scale-btn {
+          display: flex;
+
+          button {
+            height: 40px;
+          }
         }
       }
     }
+
+    .jcsj-charts {
+      width: 1310px;
+      height: 250px;
+      overflow-y: auto;
+
+      // margin-top: 20px;
+      &>movable-area {
+        height: 250px;
+        width: 3000px;
+        // position:fixed;
+        overflow: hidden;
+        z-index: 1000;
+        background-color: #efefef;
+
+        movable-view {
+          display: flex;
+          justify-content: center;
+          width: 1310px;
+          height: 380px;
+          background-color: #fff;
+          left: 450px;
+          top: 10px
+        }
+      }
+
+      .active {
+        border-color: #68bbff !important;
+        color: #68bbff;
+      }
+    }
+
+    .aqjc-custom-style {
+      width: 80rpx;
+    }
   }
-  .jcsj-charts{
-    width: 1310px;
-    height: 250px;
-    overflow-y: auto;
-    // margin-top: 20px;
-    &>movable-area {	
-			height: 250px;		
-			width: 3000px;
-			// position:fixed;
-			overflow: hidden;
-			z-index: 1000;
-      background-color: #efefef;
-			movable-view{
-				display: flex;
-				justify-content: center;
-				width: 1310px;
-				height: 380px;
-        background-color: #fff;
-        left:450px;
-        top:10px
-			}}
-  .active{
-    border-color: #68bbff !important;
-    color: #68bbff;
-  }}
-}
 </style>
\ No newline at end of file
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 2a5d111..10ce9ac 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -40,10 +40,9 @@
 		<view class="warn">
 			<sk-info />
 		</view>
-		<view class="warn" v-for="item in Ylzlist" :key="item.stnm">
+		<view class="warn1" v-for="item in Ylzlist" :key="item.stnm">
 			<ylz-list :item='item' />
 		</view>
-
 		<view class="info_24"
 			: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>
@@ -56,7 +55,7 @@
 	import moment from 'moment'
 	const stm = moment().startOf('year').format("YYYY-MM-DD HH:mm:ss");
 	const etm = moment().format("YYYY-MM-DD HH:mm:ss");
-	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")
 	import SkInfo from '../skInfo/index.vue'
 	import YlzList from '../ylzList/index.vue'
@@ -134,7 +133,7 @@
 			}
 		},
 		methods: {
-			
+
 			getYlzList() {
 				uni.$http.post('/gunshiApp/xyt/stPptnRReal/list').then(res => {
 					if (res.data.code == 200) {
@@ -207,8 +206,8 @@
 						"pageNumber": 1
 					},
 					"dateTimeRangeSo": {
-						start:stm,
-						end:etm
+						start: stm,
+						end: etm
 					},
 					"isHandle": 0,
 					"inspectUserId": uni.getStorageSync('value').userId
@@ -226,12 +225,17 @@
 			async getYjData() {
 				const params = {
 					start: warnStm,
-					end:warnetm
+					end: warnetm
 				}
 				try {
 					const res = await uni.$http.post("/gunshiApp/xyt/stQxWarnR/home/warn", params)
-					const {flowWarn,pressWarn,qxWarn,shiftWarn} = res.data.data
-					const arr = [...flowWarn,...pressWarn,...qxWarn,...shiftWarn]
+					const {
+						flowWarn,
+						pressWarn,
+						qxWarn,
+						shiftWarn
+					} = res.data.data
+					const arr = [...flowWarn, ...pressWarn, ...qxWarn, ...shiftWarn]
 					if (arr.length > 0) {
 						this.warnStatus = true
 					}
@@ -259,6 +263,7 @@
 
 <style lang="scss" scoped>
 	.container {
+		position: relative;
 		font-size: 14px;
 		line-height: 24px;
 		background-color: #f3f5f8;
@@ -337,11 +342,19 @@
 		background: #fff;
 	}
 
+.warn1 {
+		padding: 18rpx 20rpx;
+		text-align: left;
+		// margin-bottom: 12rpx;
+		background: #fff;
+	}
 	.info_24 {
+		width: 100%;
+		// position: fixed;
 		// padding: 15px;
 		background-color: #fff;
 		// margin-bottom: 12rpx;
-		// height: 40px;
+		height: 100px;
 	}
 
 	.title .line {
diff --git a/pages/mypage/compents/wtcl/index.vue b/pages/mypage/compents/wtcl/index.vue
index 631cc93..286ff16 100644
--- a/pages/mypage/compents/wtcl/index.vue
+++ b/pages/mypage/compents/wtcl/index.vue
@@ -23,14 +23,14 @@
 				</view>
 			</view>
 			<view style="height:calc(100vh - 150px);overflow: auto;" v-if='list.length !== 0'>
-				<view class="" v-for="(item,index) in list" :key="index"
+				<view class="" v-for="(item,index) in list" :key="index" @click="toDetail(item)"
 					style="margin:10px;background-color: #fff;padding: 10px;">
 					<view class="item">
 						<!-- {{item.title}} -->
 						<view class="title">
 							{{item.taskTitle}}
 						</view>
-						<view class="titleRight" @click="toDetail(item)">
+						<view class="titleRight" >
 							<view class="border">
 								{{item.isHandle==1?'已处理':'待处理'}}
 							</view>
diff --git a/pages/mypage/compents/xcrw/index.vue b/pages/mypage/compents/xcrw/index.vue
index ba0543e..0433d5b 100644
--- a/pages/mypage/compents/xcrw/index.vue
+++ b/pages/mypage/compents/xcrw/index.vue
@@ -21,13 +21,13 @@
 
         </view>
 		<view class="" style='overflow: auto;max-height:calc(100vh - 180px)' v-if="list.length !== 0">		
-			<view class="" v-for="(item,i) in list" :key="i" style="background-color: #fff;margin-top:10px;padding: 10px;">
+			<view class="" v-for="(item,i) in list" :key="i" @click="toDetail(item)" style="background-color: #fff;margin-top:10px;padding: 10px;">
 				<view class="item">
 					<!-- {{item.title}} -->
 					<view class="title">
 						{{item.taskTitle}}
 					</view>
-					<view class="titleRight" @click="toDetail(item)">
+					<view class="titleRight" >
 						<view class="border">
 							{{status[item.status]}}
 						</view>
diff --git a/pages/skInfo/waterDatail/jcOptions.js b/pages/skInfo/waterDatail/jcOptions.js
index c468fde..76980ac 100644
--- a/pages/skInfo/waterDatail/jcOptions.js
+++ b/pages/skInfo/waterDatail/jcOptions.js
@@ -1,5 +1,6 @@
 
 import echarts from 'echarts/lib/echarts';
+import { format } from 'echarts/lib/export';
 export default function DrpOption(data,num) { 
   const minL = Math.floor(Math.min(...data?.map(s => s.q)));
   const maxL = Math.ceil(Math.max(...data?.map(s => s.q)));
@@ -20,8 +21,8 @@ export default function DrpOption(data,num) {
     },
     grid:  {
       top: '20%',
-      left: '10%',
-      right: '14%',
+      left: '7%',
+      right: '11%',
       bottom: '10%',
       borderWidth: 0
     },
@@ -40,7 +41,8 @@ export default function DrpOption(data,num) {
         axisLabel: {
           color: '#333',
           fontSize: 14,
-          formatter: val => val.substr(0,'2020-11-11 11:11'.length)
+          // formatter: val => val.substr(0,'2020-11-11 11:11'.length)
+          format:"waterXaxis"
         },
         axisLine: {
           lineStyle: {
@@ -57,7 +59,10 @@ export default function DrpOption(data,num) {
       {
         type: 'value',
         position: 'left',
-        name:"流量(m³/s)",
+        name: "流量(m³/s)",
+        nameTextStyle: {
+          padding: [0, 0, 0, 30]
+        },
         splitLine: {
           show: true,
           lineStyle: {
diff --git a/pages/wtcl/index.vue b/pages/wtcl/index.vue
index 9b28f80..9d1e225 100644
--- a/pages/wtcl/index.vue
+++ b/pages/wtcl/index.vue
@@ -22,13 +22,13 @@
 				</view>
 			</view>
 			<view class="" v-if="list.length !== 0" style="height:calc(100vh - 180px);overflow: auto;">
-				<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;" >
+				<view class="" v-for="(item,i) in list" @click="toDetail(item)" :key="i" style="margin: 10px;background-color: #fff;padding: 10px;" >
 					<view class="item">
 						<!-- {{item.title}} -->
 						<view class="title">
 							{{item.taskTitle}}
 						</view>
-						<view class="titleRight" @click="toDetail(item)">
+						<view class="titleRight" >
 							<view class="border">
 								{{isHandle==0?'已处理':'待处理'}}
 							</view>
diff --git a/pages/xcrw/index.vue b/pages/xcrw/index.vue
index f37e8cc..20eb211 100644
--- a/pages/xcrw/index.vue
+++ b/pages/xcrw/index.vue
@@ -21,13 +21,13 @@
 
 			</view>
 			<view class="" style='overflow: auto;height:calc(100vh - 150px)' v-if="list.length !== 0">
-				<view class="" v-for="(item,i) in list" :key="i" style="background-color: #fff;margin-top:10px;padding: 10px;">
+				<view class="" v-for="(item,i) in list" :key="i" @click="toDetail(item)" style="background-color: #fff;margin-top:10px;padding: 10px;">
 					<view class="item">
 						<!-- {{item.title}} -->
 						<view class="title">
 							{{item.taskTitle}}
 						</view>
-						<view class="titleRight" @click="toDetail(item)">
+						<view class="titleRight" >
 							<view class="border">
 								{{status[item.status]}}
 							</view>
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
index 06a95f7..9ef8019 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
@@ -97,6 +97,9 @@ const cfe = {
 			return value
 		  }
 	  },
+	  "waterXaxis": function (val) {
+		  return val.substr(0,'2020-11-11 11:11'.length)
+	  },
     yAxisFormatDemo:function (value, index) {
       return value + '元';
     },