From 6703c12be9bb9262384701026fb1386bc0b060ea Mon Sep 17 00:00:00 2001 From: naxida <3039596343@qq.com> Date: Fri, 21 Jul 2023 09:15:52 +0800 Subject: [PATCH 1/2] 1 --- FlowerGully/package.json | 1 + FlowerGully/src/main.js | 5 ++ .../src/views/BasicInformation/Variety.vue | 4 +- .../compoents/BaseAddition.vue | 14 ++- .../compoents/GreenhouseAdd.vue | 17 +++- FlowerGully/src/views/DataPreview/ParkVR.vue | 76 ++++++++-------- .../src/views/DataPreview/PriceIndex.vue | 15 +++- server/db.js | 6 +- server/sqlMap.js | 86 +++++++++---------- 9 files changed, 129 insertions(+), 95 deletions(-) diff --git a/FlowerGully/package.json b/FlowerGully/package.json index ab62f4d..061a138 100644 --- a/FlowerGully/package.json +++ b/FlowerGully/package.json @@ -23,6 +23,7 @@ "nprogress": "0.2.0", "path-to-regexp": "2.4.0", "vue": "2.6.10", + "vue-baidu-map": "^0.21.22", "vue-router": "3.0.6", "vuex": "3.1.0" }, diff --git a/FlowerGully/src/main.js b/FlowerGully/src/main.js index 6111b9b..de3ce42 100644 --- a/FlowerGully/src/main.js +++ b/FlowerGully/src/main.js @@ -9,6 +9,7 @@ import '@/styles/index.scss' // global css import App from './App' import store from './store' import router from './router' +import BaiduMap from 'vue-baidu-map' import '@/icons' // icon import '@/permission' // permission control @@ -27,6 +28,10 @@ axios.defaults.baseURL = 'http://localhost:3000/api/'; Vue.use(ElementUI) Vue.config.productionTip = false +Vue.use(BaiduMap, { + // ak 是在百度地图开发者平台申请的密钥 详见 http://lbsyun.baidu.com/apiconsole/key */ + ak: 'apKWrd8UhmG4WNy4oX3GpoZlg3Fg7sRr' +}) new Vue({ el: '#app', diff --git a/FlowerGully/src/views/BasicInformation/Variety.vue b/FlowerGully/src/views/BasicInformation/Variety.vue index 90dd97e..4320e56 100644 --- a/FlowerGully/src/views/BasicInformation/Variety.vue +++ b/FlowerGully/src/views/BasicInformation/Variety.vue @@ -61,12 +61,12 @@ 品种名称

品种图片

