From ff3efc5b66a9fc6ecd8ef7beb0b691e492566793 Mon Sep 17 00:00:00 2001
From: lishenfeng <lishenfeng@gunshiiot.com>
Date: Tue, 14 Jan 2025 17:46:21 +0800
Subject: [PATCH] =?UTF-8?q?feat():=E5=B7=A5=E7=A8=8B=E6=A6=82=E5=86=B5?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                |  12 +
 pages/gcgk/index.vue      |  66 ++++
 pages/homeIndex/index.vue | 801 ++++++++++++++++++++------------------
 pages/syq/index.vue       |  46 +++
 pages/syq/slTable.vue     | 104 +++++
 pages/yj/detail/wyyj.vue  |  56 ++-
 pages/yj/index.vue        | 351 ++++++++++-------
 7 files changed, 880 insertions(+), 556 deletions(-)
 create mode 100644 pages/gcgk/index.vue
 create mode 100644 pages/syq/index.vue
 create mode 100644 pages/syq/slTable.vue

diff --git a/pages.json b/pages.json
index 05fad4b..4097c01 100644
--- a/pages.json
+++ b/pages.json
@@ -77,6 +77,18 @@
       "style": {
         "navigationBarTitleText": ""
       }
+    },
+     {
+      "path": "pages/gcgk/index",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/syq/index",
+      "style": {
+        "navigationBarTitleText": ""
+      }
     },
      {
       "path": "pages/zhjs/index",
diff --git a/pages/gcgk/index.vue b/pages/gcgk/index.vue
new file mode 100644
index 0000000..d34baa3
--- /dev/null
+++ b/pages/gcgk/index.vue
@@ -0,0 +1,66 @@
+<template>
+    <view :style="{height:'100vh',overflow:'auto',backgroundColor:'#fff',padding:'0 10px'}">
+        <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="project-gk">
+        <h4>一、项目概况</h4>
+        <p>工程名称：荆州市新建盐卡闸工程</p>
+        <p>建设地点：位于湖北省荆州市经济开发区，荆江河段左岸桩号745+614，紧挨盐卡泵站防洪闸。</p>
+        <p>工程类型：新建工程</p>
+        <p>主要建设内容：包括水工建筑物（如闸室、穿堤箱涵、消力池、海漫、进出口岸墙等）、机电设备、金属结构设备等。</p>
+        </view>
+         <view class="project-gm">
+        <h4>二、工程规模</h4>
+        <p>全长：890米</p>
+        <p>主要结构尺寸</p>
+        <p>进水渠：总长177.64米，包括进水渠明渠段和进水渠U型槽段。</p>
+        <p>箱涵段：总长626.36米，包括穿堤箱涵段和堤内箱涵段。</p>
+        <p>消力池：采用底流式消能设计，池深1.5米，池宽19.2米，池长25.0米。</p>
+        </view>
+          <view class="project-jd">
+        <h4>三、工程投资与进度</h4>
+        <p>工程总投资：19922.32万元，其中土建投资12650.59万元。</p>
+        <p>水土保持总投资：567.98万元（含主体已有投资408.79万元）。</p>
+        <p>开工时间：2024年6月</p>
+        <p>预计完工时间：2025年7月（另有说法为2025年8月），总工期14个月。</p>
+        </view>
+          <view class="project-fa">
+        <h4>四、水土保持方案</h4>
+        <p>水土流失防治标准：执行南方红壤区一级标准。</p>
+        <p>水土流失防治目标：水土流失治理度98%，土壤流失控制比达到1.0，渣土防护率达到99%，表土保护率92%，林草植被恢复率达到98%，林草覆盖率达到27%。</p>
+        <p>水土保持措施：包括工程措施、植物措施和临时措施等。</p>
+        </view>
+          <view class="project-bz">
+        <h4>五、防洪与灌溉标准</h4>
+        <p>防洪标准：盐卡闸防洪标准为百年一遇。</p>
+        <p>设计流量：每秒55立方米。</p>
+        <p>灌溉保障率：85%。</p>
+        </view>
+         <view class="project-xy">
+        <h4>六、工程效益</h4>
+        <p>灌溉效益：提高四湖流域中、下游灌溉保障率。</p>
+        <p>生态环境效益：有效改善荆州中心城区和四湖流域水生态环境。</p>
+        </view>
+        <view style="margin-bottom:10px">
+        <h4>七、其他信息</h4>
+        <p>公示情况：该工程的受理情况已在水利部长江水利委员会网站进行公示，公示期为10个工作日（2024年10月23日至2024年11月6日）。</p>
+        <p>建设目标：于2024年12月底具备应急通水能力。</p>
+        </view>
+    </view>
+</template>
+<style lang="scss">
+    .project-gk{
+        margin-top: 50px;
+    }
+    .project-gm,
+    .project-jd,
+    .project-fa,
+    .project-bz,
+    .project-xy
+    {
+        margin: 10px 0;
+    }
+</style>
\ No newline at end of file
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 5645265..245ef5d 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -1,424 +1,463 @@
 <template>
-	<view class="container">
-		<!-- 个人信息 -->
-		<view class="info">
-			<div class="left">
-				<div class="icon">
-					<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 || '' }}
-					</div>
-				</div>
-			</div>
-			<div class="right">
-				<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>
-			</div>
-		</view>
-		<!-- nav -->
-		<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)"
-					style="display:flex;flex-direction: column;align-items: center;">
-					<div class="navIcon">
-						<image style="width: 100%; height: 100%" :src="item.icon" mode="aspectFit"></image>
-						<div class="readStatus" v-show="
-                (warnStatus && item.key == 2)
-              "></div>
-					</div>
-					<div class="navTxt">{{ item.value }}</div>
-				</div>
-			</div>
-		</view>
-		<view class="warn">
-			<sk-info />
-		</view>
-		<view class="warn1" v-for="item in Ylzlist" :key="item.stnm">
-			<ylz-list :item='item' />
-		</view>
-		<view class="warn1" v-for="item in swzList" :key="item.stcd">
-			<SwzList :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>
-			<div>技术支持: 湖北鲧石物联科技有限公司</div>
-		</view>
-	</view>
+  <view class="container">
+    <!-- 个人信息 -->
+    <view class="info">
+      <div class="left">
+        <div class="icon">
+          <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 || "" }}
+          </div>
+        </div>
+      </div>
+      <div class="right">
+        <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>
+      </div>
+    </view>
+    <!-- nav -->
+    <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)"
+          style="display: flex; flex-direction: column; align-items: center"
+        >
+          <div class="navIcon">
+            <image
+              style="width: 100%; height: 100%"
+              :src="item.icon"
+              mode="aspectFit"
+            ></image>
+            <div class="readStatus" v-show="warnStatus && item.key == 2"></div>
+          </div>
+          <div class="navTxt">{{ item.value }}</div>
+        </div>
+      </div>
+    </view>
+    <view class="warn">
+      <sk-info />
+    </view>
+    <view class="warn1" v-for="item in Ylzlist" :key="item.stnm">
+      <ylz-list :item="item" />
+    </view>
+    <view class="warn1" v-for="item in swzList" :key="item.stcd">
+      <SwzList :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>
+      <div>技术支持: 湖北鲧石物联科技有限公司</div>
+    </view>
+  </view>
 </template>
 
 <script>
