From 2b1fde693a236a4d44fb7d40066fa4be632e8035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Sun, 29 Jun 2025 11:42:24 +0800 Subject: [PATCH 1/9] 1 --- src/assets/css/main.css | 2 - src/assets/css/main.scss | 3 +- src/assets/js/mapData.js | 1 + src/components/large-nav.vue | 110 ++ src/router/index.js | 8 + src/views/page/largeScreen.vue | 89 +- src/views/page/largeScreen2.vue | 213 +++ src/views/page/largeScreen3.vue | 2597 +++++++++++++++++++++++++++++++ 8 files changed, 3007 insertions(+), 16 deletions(-) create mode 100644 src/assets/js/mapData.js create mode 100644 src/components/large-nav.vue create mode 100644 src/views/page/largeScreen2.vue create mode 100644 src/views/page/largeScreen3.vue diff --git a/src/assets/css/main.css b/src/assets/css/main.css index f0c78455..ad4fde75 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -33,8 +33,6 @@ .tips-model { padding: 10px; - color: #ff7f00; - color: #ff7f00; color: #fff; } diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 777f9757..2bc9bbcd 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -36,8 +36,7 @@ .tips-model { padding: 10px; - color: #ff7f00; - color: #ff7f00; + color: #fff; .tips-model-title { diff --git a/src/assets/js/mapData.js b/src/assets/js/mapData.js new file mode 100644 index 00000000..c39800d2 --- /dev/null +++ b/src/assets/js/mapData.js @@ -0,0 +1 @@ +export default {"features":[{"geometry":{"coordinates":[[121.696882,31.411424],[121.696958,31.41096],[121.697851,31.411053],[121.69778,31.411508],[121.696878,31.411428]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.695994,31.411383],[121.696079,31.410871],[121.696878,31.410964],[121.696769,31.411456],[121.695984,31.411379]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.694794,31.411299],[121.69495,31.410742],[121.695937,31.410855],[121.695819,31.411412],[121.694789,31.411295]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.694978,31.41067],[121.695143,31.410234],[121.69606,31.410347],[121.695914,31.410779],[121.694978,31.41067]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.696055,31.410779],[121.696178,31.410359],[121.696816,31.41044],[121.696868,31.410448],[121.696759,31.410875],[121.696055,31.410771]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698399,31.411109],[121.69847,31.410625],[121.700237,31.410762],[121.700162,31.411258],[121.698404,31.411105]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698182,31.41042],[121.698229,31.410089],[121.700525,31.410238],[121.700445,31.410605],[121.698168,31.41042]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698111,31.409996],[121.698139,31.409702],[121.700544,31.409871],[121.700488,31.410149],[121.698106,31.409996]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.698097,31.409557],[121.698125,31.40927],[121.700558,31.40946],[121.700511,31.409742],[121.698101,31.409553]],"type":"LineString"},"type":"Feature","properties":{}},{"geometry":{"coordinates":[[121.69812,31.409186],[121.698149,31.40898],[121.700015,31.409133],[121.699973,31.409327],[121.698111,31.409186]],"type":"LineString"},"type":"Feature","properties":{}}],"type":"FeatureCollection"} diff --git a/src/components/large-nav.vue b/src/components/large-nav.vue new file mode 100644 index 00000000..a56ffe3b --- /dev/null +++ b/src/components/large-nav.vue @@ -0,0 +1,110 @@ + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index ca2ce2b0..4cee9fa4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -43,6 +43,14 @@ const routes = [ path: '/largeScreen1', name: 'largeScreen1', component: () => import('../views/page/largeScreen1.vue') + },{ + path: '/largeScreen2', + name: 'largeScreen2', + component: () => import('../views/page/largeScreen2.vue') + },{ + path: '/largeScreen3', + name: 'largeScreen3', + component: () => import('../views/page/largeScreen3.vue') }, // 虫情查看的 { diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 5d6ba297..2f3c3f56 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -20,8 +20,8 @@ {{ time.time }} {{$t('text.return')}} - - +
-
+
+
+
+
+ - + + \ No newline at end of file diff --git a/src/views/page/wetFan.vue b/src/views/page/wetFan.vue index c381d979..8f9155e9 100644 --- a/src/views/page/wetFan.vue +++ b/src/views/page/wetFan.vue @@ -402,12 +402,12 @@ export default { loading:null, pageName:'湿帘风机', typeList1: [ - { label:this.$t('heatFan.gearOptions.gear0'), value: 0 }, - { label:this.$t('heatFan.gearOptions.gear1',{index:1}), value: 1 }, - { label:this.$t('heatFan.gearOptions.gear1',{index:2}), value: 2 }, - { label:this.$t('heatFan.gearOptions.gear1',{index:3}), value: 3 }, - { label:this.$t('heatFan.gearOptions.gear1',{index:4}), value: 4 }, - { label:this.$t('heatFan.gearOptions.gear1',{index:5}), value: 5 }, + { label:this.$t('heatFan.gear0'), value: 0 }, + { label:this.$t('heatFan.gear1',{index:1}), value: 1 }, + { label:this.$t('heatFan.gear1',{index:2}), value: 2 }, + { label:this.$t('heatFan.gear1',{index:3}), value: 3 }, + { label:this.$t('heatFan.gear1',{index:4}), value: 4 }, + { label:this.$t('heatFan.gear1',{index:5}), value: 5 }, ], inputDataNew: [], } -- 2.47.2 From ae9b9127b456a982d260bc4cd116cbb292b3afe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Mon, 30 Jun 2025 18:19:32 +0800 Subject: [PATCH 5/9] 1 --- src/views/page/largeScreen2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/page/largeScreen2.vue b/src/views/page/largeScreen2.vue index 601f5a40..82f4f37f 100644 --- a/src/views/page/largeScreen2.vue +++ b/src/views/page/largeScreen2.vue @@ -32,7 +32,7 @@ :current-page.sync="currentPage" :page-size="12" layout="total, prev, pager, next" - :total="16" + :total="14" > -- 2.47.2 From 33f344a0c884801d1b85df3278374e0821d56cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Mon, 30 Jun 2025 18:22:48 +0800 Subject: [PATCH 6/9] 1 --- src/views/page/largeScreen2.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/page/largeScreen2.vue b/src/views/page/largeScreen2.vue index 82f4f37f..8bdf43c7 100644 --- a/src/views/page/largeScreen2.vue +++ b/src/views/page/largeScreen2.vue @@ -11,7 +11,7 @@ {{ time.time }} -
+
- @@ -77,10 +77,11 @@ export default { { cameraid: "FT5712546", channelid: 10, player: null }, { cameraid: "FT5712546", channelid: 11, player: null }, { cameraid: "FT5712546", channelid: 12, player: null }, + { cameraid: "FT5712546", channelid: 13, player: null }, + { cameraid: "FT5712546", channelid: 14, player: null }, ]; this.list2 = [ - { cameraid: "FT5712546", channelid: 13, player: null }, - { cameraid: "FT5712546", channelid: 14, player: null }, + ]; setTimeout(() => { this.dataInit(); @@ -307,13 +308,13 @@ export default { .content { width: 100%; padding: 0 1rem; - height: calc(100% - 2.7rem); + height: calc(100% - 2.5rem); display: grid; grid-template-columns: repeat(4, 1fr); grid-row-gap: 0.2rem; //纵向间隔 grid-column-gap: 0.2rem; //横向间隔 .video { - height: calc((100vh - 3.1rem) / 3); + height: calc((100vh - 3.3rem) / 3); .video-js { width: 100%; height: 100%; -- 2.47.2 From aff7449ed0e0fd300e082a044da1676de67f2225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Tue, 1 Jul 2025 10:02:54 +0800 Subject: [PATCH 7/9] 1 --- src/views/page/largeScreen.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index e5b170b6..3fae4d82 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -3526,6 +3526,8 @@ window.open("http://localhost:8080/"); object-fit: cover } >div{ + text-indent: 2em; + font-size: .16rem; height: calc(100% - 1.7rem); } } -- 2.47.2 From c6dc262ac463ca1d6c3ce4f9791438291f3f936f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Tue, 1 Jul 2025 10:24:16 +0800 Subject: [PATCH 8/9] 1 --- src/i18n/lang/en.js | 2 ++ src/i18n/lang/zh.js | 2 ++ src/views/page/largeScreen.vue | 11 ++++++++++- src/views/page/largeScreen1.vue | 11 ++++++++++- src/views/page/largeScreen2.vue | 2 +- src/views/page/largeScreen3.vue | 2 +- src/views/page/realTime.vue | 4 +++- 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js index a81b7ac9..1f2d61a9 100644 --- a/src/i18n/lang/en.js +++ b/src/i18n/lang/en.js @@ -225,6 +225,8 @@ module.exports = { }, realTime: { + due:'Due', + Expiration:'Expiration Date', target: 'Target', average: 'Avg', title: 'Real-time Data', diff --git a/src/i18n/lang/zh.js b/src/i18n/lang/zh.js index 29c27309..dbff58f3 100644 --- a/src/i18n/lang/zh.js +++ b/src/i18n/lang/zh.js @@ -232,6 +232,8 @@ module.exports = { }, // 实时页面 realTime: { + due:'即将到期', + Expiration:'到期时间', target: '目标', average: '平均', title: '实时数据', diff --git a/src/views/page/largeScreen.vue b/src/views/page/largeScreen.vue index 3fae4d82..4352ebc3 100644 --- a/src/views/page/largeScreen.vue +++ b/src/views/page/largeScreen.vue @@ -3,7 +3,7 @@
{{ other_show ? '后退' : '园区简介' }}
-
{{ limitUserId == 9 ? '甘井设施农业大数据云平台' : '温室智慧云数据统计' }}
+
{{getName()}}
-
{{$t('realTime.iccid')}}:{{$store.state.equipmentList[indexs - 1].iccidcode?$store.state.equipmentList[indexs - 1].iccidcode:''}}   到期时间: {{getPackageTime()}}(即将到期)
+
{{$t('realTime.iccid')}}:{{$store.state.equipmentList[indexs - 1].iccidcode?$store.state.equipmentList[indexs - 1].iccidcode:''}}    + {{$t('realTime.Expiration')}}: + {{getPackageTime()}}({{$t('realTime.due')}})
{{$t('index.weatherStation')}}:
-- 2.47.2 From c0e74d833faf87d55726936e9e55f8bc7258f1a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?home=E5=AD=99?= <1162067978@qq.com> Date: Tue, 1 Jul 2025 10:43:05 +0800 Subject: [PATCH 9/9] 1 --- src/components/large-nav.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/large-nav.vue b/src/components/large-nav.vue index f04e6e15..6bc36b06 100644 --- a/src/components/large-nav.vue +++ b/src/components/large-nav.vue @@ -20,7 +20,7 @@
- 智能农机 + 智能施肥机
-- 2.47.2