App/app-govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 app问题

Browse Source
This commit is contained in:
GGJ
2024-10-11 11:09:54 +08:00
parent 56a2db2b48
commit c5ae23e8da
6 changed files with 54 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/js/config.js
View File

@@ -1,7 +1,7 @@
const debug = false // true 是连地服务端本地，false 是连接线上 const debug = false // true 是连地服务端本地，false 是连接线上
const development = { const development = {
domain: 'http://192.168.1.115:10215', domain: 'http://192.168.1.22:10215',
} }
const production = { const production = {
@@ -18,7 +18,6 @@ if (process.env.NODE_ENV === 'development') {
} }
// #endif // #endif
config.static = config.domain + '/system-boot/image/toStream?bgImage=' config.static = config.domain + '/system-boot/file/download?filePath='
export default config export default config

4
manifest.json
View File

@@ -143,8 +143,8 @@
"proxy" : { "proxy" : {
"/api" : { "/api" : {
"https" : true, "https" : true,
// "target" : "https://pqmcn.com:8092/api", "target" : "https://pqmcn.com:8092/api",
"target" : "http://192.168.1.126:10215", // "target" : "http://192.168.1.22:10215",
"changOrigin" : true, "changOrigin" : true,
"pathRewrite" : { "pathRewrite" : {
"/api" : "" "/api" : ""

30
pages/device/APF/report.vue
View File

@@ -3,13 +3,8 @@
<view class="content" slot="body"> <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" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
<view class="content-item-header"> <view class="content-item-header">
<uni-badge <uni-badge class="uni-badge-left-margin" :is-dot="true" :text="item.status == '1' ? 0 : 1"
class="uni-badge-left-margin" absolute="rightTop" size="small" style="margin-top: 30rpx;">
:is-dot="true"
:text="item.status == '1' ? 0 : 1"
absolute="rightTop"
size="small"
>
<view class="content-item-header-icon"> <view class="content-item-header-icon">
<image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image> <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
</view> </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 }} {{ item.projectName }}</view> -->
<view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</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.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 class="content-item-header-right-des">{{ item.subTitle }}</view> -->
</view> </view>
<view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view> <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -41,10 +38,8 @@
</view> </view>
</uni-card> --> </uni-card> -->
<Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty> <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
<uni-load-more <uni-load-more v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
v-if="store.status == 'loading' || (store.data && store.data.length > 0)" :status="store.status"></uni-load-more>
:status="store.status"
></uni-load-more>
</view> </view>
</Cn-page> </Cn-page>
</template> </template>
@@ -115,10 +110,10 @@ export default {
item.showName = '告警,告警码：' + item.code item.showName = '告警,告警码：' + item.code
} }
if (this.type !== '0') { if (this.type !== '0') {
item.subTitle = `于${item.startTime}发生${item.showName}` item.subTitle = `于${item.startTime}`
} else { } else {
item.subTitle = item.subTitle =
`于${item.startTime}发生${item.showName}。` + `于${item.startTime}。` +
item.dataSet item.dataSet
.map((item2) => { .map((item2) => {
return ( return (
@@ -161,10 +156,12 @@ export default {
border-radius: 8rpx; border-radius: 8rpx;
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
background: #fff; background: #fff;
.content-item-header { .content-item-header {
display: flex; display: flex;
padding: 20rpx 0; padding: 20rpx 0;
border-bottom: 1px solid #ebeef5; border-bottom: 1px solid #ebeef5;
.content-item-header-icon { .content-item-header-icon {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -174,30 +171,35 @@ export default {
border-radius: 8rpx; border-radius: 8rpx;
background: $uni-theme-color; background: $uni-theme-color;
} }
.content-item-header-right { .content-item-header-right {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
height: 100rpx; // height: 140rpx;
margin-left: 20rpx; margin-left: 20rpx;
.content-item-header-right-title { .content-item-header-right-title {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #111; color: #111;
} }
.content-item-header-right-des { .content-item-header-right-des {
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
} }
} }
} }
.content-item-footer { .content-item-footer {
margin-top: 20rpx; margin-top: 20rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
} }
} }
// padding-top: 20rpx; // padding-top: 20rpx;
} }

23
pages/device/DVR/detail.vue
View File

@@ -5,23 +5,17 @@
<view class="detail-header"> <view class="detail-header">
<view class="header"> <view class="header">
<image <image
src="http://localhost:8088/api/system-boot/image/toStream?bgImage=topology/1aca98ceb22a1fc33b81d9101275ef1.png" src="http://localhost:8088/api/system-boot/file/download?filePath=topology/1aca98ceb22a1fc33b81d9101275ef1.png"
mode="widthFix" mode="widthFix" style="width: 100%" />
style="width: 100%"
/>
</view> </view>
<!-- <view class="des"> <!-- <view class="des">
<text>设备基础信息</text> <text>设备基础信息</text>
<text class="ml10">设备状态</text> <text class="ml10">设备状态</text>
</view> --> </view> -->
<view class="nav"> <view class="nav">
<view <view class="nav-menu" :class="{ 'nav-menu-active': navMenuActive == index }"
class="nav-menu" v-for="(item, index) in navMenuList" :key="index" @click="navMenuClick(index)">{{ item.text
:class="{ 'nav-menu-active': navMenuActive == index }" }}
v-for="(item, index) in navMenuList"
:key="index"
@click="navMenuClick(index)"
>{{ item.text }}
</view> </view>
</view> </view>
</view> </view>
@@ -221,9 +215,9 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.detail { .detail {
// background: $uni-theme-white; // background: $uni-theme-white;
.header { .header {}
}
.des { .des {
padding: 20rpx 20rpx 0; padding: 20rpx 20rpx 0;
@@ -269,14 +263,17 @@ export default {
background: #f3f4f5; background: #f3f4f5;
} }
} }
/deep/ .uni-fab__circle--rightBottom { /deep/ .uni-fab__circle--rightBottom {
right: 8px !important; right: 8px !important;
bottom: 8px !important; bottom: 8px !important;
} }
/deep/ .uni-fab--rightBottom { /deep/ .uni-fab--rightBottom {
right: 8px !important; right: 8px !important;
bottom: 8px !important; bottom: 8px !important;
} }
/deep/ .uni-fab__circle { /deep/ .uni-fab__circle {
width: 50px; width: 50px;
height: 54px; height: 54px;

42
pages/message/message.vue
View File

@@ -3,13 +3,8 @@
<view class="content" slot="body"> <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" v-for="(item, index) in store.data" :key="index" @click="jump(item)">
<view class="content-item-header"> <view class="content-item-header">
<uni-badge <uni-badge class="uni-badge-left-margin" :is-dot="true" :text="item.status == '1' ? 0 : 1"
class="uni-badge-left-margin" absolute="rightTop" size="small" :style="type == '0' ? `margin-top: 30rpx;` : ''">
:is-dot="true"
:text="item.status == '1' ? 0 : 1"
absolute="rightTop"
size="small"
>
<view class="content-item-header-icon"> <view class="content-item-header-icon">
<image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image> <image mode="aspectFill" :src="staticIcon" style="height: 60rpx; width: 60rpx"></image>
</view> </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 }} {{ item.projectName }}</view> -->
<view class="content-item-header-right-des">工程名称：{{ item.engineeringName }}</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.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 class="content-item-header-right-des">{{ item.subTitle }}</view> -->
</view> </view>
<view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view> <view class="ml10" v-if="type === '0' || item.status != '1'">🔍</view>
@@ -41,10 +40,8 @@
</view> </view>
</uni-card> --> </uni-card> -->
<Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty> <Cn-empty v-if="store.empty" style="padding-top: 400rpx"></Cn-empty>
<uni-load-more <uni-load-more v-if="store.status == 'loading' || (store.data && store.data.length > 0)"
v-if="store.status == 'loading' || (store.data && store.data.length > 0)" :status="store.status"></uni-load-more>
:status="store.status"
></uni-load-more>
</view> </view>
</Cn-page> </Cn-page>
</template> </template>
@@ -109,6 +106,8 @@ export default {
this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage') this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = this.type this.store.params.type = this.type
this.store.loadedCallback = () => { this.store.loadedCallback = () => {
console.log(111, this.store.data)
this.store.data.forEach((item) => { this.store.data.forEach((item) => {
if (this.type === '3') { if (this.type === '3') {
item.showName = '告警,告警码：' + item.code item.showName = '告警,告警码：' + item.code
@@ -117,7 +116,7 @@ export default {
item.subTitle = `于${item.startTime}发生${item.showName}` item.subTitle = `于${item.startTime}发生${item.showName}`
} else { } else {
item.subTitle = item.subTitle =
`于${item.startTime}发生${item.showName}。` + `于${item.startTime}。` +
item.dataSet item.dataSet
.map((item2) => { .map((item2) => {
return ( return (
@@ -130,19 +129,17 @@ export default {
.join('，') .join('，')
} }
}) })
console.log(this.store.data)
this.loading = false this.loading = false
} }
this.store.reload() this.store.reload()
}, },
jump(item) { jump(item) {
console.log(`123`,item);
console.log(`123`,this.type);
if (this.type === '0') { if (this.type === '0') {
let str = JSON.stringify(item).replace(/%/g, '百分比') let str = JSON.stringify(item).replace(/%/g, '百分比')
item.status = '1' item.status = '1'
uni.navigateTo({ url: '/pages/message/messageDetail?detail=' + encodeURIComponent(str) }) uni.navigateTo({ url: '/pages/message/messageDetail?detail=' + encodeURIComponent(str) })
} else { } else {
if (item.status != '1') { if (item.status != '1') {
@@ -166,10 +163,12 @@ export default {
border-radius: 8rpx; border-radius: 8rpx;
border: 1px solid #ebeef5; border: 1px solid #ebeef5;
background: #fff; background: #fff;
.content-item-header { .content-item-header {
display: flex; display: flex;
padding: 20rpx 0; padding: 20rpx 0;
border-bottom: 1px solid #ebeef5; border-bottom: 1px solid #ebeef5;
.content-item-header-icon { .content-item-header-icon {
display: flex; display: flex;
align-items: center; align-items: center;
@@ -179,30 +178,35 @@ export default {
border-radius: 8rpx; border-radius: 8rpx;
background: $uni-theme-color; background: $uni-theme-color;
} }
.content-item-header-right { .content-item-header-right {
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
height: 100rpx; // height: 140rpx;
margin-left: 20rpx; margin-left: 20rpx;
.content-item-header-right-title { .content-item-header-right-title {
font-size: 28rpx; font-size: 28rpx;
font-weight: bold; font-weight: bold;
color: #111; color: #111;
} }
.content-item-header-right-des { .content-item-header-right-des {
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
} }
} }
} }
.content-item-footer { .content-item-footer {
margin-top: 20rpx; margin-top: 20rpx;
font-size: 24rpx; font-size: 24rpx;
color: #999; color: #999;
} }
} }
// padding-top: 20rpx; // padding-top: 20rpx;
} }

2
pages/mine/setup.vue
View File

@@ -48,7 +48,7 @@
<!-- @click="jump('about')" --> <!-- @click="jump('about')" -->
<view class="mine-nav" style="border-bottom: none"> <view class="mine-nav" style="border-bottom: none">
<view class="mine-nav-label">版本信息</view> <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> --> <!-- <uni-icons type="forward" color="#aaa" size="20"></uni-icons> -->
</view> </view>
<view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none"> <view class="mine-nav" @click="jump('layout')" style="margin-top: 20rpx; border-bottom: none">