From c5ae23e8da3c8f7d2c769e665d981ff1c5751eb6 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Fri, 11 Oct 2024 11:09:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20app=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/config.js         |  5 ++---
 manifest.json               |  4 ++--
 pages/device/APF/report.vue | 30 +++++++++++++-------------
 pages/device/DVR/detail.vue | 23 +++++++++-----------
 pages/message/message.vue   | 42 ++++++++++++++++++++-----------------
 pages/mine/setup.vue        |  2 +-
 6 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/common/js/config.js b/common/js/config.js
index ff0d068..479c4fa 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -1,7 +1,7 @@
 const debug = false // true 是连地服务端本地，false 是连接线上
 
 const development = {
-    domain: 'http://192.168.1.115:10215',
+    domain: 'http://192.168.1.22:10215',
 }
 
 const production = {
@@ -18,7 +18,6 @@ if (process.env.NODE_ENV === 'development') {
 }
 // #endif
 
-config.static = config.domain + '/system-boot/image/toStream?bgImage='
-
+config.static = config.domain + '/system-boot/file/download?filePath='
 
 export default config
diff --git a/manifest.json b/manifest.json
index fabcc27..bea1cd6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -143,8 +143,8 @@
             "proxy" : {
                 "/api" : {
                     "https" : true,
-                    // "target" : "https://pqmcn.com:8092/api",
-                    "target" : "http://192.168.1.126:10215",
+                    "target" : "https://pqmcn.com:8092/api",
+                    // "target" : "http://192.168.1.22:10215",
                     "changOrigin" : true,
                     "pathRewrite" : {
                         "/api" : ""
diff --git a/pages/device/APF/report.vue b/pages/device/APF/report.vue
index 1d697f7..2167a59 100644
--- a/pages/device/APF/report.vue
+++ b/pages/device/APF/report.vue
@@ -3,13 +3,8 @@
         <view class="content" slot="body">
             <view class="content-item" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
                 <view class="content-item-header">
-                    <uni-badge
-                        class="uni-badge-left-margin"
-                        :is-dot="true"
-                        :text="item.status == '1' ? 0 : 1"
-                        absolute="rightTop"
-                        size="small"
-                    >
+                    <uni-badge class="uni-badge-left-margin" :is-dot="true" :text="item.status == '1' ? 0 : 1"
+                        absolute="rightTop" size="small" style="margin-top: 30rpx;">
                         <view class="content-item-header-icon">
                             <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
                         </view>
@@ -19,6 +14,8 @@
                         <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
                         <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
                         <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
+                        <view class="content-item-header-right-des">监测点名称：{{ item.lineName }}</view>
+                        <view class="content-item-header-right-des">暂态事件类型：{{ item.showName.slice(0, -4) }}</view>
                         <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
                     </view>
                     <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -41,10 +38,8 @@
                 </view>
             </uni-card> -->
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more
-                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
-                :status="store.status"
-            ></uni-load-more>
+            <uni-load-more v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"></uni-load-more>
         </view>
     </Cn-page>
 </template>
@@ -115,10 +110,10 @@ export default {
                         item.showName = '告警,告警码：' + item.code
                     }
                     if (this.type !== '0') {
-                        item.subTitle = `于${item.startTime}发生${item.showName}`
+                        item.subTitle = `于${item.startTime}`
                     } else {
                         item.subTitle =
-                            `于${item.startTime}发生${item.showName}。` +
+                            `于${item.startTime}。` +
                             item.dataSet
                                 .map((item2) => {
                                     return (
@@ -161,10 +156,12 @@ export default {
         border-radius: 8rpx;
         border: 1px solid #ebeef5;
         background: #fff;
+
         .content-item-header {
             display: flex;
             padding: 20rpx 0;
             border-bottom: 1px solid #ebeef5;
+
             .content-item-header-icon {
                 display: flex;
                 align-items: center;
@@ -174,30 +171,35 @@ export default {
                 border-radius: 8rpx;
                 background: $uni-theme-color;
             }
+
             .content-item-header-right {
                 flex: 1;
                 display: flex;
                 flex-direction: column;
                 justify-content: space-between;
-                height: 100rpx;
+                // height: 140rpx;
                 margin-left: 20rpx;
+
                 .content-item-header-right-title {
                     font-size: 28rpx;
                     font-weight: bold;
                     color: #111;
                 }
+
                 .content-item-header-right-des {
                     font-size: 24rpx;
                     color: #999;
                 }
             }
         }
+
         .content-item-footer {
             margin-top: 20rpx;
             font-size: 24rpx;
             color: #999;
         }
     }
+
     // padding-top: 20rpx;
 }
 
diff --git a/pages/device/DVR/detail.vue b/pages/device/DVR/detail.vue
index 6bc1e0a..c8031a0 100644
--- a/pages/device/DVR/detail.vue
+++ b/pages/device/DVR/detail.vue
@@ -5,23 +5,17 @@
 				<view class="detail-header">
 					<view class="header">
 						<image
-							src="http://localhost:8088/api/system-boot/image/toStream?bgImage=topology/1aca98ceb22a1fc33b81d9101275ef1.png"
-							mode="widthFix"
-							style="width: 100%"
-						/>
+							src="http://localhost:8088/api/system-boot/file/download?filePath=topology/1aca98ceb22a1fc33b81d9101275ef1.png"
+							mode="widthFix" style="width: 100%" />
 					</view>
 					<!-- <view class="des">
                     <text>设备基础信息</text>
                     <text class="ml10">设备状态</text>
                 </view> -->
 					<view class="nav">
-						<view
-							class="nav-menu"
-							:class="{ 'nav-menu-active': navMenuActive == index }"
-							v-for="(item, index) in navMenuList"
-							:key="index"
-							@click="navMenuClick(index)"
-							>{{ item.text }}
+						<view class="nav-menu" :class="{ 'nav-menu-active': navMenuActive == index }"
+							v-for="(item, index) in navMenuList" :key="index" @click="navMenuClick(index)">{{ item.text
+							}}
 						</view>
 					</view>
 				</view>
@@ -221,9 +215,9 @@ export default {
 </script>
 <style lang="scss">
 .detail {
+
 	// background: $uni-theme-white;
-	.header {
-	}
+	.header {}
 
 	.des {
 		padding: 20rpx 20rpx 0;
@@ -269,14 +263,17 @@ export default {
 		background: #f3f4f5;
 	}
 }
+
 /deep/ .uni-fab__circle--rightBottom {
 	right: 8px !important;
 	bottom: 8px !important;
 }
+
 /deep/ .uni-fab--rightBottom {
 	right: 8px !important;
 	bottom: 8px !important;
 }
+
 /deep/ .uni-fab__circle {
 	width: 50px;
 	height: 54px;
diff --git a/pages/message/message.vue b/pages/message/message.vue
index bd2f0d1..5918c33 100644
--- a/pages/message/message.vue
+++ b/pages/message/message.vue
@@ -3,13 +3,8 @@
         <view class="content" slot="body">
             <view class="content-item" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
                 <view class="content-item-header">
-                    <uni-badge
-                        class="uni-badge-left-margin"
-                        :is-dot="true"
-                        :text="item.status == '1' ? 0 : 1"
-                        absolute="rightTop"
-                        size="small"
-                    >
+                    <uni-badge class="uni-badge-left-margin" :is-dot="true" :text="item.status == '1' ? 0 : 1"
+                        absolute="rightTop" size="small" :style="type == '0' ? `margin-top: 30rpx;` : ''">
                         <view class="content-item-header-icon">
                             <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
                         </view>
@@ -19,6 +14,10 @@
                         <!-- <view class="content-item-header-right-des">{{ item.engineeringName }} {{ item.projectName }}</view> -->
                         <view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</view>
                         <view class="content-item-header-right-des">项目名称：{{ item.projectName }}</view>
+                        <view class="content-item-header-right-des" v-if="type == '0' || type == '1'">监测点名称：{{
+                            item.lineName }}</view>
+                        <view class="content-item-header-right-des" v-if="type == '0'">暂态事件类型：{{ item.showName.slice(0,
+                            -4) }}</view>
                         <!-- <view class="content-item-header-right-des">{{ item.subTitle }}</view> -->
                     </view>
                     <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -41,10 +40,8 @@
                 </view>
             </uni-card> -->
             <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
-            <uni-load-more
-                v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
-                :status="store.status"
-            ></uni-load-more>
+            <uni-load-more v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
+                :status="store.status"></uni-load-more>
         </view>
     </Cn-page>
 </template>
@@ -109,6 +106,8 @@ export default {
             this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
             this.store.params.type = this.type
             this.store.loadedCallback = () => {
+                console.log(111, this.store.data)
+
                 this.store.data.forEach((item) => {
                     if (this.type === '3') {
                         item.showName = '告警,告警码：' + item.code
@@ -117,7 +116,7 @@ export default {
                         item.subTitle = `于${item.startTime}发生${item.showName}`
                     } else {
                         item.subTitle =
-                            `于${item.startTime}发生${item.showName}。` +
+                            `于${item.startTime}。` +
                             item.dataSet
                                 .map((item2) => {
                                     return (
@@ -130,19 +129,17 @@ export default {
                                 .join('，')
                     }
                 })
-                console.log(this.store.data)
+
                 this.loading = false
             }
             this.store.reload()
         },
         jump(item) {
-			console.log(`123`,item);
-					console.log(`123`,this.type);
             if (this.type === '0') {
-			
+
                 let str = JSON.stringify(item).replace(/%/g, '百分比')
-				item.status = '1'
-				
+                item.status = '1'
+
                 uni.navigateTo({ url: '/pages/message/messageDetail?detail=' + encodeURIComponent(str) })
             } else {
                 if (item.status != '1') {
@@ -166,10 +163,12 @@ export default {
         border-radius: 8rpx;
         border: 1px solid #ebeef5;
         background: #fff;
+
         .content-item-header {
             display: flex;
             padding: 20rpx 0;
             border-bottom: 1px solid #ebeef5;
+
             .content-item-header-icon {
                 display: flex;
                 align-items: center;
@@ -179,30 +178,35 @@ export default {
                 border-radius: 8rpx;
                 background: $uni-theme-color;
             }
+
             .content-item-header-right {
                 flex: 1;
                 display: flex;
                 flex-direction: column;
                 justify-content: space-between;
-                height: 100rpx;
+                // height: 140rpx;
                 margin-left: 20rpx;
+
                 .content-item-header-right-title {
                     font-size: 28rpx;
                     font-weight: bold;
                     color: #111;
                 }
+
                 .content-item-header-right-des {
                     font-size: 24rpx;
                     color: #999;
                 }
             }
         }
+
         .content-item-footer {
             margin-top: 20rpx;
             font-size: 24rpx;
             color: #999;
         }
     }
+
     // padding-top: 20rpx;
 }
 
diff --git a/pages/mine/setup.vue b/pages/mine/setup.vue
index c9fddc5..8738593 100644
--- a/pages/mine/setup.vue
+++ b/pages/mine/setup.vue
@@ -48,7 +48,7 @@
 			<!-- @click="jump('about')" -->
             <view class="mine-nav"  style="border-bottom: none">
                 <view class="mine-nav-label">版本信息</view>
-				  <view style="color: #828282;font-size: 14rpx;">当前版本V1.1.1</view>
+				  <view style="color: #828282;font-size: 14rpx;">当前版本V1.6.2</view>
                 <!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> -->
             </view>
             <view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none">