From 7eec3bb82988d4b5e30f444b5e83d4c388eefc80 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 28 Nov 2023 11:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=BE=E7=89=87=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/views/land/edit.vue                 |  9 +++-
 admin/src/views/land/index.vue                | 48 +++++++++++++++++--
 admin/src/views/land_plant/edit.vue           |  7 ++-
 admin/src/views/land_plant/index.vue          |  8 ++--
 admin/src/views/land_plant_action/index.vue   |  8 ++--
 .../views/organization/department/index.vue   |  2 +-
 admin/src/views/organization/post/index.vue   |  2 +-
 admin/src/views/product/index.vue             |  8 ++--
 app/adminapi/lists/land/LandLists.php         |  2 +-
 app/adminapi/logic/land/LandLogic.php         |  2 +
 app/adminapi/validate/land/LandValidate.php   |  1 +
 11 files changed, 74 insertions(+), 23 deletions(-)

diff --git a/admin/src/views/land/edit.vue b/admin/src/views/land/edit.vue
index 58c5d59e..5246023c 100644
--- a/admin/src/views/land/edit.vue
+++ b/admin/src/views/land/edit.vue
@@ -83,6 +83,9 @@
 </el-form-item>
                 <el-form-item label="负责人电话" prop="master_phone">
     <el-input v-model="formData.master_phone" clearable placeholder="请输入负责人电话" />
+</el-form-item>
+                <el-form-item label="土地图片" prop="pic">
+    <material-picker v-model="formData.pic" :limit="4" />
 </el-form-item>
             </el-form>
         </popup>
@@ -134,6 +137,7 @@ const formData = reactive({
     latitude: '',
     master_name: '',
     master_phone: '',
+    pic: ''
 })
 
 // 表单验证
@@ -167,10 +171,11 @@ const setFormData = async (data: Record<any, any>) => {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
             formData[key] = data[key]
+            if (key == 'pic') {
+                formData[key] = ''
+            }
         }
     }
-    
-    
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/admin/src/views/land/index.vue b/admin/src/views/land/index.vue
index b1743d98..06b0cfca 100644
--- a/admin/src/views/land/index.vue
+++ b/admin/src/views/land/index.vue
@@ -45,16 +45,20 @@
                     <el-table-column label="ID" prop="id" width="80" show-overflow-tooltip />
                     <el-table-column label="用户信息" width="200">
                         <template #default="{ row }">
