From 758e59eeac677770637b15b38c6f146c8c0a1e59 Mon Sep 17 00:00:00 2001 From: Shang Chen Date: Tue, 1 Jul 2025 16:59:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- androidPrivacy.json | 10 +- components/Search/index.vue | 31 +- components/history-modal/index.vue | 2 +- components/new-search/index.vue | 12 +- components/section/index.vue | 2 +- components/station-dropdow/index.vue | 2 +- .../home-page/alarm/components/alarmevent.vue | 2 +- pages/home-page/alarm/index.vue | 22 +- .../device-detail/components/air.vue | 2 +- .../device-detail/components/ammeter.vue | 14 +- .../device-detail/components/cluster.vue | 2 +- .../device-detail/components/jingke-pcs.vue | 2 +- .../device-detail/components/jingke-stack.vue | 2 +- .../device-detail/components/pack.vue | 6 +- .../device-detail/components/pcs.vue | 2 +- .../device-detail/components/stack.vue | 2 +- pages/home-page/device-detail/index.vue | 8 +- pages/home-page/earnings/index.vue | 6 +- pages/home-page/policy-management/index.vue | 1542 +++++++++-------- pages/login/components/dialog.vue | 10 +- pages/login/index.scss | 90 +- pages/login/index.vue | 6 +- pages/sys/user/pwd.vue | 4 +- .../components/dischargeChart/index.vue | 2 +- .../components/environmentalControl/index.vue | 2 +- .../environmentalControl/position.vue | 4 +- .../components/topology/devicemonitoring.vue | 8 +- pages/tabbar/components/topology/fire.vue | 4 +- pages/tabbar/components/topology/jingke.vue | 2 +- pages/tabbar/dashboard.vue | 11 +- pages/tabbar/electricityPrice.vue | 41 +- pages/tabbar/mine.vue | 9 +- static/aidex/images/Data-fill.png | Bin 2878 -> 10051 bytes static/aidex/images/My-fill.png | Bin 2720 -> 9773 bytes static/aidex/images/Price-fill.png | Bin 2840 -> 9021 bytes static/aidex/images/checked.png | Bin 4841 -> 4654 bytes static/aidex/images/dqgl.png | Bin 581 -> 927 bytes static/aidex/images/item.png | Bin 197 -> 0 bytes static/aidex/images/item2.png | Bin 0 -> 184 bytes static/aidex/images/menu-alarm.png | Bin 4910 -> 4852 bytes static/aidex/images/menu-device.png | Bin 3255 -> 3480 bytes static/aidex/images/menu-earnings.png | Bin 3449 -> 3503 bytes static/aidex/images/menu-policy.png | Bin 3065 -> 2871 bytes static/aidex/images/rcdl.png | Bin 524 -> 790 bytes static/aidex/images/rfdl.png | Bin 352 -> 498 bytes static/aidex/images/search.png | Bin 0 -> 1288 bytes static/aidex/images/xtzhl.png | Bin 800 -> 1200 bytes static/aidex/images/yxts.png | Bin 477 -> 759 bytes static/aidex/images/zcdl.png | Bin 436 -> 671 bytes static/aidex/images/zfdl.png | Bin 496 -> 731 bytes static/aidex/images/zjrl.png | Bin 438 -> 750 bytes static/aidex/login/bg-logo.png | Bin 16303 -> 0 bytes static/aidex/login/bg-logo2.png | Bin 0 -> 17128 bytes static/topology/ACDC.png | Bin 0 -> 464 bytes static/topology/ammeter-1.png | Bin 0 -> 404 bytes static/topology/cang.png | Bin 3926 -> 1257 bytes static/topology/fire.png | Bin 6853 -> 6947 bytes static/topology/grid.png | Bin 0 -> 2785 bytes static/topology/yitigui.png | Bin 2743 -> 971 bytes .../luyj-tree-item/luyj-tree-item.scss | 141 +- .../luyj-tree-navigation.scss | 38 +- .../luyj-tree-navigation.vue | 2 +- .../luyj-tree-search/luyj-tree-search.vue | 11 +- .../uni-datetime-picker/calendar-item.vue | 2 +- .../uni-datetime-picker/calendar.vue | 2 +- uview-ui/components/u-picker/u-picker.vue | 2 +- uview-ui/components/u-select/u-select.vue | 2 +- uview-ui/components/u-switch/u-switch.vue | 2 +- 68 files changed, 1058 insertions(+), 1008 deletions(-) delete mode 100644 static/aidex/images/item.png create mode 100644 static/aidex/images/item2.png create mode 100644 static/aidex/images/search.png delete mode 100644 static/aidex/login/bg-logo.png create mode 100644 static/aidex/login/bg-logo2.png create mode 100644 static/topology/ACDC.png create mode 100644 static/topology/ammeter-1.png create mode 100644 static/topology/grid.png diff --git a/androidPrivacy.json b/androidPrivacy.json index 6ea7f39..d705b25 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -6,14 +6,14 @@ "buttonAccept": "同意并接受", "buttonRefuse": "暂不同意", "hrefLoader": "system", - "backToExit":"false", + "backToExit": "false", "second": { "title": "确认提示", "message": "　　进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。", "buttonAccept": "同意并继续", "buttonRefuse": "退出应用" }, - "disagreeMode":{ + "disagreeMode": { "support": false, "loadNativePlugins": false, "visitorEntry": false, @@ -21,12 +21,12 @@ }, "styles": { "backgroundColor": "#fff", - "borderRadius":"5px", + "borderRadius": "5px", "title": { "color": "#000000" }, "buttonAccept": { - "color": "#009c77" + "color": "#009458" }, "buttonRefuse": { "color": "#999999" @@ -35,4 +35,4 @@ "color": "#999999" } } -} +} \ No newline at end of file diff --git a/components/Search/index.vue b/components/Search/index.vue index a5f137b..391f8ef 100644 --- a/components/Search/index.vue +++ b/components/Search/index.vue @@ -1,18 +1,10 @@ @@ -25,7 +17,7 @@ export default { default: "请输入告警内容筛选", }, }, - data() { + data () { return { dec: "", value1: 1, @@ -34,11 +26,11 @@ export default { }; }, methods: { - open() { + open () { this.show_ = true; this.$emit("custom"); }, - blur() { + blur () { this.$emit("blur", this.dec); }, }, @@ -46,6 +38,13 @@ export default { \ No newline at end of file diff --git a/pages/login/components/dialog.vue b/pages/login/components/dialog.vue index e137005..7fa365b 100644 --- a/pages/login/components/dialog.vue +++ b/pages/login/components/dialog.vue @@ -7,7 +7,7 @@ {{ $t('homePage.home.msgf')}} - 《{{ $t('homePage.home.yhxy')}}》{{ $t('homePage.home.and')}}《{{ $t('homePage.home.yszc')}}》 + 《{{ $t('homePage.home.yhxy')}}》{{ $t('homePage.home.and')}}《{{ $t('homePage.home.yszc')}}》 {{ $t('homePage.home.msgs')}} @@ -116,7 +116,7 @@ font-size: 24rpx; margin-top: 20rpx; .xieyi { - color: #009C77; + color: #009458; } } @@ -144,7 +144,7 @@ .version { padding-left: 24rpx; font-size: 36rpx; - color: #009c77; + color: #009458; font-weight: 400; } } @@ -167,7 +167,7 @@ max-width: 14rpx; max-height: 12rpx; border-radius: 50%; - background-color: #009c77; + background-color: #009458; font-size: 24rpx; } @@ -183,7 +183,7 @@ margin-top: 50rpx; width: 360rpx; height: 70rpx; - background-color: #009c77; + background-color: #009458; border: none !important; font-size: 28rpx; color: #fff; diff --git a/pages/login/index.scss b/pages/login/index.scss index fa3dbdb..c6b943d 100644 --- a/pages/login/index.scss +++ b/pages/login/index.scss @@ -4,13 +4,14 @@ display: flex; flex-direction: column; align-items: center; - .EnglishFont{ - font-size: 36rpx; - font-weight: 600; - margin-top: 60rpx; - margin-bottom: 40rpx; - // display: flex; - // align-items: center; + + .EnglishFont { + font-size: 36rpx; + font-weight: 600; + margin-top: 60rpx; + margin-bottom: 40rpx; + // display: flex; + // align-items: center; } } @@ -29,15 +30,15 @@ .list-call-user .u-input { font-size: 30rpx; - width: 100%; - height: 110rpx; - text-indent: 2%; - border: 1px solid #00CA9A; + width: 100%; + height: 110rpx; + text-indent: 2%; + border: 1px solid #00CA9A; } -.zhanghao{ - color: #282828; - margin-bottom: 10rpx; +.zhanghao { + color: #282828; + margin-bottom: 10rpx; } .list-call-password .u-input { @@ -45,15 +46,15 @@ font-size: 30rpx; width: 100%; height: 110rpx; - text-indent: 2%; - border: 1px solid #00CA9A; + text-indent: 2%; + border: 1px solid #00CA9A; } .list-call-password .u-icon-right { - position: absolute; - right: 20rpx; + position: absolute; + right: 20rpx; color: #aaaaaa; width: 40rpx; height: 40rpx; @@ -65,7 +66,7 @@ font-size: 35rpx; width: 603rpx; height: 95rpx; - background: #009C77; + background: #009c77; box-shadow: 0rpx 0rpx 13rpx 0rpx rgba(15, 168, 250, 0.4); border-radius: 10rpx; line-height: 95rpx; @@ -77,15 +78,16 @@ width: 100%; height: 400rpx; border-radius: 0 0 50% 50%; - background-color: #069E7A; + background: linear-gradient(-45deg, rgba(7, 151, 110, 1), rgba(254, 131, 15, 0.3)); } -.center-logo{ - width: 410rpx; - height: 230rpx; - top: 100rpx; - position: absolute; - + +.center-logo { + width: 410rpx; + height: 150rpx; + top: 100rpx; + position: absolute; + } .user-card { @@ -107,41 +109,45 @@ border-bottom: 1rpx solid #f5f5f5; width: 100%; height: 89rpx; - position: relative; + position: relative; margin-bottom: 30rpx; - .u-icon-delete { - position: absolute; - right: 20rpx; - color: #aaaaaa; - width: 40rpx; - height: 40rpx; - } + + .u-icon-delete { + position: absolute; + right: 20rpx; + color: #aaaaaa; + width: 40rpx; + height: 40rpx; + } + input { height: 90rpx; - border-radius: 10rpx; - padding-left: 10rpx; - box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1); + border-radius: 10rpx; + padding-left: 10rpx; + box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1); } + .user-icon { width: 36rpx; height: 39rpx; } } + .list-call-password { display: flex; align-items: center; border-bottom: 1rpx solid #f5f5f5; width: 100%; height: 89rpx; - position: relative; + position: relative; input { height: 90rpx; color: #939393; - border-radius: 10rpx; - padding-left: 10rpx; - box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1); + border-radius: 10rpx; + padding-left: 10rpx; + box-shadow: 0px 4px 16rpx rgba(0, 0, 0, 0.1); } .password-icon { @@ -159,4 +165,4 @@ .u-tabs { padding: 0 70rpx; -} +} \ No newline at end of file diff --git a/pages/login/index.vue b/pages/login/index.vue index 5092291..05097e9 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -5,7 +5,7 @@ - + @@ -74,8 +74,8 @@ - - {{ langValue === 'zh_CN' ? 'ZH' : 'EN' }} + + {{ langValue === 'zh_CN' ? 'ZH' : 'EN' }} diff --git a/pages/sys/user/pwd.vue b/pages/sys/user/pwd.vue index e37b595..94147d5 100644 --- a/pages/sys/user/pwd.vue +++ b/pages/sys/user/pwd.vue @@ -168,8 +168,8 @@ page { padding: 30rpx; .btn { width: 690rpx; - background-color:#009C77; - border-color: #009C77!important; + background-color:#009458; + border-color: #009458!important; color: #fff; } } diff --git a/pages/tabbar/components/dischargeChart/index.vue b/pages/tabbar/components/dischargeChart/index.vue index bc209be..0e1ce44 100644 --- a/pages/tabbar/components/dischargeChart/index.vue +++ b/pages/tabbar/components/dischargeChart/index.vue @@ -145,7 +145,7 @@ return [x, y]; }, }, - color: ["#009C77", "#BFE49F", "#3977B1"], + color: ["#009458", "#BFE49F", "#3977B1"], legend: { animation: false, right: "0", diff --git a/pages/tabbar/components/environmentalControl/index.vue b/pages/tabbar/components/environmentalControl/index.vue index 0e2f793..33ede17 100644 --- a/pages/tabbar/components/environmentalControl/index.vue +++ b/pages/tabbar/components/environmentalControl/index.vue @@ -136,7 +136,7 @@ export default { .section { height: 30rpx; width: 6rpx; - background-color: #009c77; + background-color: #009458; border-radius: 8rpx; } diff --git a/pages/tabbar/components/environmentalControl/position.vue b/pages/tabbar/components/environmentalControl/position.vue index c9f79ad..2781bfb 100644 --- a/pages/tabbar/components/environmentalControl/position.vue +++ b/pages/tabbar/components/environmentalControl/position.vue @@ -108,7 +108,7 @@ export default { height: 110rpx; justify-content: center; padding: 10rpx; - background: #d7e9e548; + background: rgba(254, 131, 15, 0.05); border-radius: 10rpx; margin: 10rpx 10rpx; position: relative; @@ -136,7 +136,7 @@ export default { .section { height: 30rpx; width: 6rpx; - background-color: #009c77; + background-color: #07976E; border-radius: 8rpx; } diff --git a/pages/tabbar/components/topology/devicemonitoring.vue b/pages/tabbar/components/topology/devicemonitoring.vue index ffee902..894337d 100644 --- a/pages/tabbar/components/topology/devicemonitoring.vue +++ b/pages/tabbar/components/topology/devicemonitoring.vue @@ -52,8 +52,8 @@ ], width: 2, rectType: 'fill', - borderColor: "#009C77", - background: "#009C77" + borderColor: "#009458", + background: "#009458" }, { type: "text", @@ -266,8 +266,8 @@ ], width: 2, rectType: 'fill', - borderColor: "#009C77", - background: "#009C77" + borderColor: "#009458", + background: "#009458" } const textObj = { type: "text", diff --git a/pages/tabbar/components/topology/fire.vue b/pages/tabbar/components/topology/fire.vue index d847713..ae57635 100644 --- a/pages/tabbar/components/topology/fire.vue +++ b/pages/tabbar/components/topology/fire.vue @@ -156,8 +156,8 @@ ], width: 2, rectType: 'fill', - borderColor: "#009C77", - background: "#009C77" + borderColor: "#009458", + background: "#009458" } const textObj = { type: "text", diff --git a/pages/tabbar/components/topology/jingke.vue b/pages/tabbar/components/topology/jingke.vue index 6ac8e75..5903dcb 100644 --- a/pages/tabbar/components/topology/jingke.vue +++ b/pages/tabbar/components/topology/jingke.vue @@ -7,7 +7,7 @@ :is-scroll="false" :current="currentTab" @change="changeTab" - active-color="#009C77" + active-color="#009458" > 0){ + this.rightCenter = data[0]?.rightCenter + } + }, openTimer() { @@ -449,15 +452,15 @@ .top-right-item { padding: 5rpx 10rpx; - border: 1rpx solid #009c77; + border: 1rpx solid #009458; font-size: 24rpx; - color: #009c77; + color: #009458; cursor: pointer; margin-right: 10rpx; border-radius: 8rpx; &.active { - background: #009c77; + background: #07976E; color: #ffffff; } } diff --git a/pages/tabbar/electricityPrice.vue b/pages/tabbar/electricityPrice.vue index b6d14a3..c9f5479 100644 --- a/pages/tabbar/electricityPrice.vue +++ b/pages/tabbar/electricityPrice.vue @@ -219,7 +219,7 @@ {{this.$t('homePage.price.sift')}} - - - - - @@ -353,18 +353,19 @@ export default { second: false }, sureButtonStyle: { - backgroundColor: 'rgba(0, 156, 119, 1)', - width: '280rpx', - height: '70rpx', - fontSize: '28rpx', - color: 'rgba(255, 255, 255, 1)' + backgroundColor: '#009458', + width: '280rpx', + height: '70rpx', + fontSize: '28rpx', + color: 'rgba(255, 255, 255, 1)' + }, resetButtonStyle: { - backgroundColor: 'rgba(191, 228, 159, 1)', - width: '280rpx', - height: '70rpx', - fontSize: '28rpx', - color: 'rgba(40, 40, 40, 1)' + backgroundColor: '#fdd100', + width: '280rpx', + height: '70rpx', + fontSize: '28rpx', + color: 'rgba(40, 40, 40, 1)' }, dataList: [], loading: false, @@ -1011,7 +1012,7 @@ export default { width: 100%; height: 230rpx; - background: linear-gradient(45deg, rgba(0, 156, 119, 1), rgba(178, 223, 138, 1)); + background: linear-gradient(-45deg, rgba(7, 151, 110, 1), rgba(254, 131, 15, 0.4)); display: flex; justify-content: center; align-items: center; @@ -1094,15 +1095,15 @@ export default { .top-right-item { padding: 5rpx 10rpx; - border: 1rpx solid #009c77; + border: 1rpx solid #009458; font-size: 24rpx; - color: #009c77; + color: #009458; cursor: pointer; margin-right: 10rpx; border-radius: 8rpx; &.active { - background: #009c77; + background: #009458; color: #ffffff; } } @@ -1151,7 +1152,7 @@ export default { .box-value { text-align: center; - color: #009C77; + color: #009458; font-size: 36rpx; } diff --git a/pages/tabbar/mine.vue b/pages/tabbar/mine.vue index 4e7eff3..49ca378 100644 --- a/pages/tabbar/mine.vue +++ b/pages/tabbar/mine.vue @@ -12,7 +12,7 @@ - + @@ -44,11 +44,11 @@ -