-	import moment from 'moment'
-	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'
-	import SwzList from "../sws/index.vue"
-	let timer = null;
-	export default {
-		components: {
-			SkInfo,
-			YlzList,
-			SwzList
-		},
-		data() {
-			return {
-				Ylzlist: [],
-				userList: uni.getStorageSync('value'),
-				default_src: uni.getStorageSync('avatar'),
-				messagelist: [],
-				ylzList: [],
-				swzList:[],
-				warnStatus: false, //预警
-			}
-		},
-		onPullDownRefresh() {
-			this.getYjData();
-			uni.$showMsg("刷新成功");
-			setTimeout(function () {
-				uni.stopPullDownRefresh();
-			}, 1000);
-		},
-		computed: {
-			getNavList() {
-				return [
-					{
-						value: '综合监视',
-						key: 1,
-						icon: '../../static/tabs/zhjs.png',
-						url: '/pages/zhjs/index'
-					},
-					{
-						value: '预警',
-						key: 2,
-						icon: '../../static/tabs/yujing_icon@2x2.png',
-						url: '/pages/yj/index'
-					},
-					{
-						value: '视频监控',
-						key: 3,
-						icon: '../../static/tabs/spjk.png',
-						url: '/pages/spjk/index'
-					},
-					{
-						value: '安全监测',
-						key: 4,
-						icon: '../../static/tabs/aqjc.png',
-						url: '/pages/aqjc/index'
-					},
-				]
-			}
-		},
-		methods: {
-			getYlzList() {
-				uni.$http.post('/gunshiApp/tsg/stPptnRReal/list').then(res => {
-					if (res.data.code == 200) {
-						this.Ylzlist = res.data.data
-					}
-				})
-			},
-			getList() {
-				uni.$http.post('/gunshiApp/tsg/messageCenter/list', {
-					start: '',
-					end: ''
-				}).then(res => {
-					if (res.data.code == 200) {
-						this.messagelist = res.data.data
-					}
-				})
-			},
-				getSwList(){
-				uni.$http.post('/gunshiApp/tsg/reservoir/water/list').then(res=>{
-					this.swzList=res.data.data
-				})
-			},
-			todetailmessgae() {
-				uni.navigateTo({
-					url: '/pages/messageList/index'
-				})
-			},
+import moment from "moment";
+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";
+import SwzList from "../sws/index.vue";
+let timer = null;
+export default {
+  components: {
+    SkInfo,
+    YlzList,
+    SwzList,
+  },
+  data() {
+    return {
+      Ylzlist: [],
+      userList: uni.getStorageSync("value"),
+      default_src: uni.getStorageSync("avatar"),
+      messagelist: [],
+      ylzList: [],
+      swzList: [],
+      warnStatus: false, //预警
+    };
+  },
+  onPullDownRefresh() {
+    this.getYjData();
+    uni.$showMsg("刷新成功");
+    setTimeout(function () {
+      uni.stopPullDownRefresh();
+    }, 1000);
+  },
+  computed: {
+    getNavList() {
+      return [
+        {
+          value: "工程概况",
+          key: 1,
+          icon: "../../static/tabs/zhjs.png",
+          url: "/pages/gcgk/index",
+        },
+        {
+          value: "巡查任务",
+          key: 5,
+          icon: "../../static/tabs/xcrw.png",
+          url: "/pages/xcrw/index",
+        },
+        {
+          value: "安全监测",
+          key: 4,
+          icon: "../../static/tabs/aqjc.png",
+          url: "/pages/aqjc/index",
+        },
+        {
+          value: "预(报)警",
+          key: 2,
+          icon: "../../static/tabs/yujing_icon@2x2.png",
+          url: "/pages/yj/index",
+        },
+        {
+          value: "视频监控",
+          key: 3,
+          icon: "../../static/tabs/spjk.png",
+          url: "/pages/spjk/index",
+        }, 
+		{
+          value: "水雨情",
+          key: 6,
+          icon: "../../static/tabs/spjk.png",
+          url: "/pages/syq/index",
+        },
+      ];
+    },
+  },
+  methods: {
+    getYlzList() {
+      uni.$http.post("/gunshiApp/tsg/stPptnRReal/list").then((res) => {
+        if (res.data.code == 200) {
+          this.Ylzlist = res.data.data;
+        }
+      });
+    },
+    getList() {
+      uni.$http
+        .post("/gunshiApp/tsg/messageCenter/list", {
+          start: "",
+          end: "",
+        })
+        .then((res) => {
+          if (res.data.code == 200) {
+            this.messagelist = res.data.data;
+          }
+        });
+    },
+    getSwList() {
+      uni.$http.post("/gunshiApp/tsg/reservoir/water/list").then((res) => {
+        this.swzList = res.data.data;
+      });
+    },
+    todetailmessgae() {
+      uni.navigateTo({
+        url: "/pages/messageList/index",
+      });
+    },
 
-			async setInsert(menu2) {
-				try {
-					const params = {
-						createId: uni.getStorageSync('value').userId,
-						loginType: 1,
-						menu1: '首页',
-						menu2: menu2 || '首页',
-					}
-					const {
-						data
-					} = await uni.$http.post('/gunshiApp/tsg/visitMenuLog/insert', params)
-				} catch (error) {}
-			},
-			myNavigateTo(url, menu2) {
-				uni.navigateTo({
-					url: url // 跳转到对应路径的页面
-				})
-				this.setInsert(menu2)
-			},
-			// 预警
-			async getYjData() {
-				const params = {
-					start: warnStm,
-					end: warnetm
-				}
-				try {
-					const res = await uni.$http.post("/gunshiApp/tsg/stQxWarnR/home/warn", params)
-					const {
-						flowWarn,
-						pressWarn,
-						qxWarn,
-						shiftWarn
-					} = res.data.data
-					const arr = [...flowWarn, ...pressWarn, ...qxWarn, ...shiftWarn]
-					if (arr.length > 0) {
-						this.warnStatus = true
-					}
-				} catch (error) {
-					uni.$showMsg();
-				}
-			},
-		},
+    async setInsert(menu2) {
+      try {
+        const params = {
+          createId: uni.getStorageSync("value").userId,
+          loginType: 1,
+          menu1: "首页",
+          menu2: menu2 || "首页",
+        };
+        const { data } = await uni.$http.post(
+          "/gunshiApp/tsg/visitMenuLog/insert",
+          params
+        );
+      } catch (error) {}
+    },
+    myNavigateTo(url, menu2) {
+      uni.navigateTo({
+        url: url, // 跳转到对应路径的页面
+      });
+      this.setInsert(menu2);
+    },
+    // 预警
+    async getYjData() {
+      const params = {
+        start: warnStm,
+        end: warnetm,
+      };
+      try {
+        const res = await uni.$http.post(
+          "/gunshiApp/tsg/stQxWarnR/home/warn",
+          params
+        );
+        const { flowWarn, pressWarn, qxWarn, shiftWarn } = res.data.data;
+        const arr = [...flowWarn, ...pressWarn, ...qxWarn, ...shiftWarn];
+        if (arr.length > 0) {
+          this.warnStatus = true;
+        }
+      } catch (error) {
+        uni.$showMsg();
+      }
+    },
+  },
 
-		onLoad() {
-			this.getYlzList();
-		},
+  onLoad() {
+    this.getYlzList();
+  },
 
-		onShow() {
-			var that = this;
-			that.getList();
-			timer = setInterval(function () {
-				that.getList();
-			}, 10000);
+  onShow() {
+    var that = this;
+    that.getList();
+    timer = setInterval(function () {
+      that.getList();
+    }, 10000);
 
-			this.setInsert()
-			this.getYjData();
-			this.getSwList()
-		},
-		onHide() {
-			clearInterval(timer)
-			timer = null;
-		},
-
-	}
+    this.setInsert();
+    this.getYjData();
+    this.getSwList();
+  },
+  onHide() {
+    clearInterval(timer);
+    timer = null;
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.container {
-		position: relative;
-		font-size: 14px;
-		line-height: 24px;
-		background-color: #f3f5f8;
-		height: 100%;
-		overflow: auto;
+.container {
+  position: relative;
+  font-size: 14px;
+  line-height: 24px;
+  background-color: #f3f5f8;
+  height: 100%;
+  overflow: auto;
+}
 
-	}
+.info {
+  height: 100rpx;
+  background-color: #007afd;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 20px;
+  color: #fff;
+}
 
-	.info {
-		height: 100rpx;
-		background-color: #007afd;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 20px;
-		color: #fff;
-	}
+.left {
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
 
-	.left {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-	}
+.icon {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
+  background-color: #fff;
+  text-align: center;
+  color: #007afd;
+  line-height: 50px;
+}
 
-	.icon {
-		width: 50px;
-		height: 50px;
-		border-radius: 50%;
-		background-color: #fff;
-		text-align: center;
-		color: #007afd;
-		line-height: 50px;
-	}
+.info_name {
+  margin-left: 16rpx;
+}
 
-	.info_name {
-		margin-left: 16rpx;
-	}
+.right {
+  text-align: center;
+}
 
-	.right {
-		text-align: center;
-	}
+.navBar {
+  padding: 13px;
+  padding-bottom: 0;
+  /* text-align: center; */
+  display: flex;
+  background-color: #fff;
+  // justify-content: center;
+  margin-bottom: 10px;
+}
 
-	.navBar {
-		padding: 13px;
-		padding-bottom: 0;
-		/* text-align: center; */
-		display: flex;
-		background-color: #fff;
-		// justify-content: center;
-		margin-bottom: 10px;
-	}
+.navList {
+  text-align: center;
+  margin-right: 0px;
+  margin-bottom: 10px;
+}
 
-	.navList {
-		text-align: center;
-		margin-right: 0px;
-		margin-bottom: 10px;
-	}
+.navIcon {
+  position: relative;
+  width: 82px;
+  height: 50px;
+}
 
-	.navIcon {
-		position: relative;
-		width: 82px;
-		height: 50px;
-	}
+.readStatus {
+  position: absolute;
+  top: 0;
+  right: 17px;
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  background: #de2433;
+}
 
-	.readStatus {
-		position: absolute;
-		top: 0;
-		right: 17px;
-		width: 10px;
-		height: 10px;
-		border-radius: 50%;
-		background: #de2433;
-	}
+.warn {
+  padding: 18rpx 20rpx;
+  text-align: left;
+  margin-bottom: 12rpx;
+  background: #fff;
+}
 
-	.warn {
-		padding: 18rpx 20rpx;
-		text-align: left;
-		margin-bottom: 12rpx;
-		background: #fff;
-	}
+.warn1 {
+  padding: 18rpx 20rpx;
+  text-align: left;
+  margin-bottom: 5px;
+  background: #fff;
+}
 
-	.warn1 {
-		padding: 18rpx 20rpx;
-		text-align: left;
-		margin-bottom: 5px;
-		background: #fff;
-	}
+.info_24 {
+  width: 100%;
+  // position: fixed;
+  // padding: 15px;
+  background-color: #fff;
+  // margin-bottom: 12rpx;
+  height: 100px;
+}
 
-	.info_24 {
-		width: 100%;
-		// position: fixed;
-		// padding: 15px;
-		background-color: #fff;
-		// margin-bottom: 12rpx;
-		height: 100px;
-	}
+.title .line {
+  border: 2px solid #3380ff;
+  border-radius: 3rpx;
+  margin-right: 20rpx;
+}
 
-	.title .line {
-		border: 2px solid #3380ff;
-		border-radius: 3rpx;
-		margin-right: 20rpx;
-	}
+.title .h4 {
+  font-weight: 400;
+  font-size: 32rpx;
+  color: #121b3d;
+}
 
-	.title .h4 {
-		font-weight: 400;
-		font-size: 32rpx;
-		color: #121b3d;
-	}
+.time {
+  font-weight: 400;
+  font-size: 24rpx;
+  color: #a2a2a2;
+}
 
-	.time {
-		font-weight: 400;
-		font-size: 24rpx;
-		color: #a2a2a2;
-	}
+.g1 {
+  color: #545556;
+}
 
-	.g1 {
-		color: #545556;
-	}
+.ye {
+  color: #ff1717;
+  /* font-weight: 600; */
+}
 
-	.ye {
-		color: #ff1717;
-		/* font-weight: 600; */
-	}
+.b1 {
+  color: #3380ff;
+  padding: 0 2px;
+}
 
-	.b1 {
-		color: #3380ff;
-		padding: 0 2px;
-	}
+.uni-group {
+  display: flex;
+  align-items: center;
+}
 
-	.uni-group {
-		display: flex;
-		align-items: center;
-	}
+/* 表格 */
+.tableBox {
+  width: 100%;
+  position: relative;
+}
 
-	/* 表格 */
-	.tableBox {
-		width: 100%;
-		position: relative;
-	}
+.leftTab {
+  width: 80px;
+  /* border-bottom: 1px solid #ccc; */
+}
 
-	.leftTab {
-		width: 80px;
-		/* border-bottom: 1px solid #ccc; */
-	}
-
-	.rightTab {
-		width: 80px;
-		/* border: 1px solid #ccc;
+.rightTab {
+  width: 80px;
+  /* border: 1px solid #ccc;
     border-radius: 0 3px 3px 0;
     border-left: 0; */
-	}
+}
 
-	.activetextTypeTab,
-	.activetextTypeTab:hover {
-		border-bottom: 3rpx solid #2286f6;
-		color: #026be0;
-	}
+.activetextTypeTab,
+.activetextTypeTab:hover {
+  border-bottom: 3rpx solid #2286f6;
+  color: #026be0;
+}
 
-	.table_div {
-		widows: 100%;
-		height: 100%;
-		max-width: calc(100% - 0px);
-		max-height: calc(100vh - 24px);
-		flex: 1;
-		padding-top: 30px;
-		overflow-x: scroll;
-	}
+.table_div {
+  widows: 100%;
+  height: 100%;
+  max-width: calc(100% - 0px);
+  max-height: calc(100vh - 24px);
+  flex: 1;
+  padding-top: 30px;
+  overflow-x: scroll;
+}
 
-	/*table样式*/
-	.table_cur {
-		width: 100%;
-		empty-cells: show;
-		border-collapse: collapse;
-		font-size: 14px;
-	}
+/*table样式*/
+.table_cur {
+  width: 100%;
+  empty-cells: show;
+  border-collapse: collapse;
+  font-size: 14px;
+}
 
-	.table_cur tr {
-		display: flex;
-		line-height: 56rpx;
-	}
+.table_cur tr {
+  display: flex;
+  line-height: 56rpx;
+}
 
-	.table_cur th {
-		height: 56rpx;
-		color: #2f4056;
-		background: #f5f6f8;
-		font-size: 14px;
-		font-weight: bold;
-		padding: 0 10px;
-		box-sizing: border-box;
-		white-space: nowrap;
-		text-align: center !important;
-	}
+.table_cur th {
+  height: 56rpx;
+  color: #2f4056;
+  background: #f5f6f8;
+  font-size: 14px;
+  font-weight: bold;
+  padding: 0 10px;
+  box-sizing: border-box;
+  white-space: nowrap;
+  text-align: center !important;
+}
 
-	.table_cur td {
-		height: 56rpx;
-		border-bottom: 1px solid #e5e9f2;
-		font-size: 14px;
-		color: #2f4056;
-		padding: 0 10px;
-		box-sizing: border-box;
-		white-space: nowrap;
-		text-align: center !important;
-	}
+.table_cur td {
+  height: 56rpx;
+  border-bottom: 1px solid #e5e9f2;
+  font-size: 14px;
+  color: #2f4056;
+  padding: 0 10px;
+  box-sizing: border-box;
+  white-space: nowrap;
+  text-align: center !important;
+}
 
-	/*table样式 end*/
-	.noData {
-		width: 100px;
-	}
+/*table样式 end*/
+.noData {
+  width: 100px;
+}
 </style>
\ No newline at end of file
diff --git a/pages/syq/index.vue b/pages/syq/index.vue
new file mode 100644
index 0000000..3ef60ec
--- /dev/null
+++ b/pages/syq/index.vue
@@ -0,0 +1,46 @@
+<template>
+  <view :style="{ height: '100vh', overflow: 'hidden' }">
+    <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 style="margin-top:50px;padding:10px">
+        <SlTable :tableData="slData"></SlTable>
+    </view>
+  </view>
+</template>
+
+<script>
+import SlTable from "./slTable.vue";
+export default {
+  components: {
+    SlTable,
+  },
+  data() {
+    return {
+        slData:[]
+    };
+  },
+  methods: {
+    getList() {
+      uni.$http.post("/gunshiApp/ykz/stPptnRReal/data").then((res) => {
+       if(res.data.code == 200){
+        this.slData = res.data.data;
+       }
+      });
+    },
+  },
+    onLoad() {
+	this.getList();
+  },
+};
+</script>
\ No newline at end of file
diff --git a/pages/syq/slTable.vue b/pages/syq/slTable.vue
new file mode 100644
index 0000000..5bde3cd
--- /dev/null
+++ b/pages/syq/slTable.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="table_div">
+              <div class="table_cur">
+                <table style="width:100%;display:block">
+                  <tr>
+                    <th style="width: 30%;">
+                      监测项目
+                      </th>
+                      <th style="width: 28%;">
+                      监测值
+                      </th>
+                    <th style="width: 42%;">
+                      监测时间
+                      </th>
+                  </tr>
+                  <!-- style="max-height: 480px; overflow-y: auto" -->
+                  <div class="scroll-table">
+                <tr v-for="(item, index) in tableData" :key="index">
+                      <td style="width: 30%;">{{simpleData(item.typeName)}}</td>
+                      <td style="width:28%;">{{ item.val }}</td>
+                      <td style="width: 42%;">{{item.tm}}</td>
+                    </tr>
+                    <div style="height:180px"></div>
+                  </div>
+                </table>
+              </div>
+            </div>
+
+</template>
+
+<script>
+  import moment from "moment"
+   export default {
+     props:{
+       tableData:{
+         type:Array,
+         default:[],
+       }
+     },
+     methods: {
+         simpleData(tm){
+          let unit ='(m³/s)';
+          if(tm == '闸后流量'){
+            unit =tm +'(m³/s)';
+          }else if(tm == '雨量'){
+            unit =tm +'(mm)';
+          }else{
+            unit =tm +'(m)';
+          }
+          return unit
+         }
+     },
+   }
+</script>
+
+<style lang="scss" scoped>
+  .table_div {
+    height: 100%;
+    max-width: calc(100% - 0px);
+    // max-height: calc(80vh);
+    flex: 1;
+    padding-top: 0px;
+    // overflow-x: scroll;
+  }
+  /*table样式*/
+  .table_cur {
+    width: 100%;
+    empty-cells: show;
+    border-collapse: collapse;
+    font-size: 14px;
+  }
+   .scroll-table{
+    height: calc(55vh - 180px);
+    overflow-y: auto;
+    width:'100%'
+  }
+  .table_cur tr {
+    display: flex;
+    line-height: 75rpx;
+  }
+  .table_cur th {
+    height: 85rpx;
+    color: #3399ef;
+    background: #e1f3ff;
+    font-size: 14px;
+    // font-weight: bold;
+    padding: 0px 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+  
+  .table_cur td {
+    height: 65rpx;
+    // border-bottom: 1px solid #d8ddeb;
+    font-size: 14px;
+    color: #2f4056;
+    padding: 0 10px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    text-align: center !important;
+  }
+  /*table样式 end*/
+</style>
\ No newline at end of file
diff --git a/pages/yj/detail/wyyj.vue b/pages/yj/detail/wyyj.vue
index b84badb..ac78665 100644
--- a/pages/yj/detail/wyyj.vue
+++ b/pages/yj/detail/wyyj.vue
@@ -1,33 +1,29 @@
 <template>
 	<view :style="{height:'100vh',overflow:'hidden',backgroundColor: '#f0f0f0'}">
 		<u-status-bar></u-status-bar>
-		<u-navbar title="位移告警" :autoBack="true" :titleStyle="{
+		<u-navbar :title="list[0].typeName" :autoBack="true" :titleStyle="{
 				fontSize:'18px'
 			}" :height='44' :safeAreaInsetTop=true leftIconSize='20' leftIconColor='rgb(153, 153, 153)'>
 		</u-navbar>
 		<view class="" style="margin-top: 44px;border-top: 1px solid #f0f0f0;">
-			<view class="" v-for="item in list" style="margin: 10px;background-color: #fff;padding: 10px;">
+			<view class="" v-for="(item,i) in list" :key="i" style="margin: 10px;background-color: #fff;padding: 10px;">
 				<view class="item">
-					<text>{{item.stationCode}}</text>
-					<text>{{item.tm}}</text>
+					<text>{{item.typeName}}</text>
+					<text>{{item.warnTime}}</text>
 					
 				</view>
 				<view class="contentItem">
 					<view class="itemC">
-						<text>预警级别:</text>
-						<text>{{item.level===1?'黄色':'红色'}}</text>
+						<text>阈值上限:</text>
+						<text>{{item.upperLimit}}</text>
 					</view>
 					<view class="itemC">
-						<text>监测值(mm):</text>
-						<text>{{item.value}}</text>
+						<text>监测值({{getUnit(item.typeName)}}):</text>
+						<text>{{item.val}}</text>
 					</view>
 					<view class="itemC">
-						<text>阈值:</text>
-						<text>{{item.time}}</text>
-					</view>
-					<view class="itemC">
-						<text>校验规则描述:</text>
-						<text>{{item.ruleDesc}}</text>
+						<text>阈值下限:</text>
+						<text>{{item.lowerLimit}}</text>
 					</view>
 				</view>
 			</view>
@@ -51,25 +47,11 @@
 				customStyle: {
 					background: '#000'
 				},
-				list: [{
-						title: '5-29日常巡检',
-						state: 0,
-						xjx: '上游坝面、坝顶',
-						name: '王自荣',
-						time: '2024-05-30 09:31:23'
-					},
-					{
-						title: '5-29日常巡检',
-						state: 1,
-						xjx: '上游坝面、坝顶',
-						name: '王自荣',
-						time: '2024-05-30 09:31:23'
-					},
-				]
+				list: []
 			};
 		},
 		onLoad(options){
-			// this.list = JSON.parse(decodeURIComponent(options.arr))
+			this.list = JSON.parse(decodeURIComponent(options.list))
 		},
 		methods: {
 			confirm(e) {
@@ -81,11 +63,17 @@
 			cancel() {
 				this.show = false
 			},
-			toDetail(){
-				uni.navigateTo({
-					url:'/pages/wtcl/detail/index'
-				})
+	      getUnit(type){
+			let unit = 'm³/s';
+			if(type == '闸后流量'){
+				unit = 'm³/s';
+			}else if(type == '结构缝开度'){
+				unit = 'mm'
+			}else{
+				unit = 'm'
 			}
+			return unit;
+		  }
 		}
 	}
 </script>
diff --git a/pages/yj/index.vue b/pages/yj/index.vue
index 26fa544..c0c0101 100644
--- a/pages/yj/index.vue
+++ b/pages/yj/index.vue
@@ -1,152 +1,221 @@
 <template>
-	<view :style="{height:'100vh',overflow:'hidden'}">
-		<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;border-top: 1px solid #f0f0f0;">
-			<view class="align-center" style="height: 44px;background-color: #f0f0f0;font-size: 12px;padding: 0 10px;">
-				预警时间：{{model.start}} 至 {{model.end}}
-			</view>
-			<view class="itemYj">
-				<view class="itemYjCont" v-for="(value,key) of list" >
-					<view class="item" @click="todetail(key,value)">
-						<view :style="`color:${!getValue(value)?'#D9001B':'#04D919'} ;`" class="num">
-							{{getValue(value)}}
-						</view>
-						<view class="title">
-							{{mapType[key]}}
-						</view>
-					</view>
-				</view>
-			</view>
-			
+  <view :style="{ height: '100vh', overflow: 'hidden' }">
+    <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>
-		<u-calendar :show="show" mode="range" @confirm="confirm" @cancel='cancel'></u-calendar>
-	</view>
+    <view class="" style="margin-top: 44px; border-top: 1px solid #f0f0f0">
+      <view
+        class="align-center"
+        style="
+          height: 44px;
+          background-color: #f0f0f0;
+          font-size: 12px;
+          padding: 0 10px;
+        "
+      >
+        预警时间：{{ model.start }} 至 {{ model.end }}
+      </view>
+      <view class="itemYj">
+        <view class="itemYjCont" v-for="(value, key) of list" :key="key">
+          <view class="item" @click="todetail(key, value)">
+            <view
+              :style="`color:${!getValue(value) ? '#D9001B' : '#04D919'} ;`"
+              class="num"
+            >
+              {{ getValue(value) }}
+            </view>
+            <view class="title">
+              {{ mapType[key] }}
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <u-calendar
+      :show="show"
+      mode="range"
+      @confirm="confirm"
+      @cancel="cancel"
+    ></u-calendar>
+  </view>
 </template>
 
 <script>
-	import moment from 'moment'
+import moment from "moment";
 
-	export default {
-		data() {
-			return {
-				show: false,
-				model: {
-					start: moment().subtract(1,'day').format('YYYY-MM-DD HH:mm:ss'),
-					end: moment().format('YYYY-MM-DD HH:mm:ss')
-				},
-				mapType:{
-					aiWarnCount:'AI告警',
-					rzWarn:"水位告警",
-					qxWarn:'气象告警',
-					pressWarn:'渗流告警',
-					flowWarn:'渗压告警',
-					shiftWarn:'位移告警'
-				},
-				list: {rzWarn:"正常(-4.031)",flowWarn:[],pressWarn:[],qxWarn:[],shiftWarn:[],aiWarnCount: 0,}
-			};
-		},
-		onLoad() {
-			
-			this.getList()
-		},
-		methods: {
-			getValue(value){
-				if(Array.isArray(value)){
-					return value.length
-				}else{
-					return value
-				}
-			},
-			confirm(e) {
-				console.log(e);
-				this.model.stm = e[0]
-				this.model.etm = e[1]
-				this.show = false
-			},
-			cancel() {
-				this.show = false
-			},
-			todetail(key,e){
-				let arr = encodeURIComponent(JSON.stringify(e))
-				console.log(key,e.length?.length);
-				if(!e.length?.length){
-					return;
-				}
-				if(key=='qxWarn'){
-					uni.navigateTo({
-						url:'/pages/yj/detail/qxyj?list='+arr
-					})
-				}
-				if(key == 'shiftWarn'){
-					uni.navigateTo({
-						url:'/pages/yj/detail/wyyj?list='+arr
-					})
-				}
-				if(key == 'flowWarn'){
-					uni.navigateTo({
-						url:'/pages/yj/detail/wyyj?list='+arr
-					})
-				}
-				if(key == 'pressWarn'){
-					uni.navigateTo({
-						url:'/pages/yj/detail/wyyj?list='+arr
-					})
-				}
-				if(key == 'aiWarnCount'){
-					uni.navigateTo({
-						url:'/pages/yj/detail/aiyj?list='+arr
-					})
-				}
-			},
-			getList(){
-				uni.$http.post('/gunshiApp/tsg/stQxWarnR/home/warn',this.model).then(res=>{
-					this.list = res.data.data
-				})
-			},
-		}
+export default {
+  data() {
+    return {
+      show: false,
+      model: {
+        start: moment().subtract(1, "day").format("YYYY-MM-DD HH:mm:ss"),
+        end: moment().format("YYYY-MM-DD HH:mm:ss"),
+      },
+      mapType: {
+        zhll: "闸后流量告警",
+        zqsw: "闸前水位告警",
+        zhsw: "闸后水位告警",
+        spwy: "水平位移告警",
+        jgfkd: "结构缝开度告警",
+        sljc: "渗流监测告警",
+      },
+      list: {
+        zhll: [],
+        zqsw: [],
+        zhsw: [],
+        spwy: [],
+        jgfkd: [],
+		sljc:[]
+      },
+    };
+  },
+
+  methods: {
+    getValue(value) {
+      if (Array.isArray(value)) {
+        return value.length;
+      } else {
+        return value;
+      }
+    },
+    confirm(e) {
+      console.log(e);
+      this.model.stm = e[0];
+      this.model.etm = e[1];
+      this.show = false;
+    },
+    cancel() {
+      this.show = false;
+    },
+    todetail(key, e) {
+      let arr = encodeURIComponent(JSON.stringify(e));
+      if (!e.length) {
+        return;
+      }
+	    uni.navigateTo({
+          url: "/pages/yj/detail/wyyj?list=" + arr,
+        });
+    //   if (key == "qxWarn") {
+    //     uni.navigateTo({
+    //       url: "/pages/yj/detail/qxyj?list=" + arr,
+    //     });
+    //   }
+    //   if (key == "zhll") {
+    //     uni.navigateTo({
+    //       url: "/pages/yj/detail/wyyj?list=" + arr,
+    //     });
+    //   }
+    //   if (key == "flowWarn") {
+    //     uni.navigateTo({
+    //       url: "/pages/yj/detail/wyyj?list=" + arr,
+    //     });
+    //   }
+    //   if (key == "pressWarn") {
+    //     uni.navigateTo({
+    //       url: "/pages/yj/detail/wyyj?list=" + arr,
+    //     });
+    //   }
+    //   if (key == "aiWarnCount") {
+    //     uni.navigateTo({
+    //       url: "/pages/yj/detail/aiyj?list=" + arr,
+    //     });
+    //   }
+    },
+    getList() {
+      uni.$http
+        .post("/gunshiApp/tsg/stQxWarnR/home/warn", this.model)
+        .then((res) => {
+          this.list = res.data.data;
+        });
+    },
+	// 闸前
+    getZqList() {
+    return  uni.$http
+        .post("/gunshiApp/ykz/warnRecord/page", {
+          pageSo: {
+            pageSize: 999,
+            pageNumber: 1,
+          },
+        })
+        
+    },
+	// 安全类型
+	  getAqList() {
+    return  uni.$http
+        .post("/gunshiApp/ykz/osmoticWarnRecord/page", {
+          pageSo: {
+            pageSize: 999,
+            pageNumber: 1,
+          },
+        })
+    },
+
+	getAllList(){
+		Promise.all([this.getZqList(),this.getAqList()]).then(res => {
+			const result  = res.map(item => item.data?.data?.records).flat();
+			const foldData = {
+				zhll:result.filter(item => item.typeName == '闸后流量'), //闸后流量
+				zqsw:result.filter(item => item.typeName == '闸前水位'), //闸前水位
+				zhsw:result.filter(item => item.typeName == '闸后水位'),//闸后水位
+				spwy:result.filter(item => item.typeName == '水平位移'),
+				jgfkd:result.filter(item => item.typeName == '结构缝开度'),
+				sljc:result.filter(item => item.typeName == '渗流监测'),
+			}
+			this.list = {...foldData}
+		})
 	}
+  },
+    onLoad() {
+    // this.getList();
+	this.getAllList();
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.itemYj{
-		display: flex;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		padding: 10px;
-		.itemYjCont{
-			    border-width: 0px;
-			    width: 112px;
-			    height: 85px;
-			    background: inherit;
-			    background-color: rgba(234, 244, 254, 1);
-			    border: none;
-			    border-radius: 5px;
-			    -moz-box-shadow: none;
-			    -webkit-box-shadow: none;
-			    box-shadow: none;
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				margin-bottom: 10px;
-				.item{
-					text-align: center;
-				}
-				.normal{
-					color: #04D919;
-					}
-				.bj{
-					color:#D9001B;
-				}
-			// width: 30%;
-			// margin: 5px;
-		}
-	}
-	
+.itemYj {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  padding: 10px;
+  .itemYjCont {
+    border-width: 0px;
+    width: 112px;
+    height: 85px;
+    background: inherit;
+    background-color: rgba(234, 244, 254, 1);
+    border: none;
+    border-radius: 5px;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    margin-bottom: 10px;
+    .item {
+      text-align: center;
+    }
+    .normal {
+      color: #04d919;
+    }
+    .bj {
+      color: #d9001b;
+    }
+    // width: 30%;
+    // margin: 5px;
+  }
+}
 </style>
\ No newline at end of file