-                            <el-tag class="ml-2" type="success">ID: {{ row.user_id }}</el-tag>
-                            <el-tag class="ml-2" type="success">账户: {{ row.user.account }}</el-tag>
+                            <el-tag class="mr-2" type="success">ID: {{ row.user_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">账户: {{ row.user.account }}</el-tag>
                         </template>
                     </el-table-column> 
-                    <el-table-column label="土地名称" prop="title" show-overflow-tooltip />
+                    <el-table-column label="土地名称">
+                        <template #default="{ row }">
+                            <el-tag class="mr-2" type="success">{{ row.title }}</el-tag>
+                        </template>
+                    </el-table-column>
                     <el-table-column label="土地面积" prop="total_area" show-overflow-tooltip />
                     <el-table-column label="剩余面积" prop="residual_area" show-overflow-tooltip />
                     <el-table-column label="土地负责人" prop="master_name" show-overflow-tooltip />
                     <el-table-column label="负责人电话" prop="master_phone" show-overflow-tooltip />
-                    <el-table-column label="操作" width="280" align="center" fixed="right">
+                    <el-table-column label="操作" width="350" align="center" fixed="right">
                         <template #default="{ row }">
                             <el-button
                                 v-perms="['land.land/edit']"
@@ -64,6 +68,10 @@
                             >
                                 编辑
                             </el-button>
+                            <el-button type="primary" link @click="handleDetail(row)"
+                            >
+                                土地图片
+                            </el-button>
                             <el-button
                                 v-perms="['land.land_plant/lists']"
                                 type="primary"
@@ -114,6 +122,22 @@
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
     </div>
+
+    <el-dialog v-model="dialogPicVisible" title="土地图片" center>
+        <div style="display: inline-block; margin: 12px" v-for="img in detailData.picData" :key="img">
+            <el-image
+                style="width: 200px; height: 200px"
+                :src="img"
+                :zoom-rate="1.2"
+                :max-scale="5"
+                :min-scale="0.2"
+                :preview-src-list="detailData.picData"
+                :initial-index="4"
+                fit="cover"
+                center
+            />
+        </div>
+    </el-dialog>
 </template>
 
 <script lang="ts" setup name="landLists">
@@ -160,6 +184,22 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
+const dialogPicVisible = ref(false)
+const detailData = reactive({
+    picData: [] as any[]
+})
+
+// 详情
+const handleDetail = (data: any) => {
+    detailData.picData = []
+    const picList = JSON.parse(data.pic)
+    for (const key in picList) {
+        detailData.picData.unshift(picList[key])
+    }
+    console.log(detailData.picData)
+    dialogPicVisible.value = true
+}
+
 // 添加
 const handleAdd = async () => {
     showEdit.value = true
diff --git a/admin/src/views/land_plant/edit.vue b/admin/src/views/land_plant/edit.vue
index 7d57d2f1..03ef3b27 100644
--- a/admin/src/views/land_plant/edit.vue
+++ b/admin/src/views/land_plant/edit.vue
@@ -72,7 +72,7 @@
     </el-select>
 </el-form-item>
                 <el-form-item label="种植图片" prop="pic">
-    <material-picker :limit="4" />
+    <material-picker v-model="formData.pic" :limit="4" />
 </el-form-item>
                 <el-form-item label="播种时间" prop="plant_date">
     <el-date-picker 
@@ -126,7 +126,7 @@ const formData = reactive({
     status: '',
     pic: '',
     qr_code: '',
-    plant_date: '',
+    plant_date: ''
 })
 
 
@@ -176,6 +176,9 @@ const setFormData = async (data: Record<any, any>) => {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
             formData[key] = data[key]
+            if (key == 'pic') {
+                formData[key] = ''
+            }
         }
     }
     
diff --git a/admin/src/views/land_plant/index.vue b/admin/src/views/land_plant/index.vue
index 9eb893f0..50d4d90d 100644
--- a/admin/src/views/land_plant/index.vue
+++ b/admin/src/views/land_plant/index.vue
@@ -52,14 +52,14 @@
                     <el-table-column label="ID" prop="id" width="80" show-overflow-tooltip />
                     <el-table-column label="用户信息" width="200">
                         <template #default="{ row }">
-                            <el-tag class="ml-2" type="success">ID: {{ row.user_id }}</el-tag>
-                            <el-tag class="ml-2" type="success">账户: {{ row.account }}</el-tag>
+                            <el-tag class="mr-2" type="success">ID: {{ row.user_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">账户: {{ row.account }}</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="土地信息" width="200">
                         <template #default="{ row }">
-                            <el-tag class="ml-2" type="success">ID: {{ row.land_id }}</el-tag>
-                            <el-tag class="ml-2" type="success">名称: {{ row.title }}</el-tag>
+                            <el-tag class="mr-2" type="success">ID: {{ row.land_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">名称: {{ row.title }}</el-tag>
                         </template>
                     </el-table-column> 
                     <el-table-column label="种植种类" prop="kind" show-overflow-tooltip />
diff --git a/admin/src/views/land_plant_action/index.vue b/admin/src/views/land_plant_action/index.vue
index c22586ee..c216cc8f 100644
--- a/admin/src/views/land_plant_action/index.vue
+++ b/admin/src/views/land_plant_action/index.vue
@@ -42,14 +42,14 @@
                     <el-table-column label="ID" prop="id" width="80" show-overflow-tooltip />
                     <el-table-column label="用户信息" width="200">
                         <template #default="{ row }">
-                            <el-tag class="ml-2" type="success">ID: {{ row.user_id }}</el-tag>
-                            <el-tag class="ml-2" type="success">账户: {{ row.account }}</el-tag>
+                            <el-tag class="mr-2" type="success">ID: {{ row.user_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">账户: {{ row.account }}</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="土地种植信息" width="200">
                         <template #default="{ row }">
-                            <el-tag class="ml-2" type="success">ID: {{ row.plant_id }}</el-tag>
-                            <el-tag class="ml-2" type="success">类型: {{ row.kind }} 品牌: {{ row.breed }}</el-tag>
+                            <el-tag class="mr-2" type="success">ID: {{ row.plant_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">类型: {{ row.kind }} 品牌: {{ row.breed }}</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="种植操作类型" prop="type">
diff --git a/admin/src/views/organization/department/index.vue b/admin/src/views/organization/department/index.vue
index 90ed27ef..dbe6b53b 100644
--- a/admin/src/views/organization/department/index.vue
+++ b/admin/src/views/organization/department/index.vue
@@ -50,7 +50,7 @@
                 />
                 <el-table-column label="部门状态" prop="status" min-width="100">
                     <template #default="{ row }">
-                        <el-tag class="ml-2" :type="row.status ? '' : 'danger'">{{
+                        <el-tag class="mr-2" :type="row.status ? '' : 'danger'">{{
                             row.status_desc
                         }}</el-tag>
                     </template>
diff --git a/admin/src/views/organization/post/index.vue b/admin/src/views/organization/post/index.vue
index 739f7a77..e214cfe5 100644
--- a/admin/src/views/organization/post/index.vue
+++ b/admin/src/views/organization/post/index.vue
@@ -54,7 +54,7 @@
                 <el-table-column label="添加时间" prop="create_time" min-width="180" />
                 <el-table-column label="状态" prop="status" min-width="100">
                     <template #default="{ row }">
-                        <el-tag class="ml-2" :type="row.status ? '' : 'danger'">
+                        <el-tag class="mr-2" :type="row.status ? '' : 'danger'">
                             {{ row.status_desc }}
                         </el-tag>
                     </template>
diff --git a/admin/src/views/product/index.vue b/admin/src/views/product/index.vue
index f0e97261..162aa43c 100644
--- a/admin/src/views/product/index.vue
+++ b/admin/src/views/product/index.vue
@@ -62,14 +62,14 @@
                     <el-table-column label="ID" prop="id" width="80" show-overflow-tooltip />
                     <el-table-column label="用户信息" width="200">
                         <template #default="{ row }">
-                            <el-tag class="ml-2" type="success">ID: {{ row.user_id }}</el-tag>
-                            <el-tag class="ml-2" type="success">账户: {{ row.account }}</el-tag>
+                            <el-tag class="mr-2" type="success">ID: {{ row.user_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">账户: {{ row.account }}</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="土地信息" width="200">
                         <template #default="{ row }">
-                            <el-tag class="ml-2" type="success">ID: {{ row.land_id }}</el-tag>
-                            <el-tag class="ml-2" type="success">名称: {{ row.title }}</el-tag>
+                            <el-tag class="mr-2" type="success">ID: {{ row.land_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">名称: {{ row.title }}</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="产品编号" prop="code" show-overflow-tooltip />
diff --git a/app/adminapi/lists/land/LandLists.php b/app/adminapi/lists/land/LandLists.php
index b21d591f..147f3718 100644
--- a/app/adminapi/lists/land/LandLists.php
+++ b/app/adminapi/lists/land/LandLists.php
@@ -69,7 +69,7 @@ class LandLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         return Land::where($this->searchWhere)->where($this->userSearch())->with('user')
-            ->field(['id', 'user_id', 'title', 'total_area', 'residual_area', 'province_code', 'province_name', 'city_code', 'city_name', 'county_code', 'county_name', 'town_code', 'town_name', 'village_code', 'village_name', 'group_code', 'group_name', 'longitude', 'latitude', 'master_name', 'master_phone'])
+            ->field(['id', 'user_id', 'title', 'total_area', 'residual_area', 'province_code', 'province_name', 'city_code', 'city_name', 'county_code', 'county_name', 'town_code', 'town_name', 'village_code', 'village_name', 'group_code', 'group_name', 'longitude', 'latitude', 'master_name', 'master_phone', 'pic'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
diff --git a/app/adminapi/logic/land/LandLogic.php b/app/adminapi/logic/land/LandLogic.php
index eb3df8ae..e9a60b4d 100644
--- a/app/adminapi/logic/land/LandLogic.php
+++ b/app/adminapi/logic/land/LandLogic.php
@@ -61,6 +61,7 @@ class LandLogic extends BaseLogic
                 'latitude' => $params['latitude'],
                 'master_name' => $params['master_name'],
                 'master_phone' => $params['master_phone'],
+                'pic' => json_encode($params['pic']),
             ]);
 
             Db::commit();
@@ -105,6 +106,7 @@ class LandLogic extends BaseLogic
                 'latitude' => $params['latitude'],
                 'master_name' => $params['master_name'],
                 'master_phone' => $params['master_phone'],
+                'pic' => json_encode($params['pic']),
             ]);
 
             Db::commit();
diff --git a/app/adminapi/validate/land/LandValidate.php b/app/adminapi/validate/land/LandValidate.php
index 02bdaab3..fe3e1e07 100644
--- a/app/adminapi/validate/land/LandValidate.php
+++ b/app/adminapi/validate/land/LandValidate.php
@@ -82,6 +82,7 @@ class LandValidate extends BaseValidate
         'master_name' => '土地负责人',
         'master_phone' => '负责人电话',
         'status' => '土地状态1-未种植 2-部分种植 3-全部种植',
+        'pic' => '土地图片',
     ];