diff --git a/sub-operation-service/src/apis/agricultural.js b/sub-operation-service/src/apis/agricultural.js index 11489ea..108f065 100644 --- a/sub-operation-service/src/apis/agricultural.js +++ b/sub-operation-service/src/apis/agricultural.js @@ -4,7 +4,7 @@ import request from '@/utils/axios'; //获取农资分类查询数据 export function transaction(params = {}) { - return request('goods/business/category/transactionType?type=1', { + return request('goods/goodInfoManage/transactionType?type=1', { method: 'GET', params, }); @@ -12,7 +12,7 @@ export function transaction(params = {}) { //获取农资列表数据 export function agriculturalList(params) { - return request('goods/business/category/transactionGoodInfo', { + return request('goods/goodInfoManage/transactionGoodInfo', { method: 'GET', params, }); @@ -20,7 +20,7 @@ export function agriculturalList(params) { // 获取用户评价列表 export function agriculturalContent(params) { - return request('goods/business/category/contentPage', { + return request('goods/goodInfoManage/contentPage', { method: 'POST', params, }); diff --git a/sub-operation-service/src/apis/supplier.js b/sub-operation-service/src/apis/supplier.js new file mode 100644 index 0000000..adb8a36 --- /dev/null +++ b/sub-operation-service/src/apis/supplier.js @@ -0,0 +1,19 @@ +import request from '@/utils/axios'; + +//农资 + +//获取农资分类查询数据 +export function transaction(params = {}) { + return request('goods/goodInfoManage/transactionType?type=2', { + method: 'GET', + params, + }); +} + +//获取农资列表数据 +export function agriculturalList(params) { + return request('goods/goodInfoManage/transactionGoodInfo', { + method: 'GET', + params, + }); +} diff --git a/sub-operation-service/src/assets/images/mockPic/智能浸种.png b/sub-operation-service/src/assets/images/mockPic/智能浸种.png new file mode 100644 index 0000000..2c74cee Binary files /dev/null and b/sub-operation-service/src/assets/images/mockPic/智能浸种.png differ diff --git a/sub-operation-service/src/assets/images/mockPic/智能灌溉.png b/sub-operation-service/src/assets/images/mockPic/智能灌溉.png new file mode 100644 index 0000000..bfebceb Binary files /dev/null and b/sub-operation-service/src/assets/images/mockPic/智能灌溉.png differ diff --git a/sub-operation-service/src/assets/images/mockPic/智能配肥.png b/sub-operation-service/src/assets/images/mockPic/智能配肥.png new file mode 100644 index 0000000..150122a Binary files /dev/null and b/sub-operation-service/src/assets/images/mockPic/智能配肥.png differ diff --git a/sub-operation-service/src/assets/images/mockPic/水质检测.png b/sub-operation-service/src/assets/images/mockPic/水质检测.png new file mode 100644 index 0000000..0fe72cc Binary files /dev/null and b/sub-operation-service/src/assets/images/mockPic/水质检测.png differ diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue index d15c656..d8920fe 100644 --- a/sub-operation-service/src/layouts/component/Header/index.vue +++ b/sub-operation-service/src/layouts/component/Header/index.vue @@ -3,7 +3,7 @@
- 您好,欢迎来到农业产业服务平台 + 您好,欢迎来到农业产业运营平台
-

灌溉记录:

+

+ {{ title.indexOf('灌溉') !== -1 ? '灌溉记录' : title.indexOf('浸种') !== -1 ? '浸种记录' : '' }} +

