From babb302db59591137209598c5bd12135a5ba9cb4 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 09:52:46 +0800
Subject: [PATCH] 农场页面可以添加全景地址、全景管理页面添加农场显示
---
src/views/farmplant/inventorylist.vue | 1 -
src/views/farm/farm.vue | 16 +++++++++++++---
src/api/panorama/panorama.js | 16 ++++++++++++++--
src/views/panorama/panorama.vue | 18 +++++++++++++++++-
4 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/src/api/panorama/panorama.js b/src/api/panorama/panorama.js
index 54808f4..888e9f6 100644
--- a/src/api/panorama/panorama.js
+++ b/src/api/panorama/panorama.js
@@ -12,6 +12,18 @@
})
}
+export const getPage = (current, size, params) => {
+ return request({
+ url: '/api/panorama/panorama/page',
+ method: 'get',
+ params: {
+ ...params,
+ current,
+ size,
+ }
+ })
+}
+
export const getDetail = (id) => {
return request({
url: '/api/panorama/panorama/detail',
@@ -34,7 +46,7 @@
export const add = (row) => {
return request({
- url: '/api/panorama/panorama/submit',
+ url: '/api/panorama/panorama/save',
method: 'post',
data: row
})
@@ -42,7 +54,7 @@
export const update = (row) => {
return request({
- url: '/api/panorama/panorama/submit',
+ url: '/api/panorama/panorama/update',
method: 'post',
data: row
})
diff --git a/src/views/farm/farm.vue b/src/views/farm/farm.vue
index 7a99278..5dd9d8a 100644
--- a/src/views/farm/farm.vue
+++ b/src/views/farm/farm.vue
@@ -18,6 +18,7 @@
@row-del="rowDel"
@selection-change="selectionChange"
@refresh-change="refreshChange"
+ @change="change"
>
<template slot="menuLeft">
<el-button
@@ -115,7 +116,7 @@
required: true,
message: "请选择省份",
trigger: "blur"
- }]
+ }],
},
{
label: '地市',
@@ -153,9 +154,8 @@
trigger: "blur"
}],
labelWidth: 145,
- overHidden:true
+ overHidden:true,
},
-
{
label: "农场面积",
prop: "farmArea",
@@ -177,6 +177,16 @@
}],
},
{
+ label:"360全景地址",
+ prop:"panoramic",
+ labelWidth:145,
+ rules:[{
+ required:false,
+ message:"请输入地址",
+ trigger:"blur"
+ }]
+ },
+ {
label: "介绍",
prop: "introduce",
type:"textarea",
diff --git a/src/views/farmplant/inventorylist.vue b/src/views/farmplant/inventorylist.vue
index fb7cc95..9f9b98e 100644
--- a/src/views/farmplant/inventorylist.vue
+++ b/src/views/farmplant/inventorylist.vue
@@ -83,7 +83,6 @@
initData(){
getInventoryPage(this.page.currentPage,this.page.pageSize).then((res)=>{
if(res.data.code == 200){
- console.log(res)
this.data = res.data.data.records
this.page.total = res.data.data.total
}
diff --git a/src/views/panorama/panorama.vue b/src/views/panorama/panorama.vue
index c8abe41..c3253b9 100644
--- a/src/views/panorama/panorama.vue
+++ b/src/views/panorama/panorama.vue
@@ -36,6 +36,7 @@
<script>
import {getList, getDetail, add, update, remove} from "@/api/panorama/panorama";
+ import {getPage} from "@/api/panorama/panorama";
import {mapGetters} from "vuex";
export default {
data() {
@@ -61,6 +62,21 @@
selection: true,
dialogClickModal: false,
column: [
+ {
+ label:"农场名",
+ prop:"farmId",
+ type:"select",
+ props:{
+ label:"farmName",
+ value:"id"
+ },
+ dicUrl: '/api/farm/getFarmList',
+ rules:[{
+ required:true,
+ message:"请输入",
+ trigger:"blur"
+ }],
+ },
{
label: "全景名称",
prop: "panoramaName",
@@ -259,7 +275,7 @@
},
onLoad(page, params = {}) {
this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ getPage(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
--
Gitblit v1.9.3