diff --git a/src/assets/css/main.css b/src/assets/css/main.css index a71de57a..0cd62384 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -1542,6 +1542,7 @@ textarea { grid-template-columns: repeat(2, 1fr); grid-row-gap: 20px; grid-column-gap: 20px; + grid-auto-rows: minmax(min-content, 50px); padding: 19px 30px; } @@ -2903,13 +2904,17 @@ textarea { align-items: center; padding: 0 20px; margin-bottom: 30px; + color: #FFFFFF; +} + +.input-100-view input { + color: #FFFFFF; } .input-100-view .title { font-size: 20px; font-family: Microsoft YaHei; font-weight: bold; - color: #FFFFFF; } .input-100-view span { diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss index 7efeca93..6e661c21 100644 --- a/src/assets/css/main.scss +++ b/src/assets/css/main.scss @@ -1625,6 +1625,7 @@ textarea { grid-template-columns: repeat(2, 1fr); grid-row-gap: 20px; //纵向间隔 grid-column-gap: 20px; //横向间隔 + grid-auto-rows: minmax(min-content, 50px); padding: 19px 30px; &.upload-content1 { @@ -3082,11 +3083,14 @@ textarea { padding: 0 20px; margin-bottom: 30px; + color: #FFFFFF; + input{ + color: #FFFFFF;} + .title { font-size: 20px; font-family: Microsoft YaHei; font-weight: bold; - color: #FFFFFF; } span { @@ -4995,4 +4999,7 @@ textarea { } } } -} \ No newline at end of file +} + + + diff --git a/src/components/large-bar-charts.vue b/src/components/large-bar-charts.vue new file mode 100644 index 00000000..d09d0624 --- /dev/null +++ b/src/components/large-bar-charts.vue @@ -0,0 +1,46 @@ + + + diff --git a/src/components/large-line-charts.vue b/src/components/large-line-charts.vue new file mode 100644 index 00000000..a9991162 --- /dev/null +++ b/src/components/large-line-charts.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/components/large-seamless.vue b/src/components/large-seamless.vue new file mode 100644 index 00000000..7d1e65f2 --- /dev/null +++ b/src/components/large-seamless.vue @@ -0,0 +1,156 @@ + + + \ No newline at end of file diff --git a/src/components/large-state.vue b/src/components/large-state.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/components/large-weather-charts.vue b/src/components/large-weather-charts.vue new file mode 100644 index 00000000..1e333614 --- /dev/null +++ b/src/components/large-weather-charts.vue @@ -0,0 +1,51 @@ + + + diff --git a/src/components/large-weather-img.vue b/src/components/large-weather-img.vue new file mode 100644 index 00000000..625e42c2 --- /dev/null +++ b/src/components/large-weather-img.vue @@ -0,0 +1,34 @@ + + + \ No newline at end of file diff --git a/src/components/large-weather-swiper.vue b/src/components/large-weather-swiper.vue new file mode 100644 index 00000000..e6972619 --- /dev/null +++ b/src/components/large-weather-swiper.vue @@ -0,0 +1,107 @@ + + + diff --git a/src/views/officialWebsite/new.vue b/src/views/officialWebsite/new.vue index ac671e9f..5d47d665 100644 --- a/src/views/officialWebsite/new.vue +++ b/src/views/officialWebsite/new.vue @@ -165,7 +165,7 @@ title="新闻内容编写" top="10vh" :visible.sync="newsModel" - width="1000px" + width="1300px" class="vrcode-model manage-model" :append-to-body="true" > @@ -182,7 +182,7 @@ :mode="mode" />
- -
+ + + +
作物模型
-
+ + +
实时数据
-
-
+ + + +
-
{{ el.name }} @@ -97,25 +99,19 @@
-
-
+
-->
本周温度统计
-
+ + +
-
+ +
@@ -299,8 +295,8 @@
- -
+ +
温室实时数据
-
+ +
薄膜温室番茄
@@ -554,9 +551,15 @@ import mapData from "@/assets/js/mapData.js"; import { changeLanguage, getLanguage } from '@/utils/language' import { pestLine } from "@/assets/js/charts"; import largeNav from '@/components/large-nav.vue' +import LargeWeatherSwiper from '@/components/large-weather-swiper.vue' +import LargeWeatherCharts from '@/components/large-weather-charts.vue' +import LargeWeatherImg from '@/components/large-weather-img.vue'; +import LargeLineCharts from '@/components/large-line-charts.vue'; +import LargeSeamless from '@/components/large-seamless.vue'; +import LargeBarCharts from '@/components/large-bar-charts.vue'; export default { name: "largeScreen", - components: { vueSeamless,largeNav }, + components: { vueSeamless,largeNav,LargeWeatherSwiper,LargeWeatherCharts, LargeWeatherImg,LargeLineCharts,LargeSeamless,LargeBarCharts }, computed: { defaultOption() { return { @@ -601,7 +604,7 @@ export default { current: 5, current1: 1, - + weather_echart:{}, dataList: [ // "一号温室", "二号温室", "三号温室", "四号温室", "五号温室", "六号温室" ], @@ -702,13 +705,14 @@ export default { close_btn: false, }, ], - + thisWeekTemperature_echart:{}, // 金山吕港草莓数据id12 imgUrl: '', //长兴前卫柑桔新优品种扩繁基地id13单独虫情接口数据 imageList: [], chartsData: null, srcList: [], + chartsData11:{}, // id9的甘井设施农业大数据云平台 dateRange: [], @@ -716,6 +720,7 @@ export default { pageSize: 20, tableData: [], tableList: [], + chartsData9:{}, }; }, beforeMount() { @@ -903,8 +908,8 @@ export default { } this.api.getControlFsdata(params).then(res => { if (res.data.code == 200) { - var chartsData = res.data.data - realTimeLine2('realTime-line', chartsData, data1,0) + this.chartsData9 = {chartsData:res.data.data,deviceId:data1} + realTimeLine2('realTime-line', this.chartsData9, data1,0) } else { // this.$message.error(res.data.msg); } @@ -939,8 +944,8 @@ export default { } this.api.getControlFsdata(params).then(res => { if (res.data.code == 200) { - var chartsData = res.data.data - realTimeLine2('realTime-line', chartsData, data1) + this.chartsData11 = {chartsData:res.data.data,deviceId:data1} + realTimeLine2('realTime-line', this.chartsData11, data1) } else { // this.$message.error(res.data.msg); } @@ -1030,7 +1035,11 @@ export default { data_value: this.weather_echart_list_value, data_category: this.weather_echart_list_category, }; - weather_echart("weather_echart", data); + this.weather_echart=data + setTimeout(() => { + this.$forceUpdate() + }, 0); + // weather_echart("weather_echart", data); }); }, @@ -1048,8 +1057,9 @@ export default { maxTemperature: this.maxTemperature_list, minTemperature: this.minTemperature_list, }; + this.thisWeekTemperature_echart=data // console.log('00000000',data); - thisWeekTemperature_echart("thisWeekTemperature_echart", data); + // thisWeekTemperature_echart("thisWeekTemperature_echart", data); }); }, @@ -2406,58 +2416,7 @@ window.open("http://localhost:8080/"); justify-content: space-between; box-sizing: border-box; padding: 0 0.66rem; - .weather { - width: 3.84rem; - height: 0.34rem; - >div { - width: 100%; - height: 100%; - box-sizing: border-box; - padding: 0 0.1rem; - background: rgba(14, 91, 165, 0.1); - border: 0.01rem solid rgba(97, 152, 209, 0.65); - line-height: 0.34rem; - font-size: 0.16rem; - font-family: MicrosoftYaHei; - font-weight: 400; - color: #ffffff; - display: -webkit-box; - -webkit-line-clamp: 1; - -webkit-box-orient: vertical; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - - marquee { - width: 100%; - height: 100%; - - .item { - height: 100%; - margin-right: 0.1rem; - display: inline-block; - - >img { - width: 0.3rem; - height: 0.3rem; - position: relative; - top: 0.01rem; - margin-right: 0.05rem; - } - - >span { - font-size: 0.16rem; - font-weight: 400; - color: #fff; - font-family: Microsoft YaHei; - position: relative; - top: -0.08rem; - } - } - } - } - } .e_title { width: 3.98rem; height: 0.19rem;