{ // 配置项 const option = { - backgroundColor: '#fff', // 白色背景 + backgroundColor: 'rgba(255, 255, 255, 0)', // 白色背景 title: { text: '气象数据', left: 20, diff --git a/sub-operation-service/src/views/smartFarm/components/mapSimple.vue b/sub-operation-service/src/views/smartFarm/components/mapSimple.vue index cdc30fd..86081a6 100644 --- a/sub-operation-service/src/views/smartFarm/components/mapSimple.vue +++ b/sub-operation-service/src/views/smartFarm/components/mapSimple.vue @@ -60,7 +60,7 @@ onMounted(() => { // 配置项 const option = { - backgroundColor: '#fff', // 白色背景 + backgroundColor: 'rgba(255, 255, 255, 0)', // 白色背景 title: { text: '', left: 20, diff --git a/sub-operation-service/src/views/smartFarm/components/stream.vue b/sub-operation-service/src/views/smartFarm/components/stream.vue index ad43f70..0cd8d31 100644 --- a/sub-operation-service/src/views/smartFarm/components/stream.vue +++ b/sub-operation-service/src/views/smartFarm/components/stream.vue @@ -63,17 +63,18 @@ onUnmounted(() => { }); onMounted(async () => { - if (Hls.isSupported()) { - hls.value = new Hls(); - hls.value.loadSource('https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'); - hls.value.attachMedia(videoPlayer.value); - hls.value.on(Hls.Events.MANIFEST_PARSED, () => { - videoPlayer.value.play(); - }); - } else if (videoPlayer.value.canPlayType('application/vnd.apple.mpegurl')) { - // Safari原生支持HLS - videoPlayer.value.src = 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'; - } + // if (Hls.isSupported()) { + // hls.value = new Hls(); + // // hls.value.loadSource('https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'); + // // hls.value.loadSource(); + // hls.value.attachMedia(videoPlayer.value); + // hls.value.on(Hls.Events.MANIFEST_PARSED, () => { + // videoPlayer.value.play(); + // }); + // } else if (videoPlayer.value.canPlayType('application/vnd.apple.mpegurl')) { + // // Safari原生支持HLS + // videoPlayer.value.src = 'https://test-streams.mux.dev/x36xhzz/x36xhzz.m3u8'; + // } }); @@ -98,7 +99,7 @@ onMounted(async () => {
- +
正在加载直播流...
{{ error }}
diff --git a/sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue b/sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue index c19d5c5..7ab7054 100644 --- a/sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue +++ b/sub-operation-service/src/views/smartFarm/inspection/IntelligentIrrigation.vue @@ -66,7 +66,7 @@ const devices = ref([ }, ]); -const srcList = ref(['https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg']); +const srcList = ref(); const rightData = ref([ { title: '土壤温度', //左侧文本 diff --git a/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue b/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue index e9f9a0c..296aa6a 100644 --- a/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue +++ b/sub-operation-service/src/views/smartFarm/inspection/intelligentFertilizer.vue @@ -37,6 +37,22 @@
肥料储备:
充足
+
+
配肥记录:
+
+
+ +
@@ -50,6 +66,7 @@ import Common from '../components/common.vue'; import Devices from '@/views/smartFarm/components/devices.vue'; import Stream from '@/views/smartFarm/components/stream.vue'; import * as echarts from 'echarts'; +import { getAssetsFile } from '@/utils/index.js'; /* --------------- data --------------- */ // #region const devices = ref([ @@ -89,6 +106,7 @@ const devices = ref([ id: 9, }, ]); +const srcList = ref([getAssetsFile('images/mockPic/水质检测.png')]); // #endregion /* --------------- methods --------------- */ // #region diff --git a/sub-operation-service/src/views/smartFarm/inspection/waterInspection.vue b/sub-operation-service/src/views/smartFarm/inspection/waterInspection.vue index 029f359..6bd29b0 100644 --- a/sub-operation-service/src/views/smartFarm/inspection/waterInspection.vue +++ b/sub-operation-service/src/views/smartFarm/inspection/waterInspection.vue @@ -6,7 +6,7 @@ import { getAssetsFile } from '@/utils/index.js'; const currentDevice = ref(0); const imgUrl = ref('/images/smartFarm/banner.png'); -const srcList = ref(['https://fuss10.elemecdn.com/a/3f/3302e58f9a181d2509f3dc0fa68b0jpeg.jpeg']); +const srcList = ref([getAssetsFile('images/mockPic/水质检测.png')]); const devices = ref([ { name: 'A-001', @@ -182,7 +182,7 @@ const chooseIcon = (type) => {
- 详情123 +
+ + + +
-