- - + --> 取 消 确 定 diff --git a/FlowerGully/src/views/BasicInformation/compoents/BaseAddition.vue b/FlowerGully/src/views/BasicInformation/compoents/BaseAddition.vue index 8e71d29..4ac3b9d 100644 --- a/FlowerGully/src/views/BasicInformation/compoents/BaseAddition.vue +++ b/FlowerGully/src/views/BasicInformation/compoents/BaseAddition.vue @@ -6,9 +6,8 @@ -
- -
+ +
@@ -59,6 +58,10 @@ export default { props: ['showDialog', 'message'], data() { return { + // 定位位置 + center: { lng: 114.228026, lat: 27.527942 }, + // 地图放大等级 + zoom: 12, ruleForm: { id: null, //大棚id baseName: '',//基地名字 @@ -215,4 +218,9 @@ export default { display: flex; justify-content: center; } + +// 去除百度地图的图标 根据实际情况看是否要加样式穿透(::v-deep) +::v-deep .anchorBL { + display: none !important; +} \ No newline at end of file diff --git a/FlowerGully/src/views/BasicInformation/compoents/GreenhouseAdd.vue b/FlowerGully/src/views/BasicInformation/compoents/GreenhouseAdd.vue index c833d40..1bf54f5 100644 --- a/FlowerGully/src/views/BasicInformation/compoents/GreenhouseAdd.vue +++ b/FlowerGully/src/views/BasicInformation/compoents/GreenhouseAdd.vue @@ -6,9 +6,8 @@ -
- -
+ +
@@ -54,11 +53,16 @@ @@ -216,6 +219,7 @@ export default { justify-content: space-between; padding-top: 50px; width: 100%; + z-index: 1; .right { width: 60%; diff --git a/FlowerGully/src/views/DataPreview/PriceIndex.vue b/FlowerGully/src/views/DataPreview/PriceIndex.vue index 424cf7b..e7a14c1 100644 --- a/FlowerGully/src/views/DataPreview/PriceIndex.vue +++ b/FlowerGully/src/views/DataPreview/PriceIndex.vue @@ -6,7 +6,7 @@ 产品  
PRODUCT
    -
  • +
  • {{ item }}
@@ -104,6 +104,7 @@ export default { data() { return { list: ['丝瓜', '伊丽莎白瓜', '低辣小椒', '佛手瓜', '儿瓜', '光皮黄瓜', '冬瓜', '冬笋', '凤尾菇', '南瓜', '哈密瓜', '圆茄子', '士豆', '大白菜', '大葱'], + lists: '丝瓜', tableData: [ { variety: "丝瓜", @@ -200,6 +201,12 @@ export default { } }, methods: { + // 取到 item + getitem(val) { + this.lists = val + console.log(this.shiftData.Output) + // 方法 + }, addbg() { console.log(this.row); }, @@ -573,7 +580,7 @@ export default { display: flex; justify-content: space-between; - :nth-child(1) { + .top-a-bg { background-image: url('~@/assets/allimg/归档/切图/价格指数/编组 2.png'); background-size: 100% 100%; } @@ -610,7 +617,7 @@ export default { border-bottom: 2px solid #263b67; background-image: url('~@/assets/allimg/归档/切图/价格指数/编组 9备份 6.png'); background-size: 770px 38px; - background-repeat:no-repeat ; + background-repeat: no-repeat; } .el-table::before { @@ -683,7 +690,7 @@ export default { border-bottom: 2px solid #263b67; background-image: url('~@/assets/allimg/归档/切图/价格指数/编组 9备份 12.png'); background-size: 1480px 38px; - background-repeat:no-repeat ; + background-repeat: no-repeat; } .button-echarts { diff --git a/server/db.js b/server/db.js index af9f526..6045005 100644 --- a/server/db.js +++ b/server/db.js @@ -6,10 +6,10 @@ module.exports = { mysql: { host: 'localhost', user: 'root', - password: 'ljf2002', + // password: 'ljf2002', // password: '123456', - // password: 'admin123', - database: 'Flower-in-gully', + password: 'admin123', + database: 'flower-gully', port: '3306' } } diff --git a/server/sqlMap.js b/server/sqlMap.js index a7586c8..9778477 100644 --- a/server/sqlMap.js +++ b/server/sqlMap.js @@ -2,72 +2,72 @@ //sqlMap.js——SQL 语句映射文件，供 API 调用 var sqlMap = { base: { - getbasename: 'SELECT * FROM `flower-in-gully`.base_management where baseName=?', + getbasename: 'SELECT * FROM `flower-gully`.base_management where baseName=?', getbase: 'SELECT * FROM base_management;', addbase: 'INSERT INTO base_management (`baseName`, `address`, `baseArea`, `numberGreenhouses`, `describe`, `creator`, `creationTime`, `facility`, `LongitudeLatitude`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);', - updatebase: 'UPDATE `flower-in-gully`.`base_management` SET `baseName` = ?, `address` = ?, `baseArea` = ?, `numberGreenhouses` = ?, `describe` = ?, `creator` = ?, `creationTime` = ?, `facility` = ?, `LongitudeLatitude` = ? WHERE (`id` = ?);', + updatebase: 'UPDATE `flower-gully`.`base_management` SET `baseName` = ?, `address` = ?, `baseArea` = ?, `numberGreenhouses` = ?, `describe` = ?, `creator` = ?, `creationTime` = ?, `facility` = ?, `LongitudeLatitude` = ? WHERE (`id` = ?);', delbase: 'DELETE FROM `base_management` WHERE (`id` = ?);' }, greenhouse: { - getgreenhousename: 'SELECT * FROM `flower-in-gully`.greenhouse_management where greenhousename=?', - getgreenhouse: 'SELECT * FROM `flower-in-gully`.greenhouse_management;', - addgreenhouse: 'INSERT INTO `flower-in-gully`.`greenhouse_management` (`greenhousename`, `greenhouseArea`, `PersonCharge`, `crop`, `greenhouseType`, `breed`, `facility`, `creationTime`, `LongitudeLatitude`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);', - updategreenhouse: 'UPDATE `flower-in-gully`.`greenhouse_management` SET `greenhousename` = ?, `greenhouseArea` = ?, `PersonCharge` = ?, `crop` = ?, `greenhouseType` = ?, `breed` = ?, `facility` = ?, `creationTime` = ?, `LongitudeLatitude` = ? WHERE (`id` = ?);', - delgreenhouse: 'DELETE FROM `flower-in-gully`.greenhouse_management WHERE (`id` = ?);', + getgreenhousename: 'SELECT * FROM `flower-gully`.greenhouse_management where greenhousename=?', + getgreenhouse: 'SELECT * FROM `flower-gully`.greenhouse_management;', + addgreenhouse: 'INSERT INTO `flower-gully`.`greenhouse_management` (`greenhousename`, `greenhouseArea`, `PersonCharge`, `crop`, `greenhouseType`, `breed`, `facility`, `creationTime`, `LongitudeLatitude`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?);', + updategreenhouse: 'UPDATE `flower-gully`.`greenhouse_management` SET `greenhousename` = ?, `greenhouseArea` = ?, `PersonCharge` = ?, `crop` = ?, `greenhouseType` = ?, `breed` = ?, `facility` = ?, `creationTime` = ?, `LongitudeLatitude` = ? WHERE (`id` = ?);', + delgreenhouse: 'DELETE FROM `flower-gully`.greenhouse_management WHERE (`id` = ?);', //人员管理信息获取 - getpersonnel: 'SELECT * FROM `flower-in-gully`.personnel_management;', + getpersonnel: 'SELECT * FROM `flower-gully`.personnel_management;', }, farm: { - getgreenhouseame: 'SELECT * FROM `flower-in-gully`.farm_record where greenhouse=?', - getfarm: 'SELECT * FROM `flower-in-gully`.farm_record;', - delfarm: 'DELETE FROM `flower-in-gully`.`farm_record` WHERE (`id` = ?);', - addfarm: 'INSERT INTO `flower-in-gully`.`farm_record` (`greenhouse`, `lot`, `record`, `record_pic`, `recorder`, `input`, `input_quantity`, `record_time`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', + getgreenhouseame: 'SELECT * FROM `flower-gully`.farm_record where greenhouse=?', + getfarm: 'SELECT * FROM `flower-gully`.farm_record;', + delfarm: 'DELETE FROM `flower-gully`.`farm_record` WHERE (`id` = ?);', + addfarm: 'INSERT INTO `flower-gully`.`farm_record` (`greenhouse`, `lot`, `record`, `record_pic`, `recorder`, `input`, `input_quantity`, `record_time`) VALUES (?, ?, ?, ?, ?, ?, ?, ?)', }, input: { - getinput: 'SELECT * FROM `flower-in-gully`.input_management;', - addinput: 'INSERT INTO `flower-in-gully`.`input_management` (`input`, `input_pic`, `input_manufacturers`, `founder`, `foundtime`) VALUES (?, ?, ?, ?, ?);', - updateinput: 'UPDATE `flower-in-gully`.`input_management` SET `input` = ?, `input_pic` = ?, `input_manufacturers` = ?, `founder` = ?, `foundtime` = ? WHERE (`id` = ?);', - delinput: 'DELETE FROM `flower-in-gully`.`input_management` WHERE (`id` = ?);' + getinput: 'SELECT * FROM `flower-gully`.input_management;', + addinput: 'INSERT INTO `flower-gully`.`input_management` (`input`, `input_pic`, `input_manufacturers`, `founder`, `foundtime`) VALUES (?, ?, ?, ?, ?);', + updateinput: 'UPDATE `flower-gully`.`input_management` SET `input` = ?, `input_pic` = ?, `input_manufacturers` = ?, `founder` = ?, `foundtime` = ? WHERE (`id` = ?);', + delinput: 'DELETE FROM `flower-gully`.`input_management` WHERE (`id` = ?);' }, batch: { - getbatch: 'SELECT * FROM `flower-in-gully`.batch_management;', - addbatch: 'INSERT INTO `flower-in-gully`.`batch_management` (`base`, `greenhouse_name`, `grow_crops`, `planted_variety`, `planting_batch`, `planting_time`, `receiving_time`) VALUES (?, ?, ?, ?, ?, ?, ?);', - updatebatch: 'UPDATE `flower-in-gully`.`batch_management` SET `base` = ?, `greenhouse_name` = ?, `grow_crops` = ?, `planted_variety` = ?, `planting_batch` = ?, `planting_time` = ?, `receiving_time` = ? WHERE (`id` = ?);', - delbatch: 'DELETE FROM `flower-in-gully`.`batch_management` WHERE (`id` = ?);', + getbatch: 'SELECT * FROM `flower-gully`.batch_management;', + addbatch: 'INSERT INTO `flower-gully`.`batch_management` (`base`, `greenhouse_name`, `grow_crops`, `planted_variety`, `planting_batch`, `planting_time`, `receiving_time`) VALUES (?, ?, ?, ?, ?, ?, ?);', + updatebatch: 'UPDATE `flower-gully`.`batch_management` SET `base` = ?, `greenhouse_name` = ?, `grow_crops` = ?, `planted_variety` = ?, `planting_batch` = ?, `planting_time` = ?, `receiving_time` = ? WHERE (`id` = ?);', + delbatch: 'DELETE FROM `flower-gully`.`batch_management` WHERE (`id` = ?);', }, crop: { //大品类 - getcropname: 'SELECT * FROM `flower-in-gully`.crop where cropname=?', - getbcrop: 'SELECT * FROM `flower-in-gully`.crop;', - addbcrop: 'INSERT INTO `flower-in-gully`.`crop` (`cropname`) VALUES (?);', - delbcrop: 'DELETE FROM `flower-in-gully`.`crop` WHERE (`id` = ?);', - updatebcrop: 'UPDATE `flower-in-gully`.`crop` SET `cropname` = ? WHERE (`id` = ?);', + getcropname: 'SELECT * FROM `flower-gully`.crop where cropname=?', + getbcrop: 'SELECT * FROM `flower-gully`.crop;', + addbcrop: 'INSERT INTO `flower-gully`.`crop` (`cropname`) VALUES (?);', + delbcrop: 'DELETE FROM `flower-gully`.`crop` WHERE (`id` = ?);', + updatebcrop: 'UPDATE `flower-gully`.`crop` SET `cropname` = ? WHERE (`id` = ?);', //子品类 - getbreed: 'SELECT * FROM `flower-in-gully`.crop_variety where breed=?', - getcrop: 'SELECT * FROM `flower-in-gully`.crop_variety;', - addcrop: 'INSERT INTO `flower-in-gully`.`crop_variety` (`cid`, `breed`, `c_pic`) VALUES (?, ?, ?);', - delcrop: 'DELETE FROM `flower-in-gully`.`crop_variety` WHERE (`id` = ?);', - updatecrop: 'UPDATE `flower-in-gully`.`crop_variety` SET `cid` = ?, `breed` = ?, `c_pic` = ? WHERE (`id` = ?);', + getbreed: 'SELECT * FROM `flower-gully`.crop_variety where breed=?', + getcrop: 'SELECT * FROM `flower-gully`.crop_variety;', + addcrop: 'INSERT INTO `flower-gully`.`crop_variety` (`cid`, `breed`, `c_pic`) VALUES (?, ?, ?);', + delcrop: 'DELETE FROM `flower-gully`.`crop_variety` WHERE (`id` = ?);', + updatecrop: 'UPDATE `flower-gully`.`crop_variety` SET `cid` = ?, `breed` = ?, `c_pic` = ? WHERE (`id` = ?);', //当大类删除是其小类也删除 - delcropall: 'DELETE FROM `flower-in-gully`.`crop_variety` WHERE (`cid` = ?);' + delcropall: 'DELETE FROM `flower-gully`.`crop_variety` WHERE (`cid` = ?);' }, code: { - getcode: 'SELECT * FROM `flower-in-gully`.create_code;', - delcode: 'DELETE FROM `flower-in-gully`.`create_code` WHERE (`id` = ?);', + getcode: 'SELECT * FROM `flower-gully`.create_code;', + delcode: 'DELETE FROM `flower-gully`.`create_code` WHERE (`id` = ?);', }, insp: { - getinsp_batch: ' SELECT * FROM `flower-in-gully`.inspect_management where insp_batch=?', - getinsp: 'SELECT * FROM `flower-in-gully`.inspect_management;', - addinsp: 'INSERT INTO `flower-in-gully`.`inspect_management` (`insp_batch`, `insp_person`, `insp_organization`, `insp_licence`, `insp_result`, `insp_pic`, `insp_time`) VALUES (?, ?, ?, ?, ?, ?, ?);', - updateinsp: 'UPDATE `flower-in-gully`.`inspect_management` SET `insp_batch` = ?, `insp_person` = ?, `insp_organization` = ?, `insp_licence` = ?, `insp_result` = ?, `insp_pic` = ?, `insp_time` = ? WHERE (`id` = ?);', - delinsp: 'DELETE FROM `flower-in-gully`.`inspect_management` WHERE (`id` = ?);', + getinsp_batch: ' SELECT * FROM `flower-gully`.inspect_management where insp_batch=?', + getinsp: 'SELECT * FROM `flower-gully`.inspect_management;', + addinsp: 'INSERT INTO `flower-gully`.`inspect_management` (`insp_batch`, `insp_person`, `insp_organization`, `insp_licence`, `insp_result`, `insp_pic`, `insp_time`) VALUES (?, ?, ?, ?, ?, ?, ?);', + updateinsp: 'UPDATE `flower-gully`.`inspect_management` SET `insp_batch` = ?, `insp_person` = ?, `insp_organization` = ?, `insp_licence` = ?, `insp_result` = ?, `insp_pic` = ?, `insp_time` = ? WHERE (`id` = ?);', + delinsp: 'DELETE FROM `flower-gully`.`inspect_management` WHERE (`id` = ?);', }, sell: { - getbatch_number: 'SELECT * FROM `flower-in-gully`.sell_management where batch_number=?', - getsell: 'SELECT * FROM `flower-in-gully`.sell_management;', - addsell: 'INSERT INTO `flower-in-gully`.`sell_management` (`batch_number`, `sell_name`, `sell_phone`, `sell_address`, `sell_amount`, `sale_money`, `stash_name`, `shipment_time`) VALUES (?, ?, ?, ?, ?, ?, ?, ?);', - updatesell: 'UPDATE `flower-in-gully`.`sell_management` SET `batch_number` = ?, `sell_name` = ?, `sell_phone` = ?, `sell_address` = ?, `sell_amount` = ?, `sale_money` = ?, `stash_name` = ?, `shipment_time` = ? WHERE (`id` = ?);', - delsell: 'DELETE FROM `flower-in-gully`.`sell_management` WHERE (`id` = ?);', + getbatch_number: 'SELECT * FROM `flower-gully`.sell_management where batch_number=?', + getsell: 'SELECT * FROM `flower-gully`.sell_management;', + addsell: 'INSERT INTO `flower-gully`.`sell_management` (`batch_number`, `sell_name`, `sell_phone`, `sell_address`, `sell_amount`, `sale_money`, `stash_name`, `shipment_time`) VALUES (?, ?, ?, ?, ?, ?, ?, ?);', + updatesell: 'UPDATE `flower-gully`.`sell_management` SET `batch_number` = ?, `sell_name` = ?, `sell_phone` = ?, `sell_address` = ?, `sell_amount` = ?, `sale_money` = ?, `stash_name` = ?, `shipment_time` = ? WHERE (`id` = ?);', + delsell: 'DELETE FROM `flower-gully`.`sell_management` WHERE (`id` = ?);', } } module.exports = sqlMap -- Gitee From 8f1e5aa0fea0e41801ee8765b0a9c8bc0331c0e3 Mon Sep 17 00:00:00 2001 From: naxida <3039596343@qq.com> Date: Fri, 21 Jul 2023 17:04:30 +0800 Subject: [PATCH 2/2] 1 --- FlowerGully/src/App.vue | 3 + .../src/views/DataPreview/PriceIndex.vue | 42 ++--- .../src/views/Equipment/InternetOfThings.vue | 43 ++++- .../src/views/Equipment/VideoMonitoring.vue | 9 +- .../views/Equipment/components/interone.vue | 157 +++++++++++++++++ .../views/Equipment/components/intertwo.vue | 164 ++++++++++++++++++ 6 files changed, 385 insertions(+), 33 deletions(-) create mode 100644 FlowerGully/src/views/Equipment/components/interone.vue create mode 100644 FlowerGully/src/views/Equipment/components/intertwo.vue diff --git a/FlowerGully/src/App.vue b/FlowerGully/src/App.vue index ec9032c..f668ec6 100644 --- a/FlowerGully/src/App.vue +++ b/FlowerGully/src/App.vue @@ -9,3 +9,6 @@ export default { name: 'App' } + + \ No newline at end of file diff --git a/FlowerGully/src/views/DataPreview/PriceIndex.vue b/FlowerGully/src/views/DataPreview/PriceIndex.vue index e7a14c1..61b40b7 100644 --- a/FlowerGully/src/views/DataPreview/PriceIndex.vue +++ b/FlowerGully/src/views/DataPreview/PriceIndex.vue @@ -105,6 +105,7 @@ export default { return { list: ['丝瓜', '伊丽莎白瓜', '低辣小椒', '佛手瓜', '儿瓜', '光皮黄瓜', '冬瓜', '冬笋', '凤尾菇', '南瓜', '哈密瓜', '圆茄子', '士豆', '大白菜', '大葱'], lists: '丝瓜', + // 主要农产品批发市场价格行情 tableData: [ { variety: "丝瓜", @@ -147,8 +148,9 @@ export default { date: "2002-08-11", }, ], + // 丝瓜价格指数变化趋势(day,week,month 赋值给 shiftData 开始默认为 day) day: { - Output: [0, 20, 30, 50, 100, 50, 120, 150, 170, 200], + price: [0, 20, 30, 50, 100, 50, 120, 150, 170, 200], date: [ "7-1", "7-2", @@ -163,11 +165,11 @@ export default { ], }, week: { - Output: [10, 220, 50, 200], + price: [10, 220, 50, 200], date: ["第一周", "第二周", "第三周", "第四周"], }, month: { - Output: [0, 28, 15, 27, 28, 47, 60, 120, 170, 200], + price: [0, 28, 15, 27, 28, 47, 60, 120, 170, 200], date: [ "1月", "2月", @@ -181,8 +183,9 @@ export default { "10月", ], }, + // 丝瓜价格指数变化趋势 shiftData: { - Output: [0, 20, 30, 50, 100, 50, 120, 150, 170, 200], + price: [0, 20, 30, 50, 100, 50, 120, 150, 170, 200], date: [ "7-1", "7-2", @@ -196,6 +199,11 @@ export default { "7-10", ], }, + // 2022年各省市综合价格分布趋势 + formData: { + price: [100, 230, 120, 60, 156, 260, 148, 300, 20, 70, 166, 126, 238, 88, 186, 58], + citys: ["呼伦贝尔市", "澳门半岛", "海南藏族自治州", "天明市", "三明市", "江西省", "大兴安岭地区", "柳州市", "乌兰察布市", "甘孜藏族自治州", "中卫市", "延边朝鲜族自治州", "那曲地区", "池州市", "文昌市"], + }, qie: 0, qiehuan: ["日", "周", "月"], } @@ -204,12 +212,12 @@ export default { // 取到 item getitem(val) { this.lists = val - console.log(this.shiftData.Output) // 方法 }, addbg() { console.log(this.row); }, + // 丝瓜价格指数变化趋势更换月周日(并将值赋给 shiftData) qieH(i) { if (i == 0) { this.shiftData = this.day; @@ -284,7 +292,7 @@ export default { { showSymbol: false, symbolSize: 10, - data: this.shiftData.Output, + data: this.shiftData.price, type: "line", areaStyle: { normal: { @@ -370,23 +378,7 @@ export default { }, xAxis: { type: "category", - data: [ - "呼伦贝尔市", - "澳门半岛", - "海南藏族自治州", - "天明市", - "三明市", - "江西省", - "大兴安岭地区", - "柳州市", - "乌兰察布市", - "甘孜藏族自治州", - "中卫市", - "延边朝鲜族自治州", - "那曲地区", - "池州市", - "文昌市" - ], + data: this.formData.citys, axisLine: { show: true, //隐藏X轴轴线 lineStyle: { @@ -501,7 +493,7 @@ export default { areaStyle: { color: "rgba(5,140,255, 0.2)", }, - data: [100, 230, 120, 60, 156, 260, 148, 300, 20, 70, 166, 126, 238, 88, 186, 58], + data: this.formData.price, }, { // name: "主营业务", @@ -521,7 +513,7 @@ export default { ]), }, }, - data: [100, 230, 120, 60, 156, 260, 148, 300, 20, 70, 166, 126, 238, 88, 186, 58], + data: this.formData.price, }, ], }) diff --git a/FlowerGully/src/views/Equipment/InternetOfThings.vue b/FlowerGully/src/views/Equipment/InternetOfThings.vue index 9326a8e..2fe86f8 100644 --- a/FlowerGully/src/views/Equipment/InternetOfThings.vue +++ b/FlowerGully/src/views/Equipment/InternetOfThings.vue @@ -1,14 +1,49 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/FlowerGully/src/views/Equipment/VideoMonitoring.vue b/FlowerGully/src/views/Equipment/VideoMonitoring.vue index 75ffa69..8ec8906 100644 --- a/FlowerGully/src/views/Equipment/VideoMonitoring.vue +++ b/FlowerGully/src/views/Equipment/VideoMonitoring.vue @@ -32,7 +32,7 @@ - +