更新后台管理系统细节

admin/src/api/device.ts

@@ -1,5 +1,15 @@
 import request from '@/utils/request'
 
+// 用户列表
+export function getUserList(params: any) {
+    return request.get({ url: '/user.user/lists', params }, { ignoreCancelToken: true })
+}
+
+// 产品列表列表
+export function apiProductLists(params: any) {
+    return request.get({ url: '/land.product/lists', params })
+}
+
 // 监测设备列表
 export function apiDeviceLists(params: any) {
     return request.get({ url: '/device.device/lists', params })

admin/src/views/device/edit.vue

@@ -9,6 +9,42 @@
             @close="handleClose"
         >
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="用户ID" prop="user_id">
+    <el-select
+        v-model="formData.user_id"
+        filterable
+        remote
+        reserve-keyword
+        placeholder="请输入用户信息"
+        :remote-method="queryUser"
+        :loading="loading"
+      >
+        <el-option
+          v-for="item in userOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+</el-form-item>
+<el-form-item label="产品ID" prop="product_id">
+    <el-select
+        v-model="formData.product_id"
+        filterable
+        remote
+        reserve-keyword
+        placeholder="请输入产品信息"
+        :remote-method="queryProduct"
+        :loading="loading"
+      >
+        <el-option
+          v-for="item in productOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+</el-form-item>
                 <el-form-item label="设备编码" prop="code">
     <el-input v-model="formData.code" clearable placeholder="请输入设备编码" />
 </el-form-item>
@@ -63,7 +99,7 @@
 <script lang="ts" setup name="deviceEdit">
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
-import { apiDeviceAdd, apiDeviceEdit, apiDeviceDetail } from '@/api/device'
+import { apiDeviceAdd, apiDeviceEdit, apiDeviceDetail, getUserList, apiProductLists} from '@/api/device'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
@@ -86,6 +122,8 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
+    user_id: '',
+    product_id: '',
     code: '',
     name: '',
     type: '',
@@ -97,6 +135,16 @@ const formData = reactive({
 
 // 表单验证
 const formRules = reactive<any>({
+    user_id: [{
+        required: true,
+        message: '请输入用户ID',
+        trigger: ['blur']
+    }],
+    product_id: [{
+        required: true,
+        message: '请输入产品id',
+        trigger: ['blur']
+    }],
     code: [{
         required: true,
         message: '请输入设备编码',
@@ -138,10 +186,57 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
 }
 
+interface ListItem {
+    value: string
+    label: string
+}
+const productOptions = ref<ListItem[]>([])
+const userOptions = ref<ListItem[]>([])
+const loading = ref(false)
+
+const queryUser = async (query: string) => {
+    if (query) {
+        loading.value = true
+        const userList = await getUserList({
+            keyword: query
+        })
+        loading.value = false
+        if (userList.count > 0) {
+            userOptions.value = userList.lists.map((user: any) => {
+                return { value: `${user.id}`, label: `ID: ${user.id} / 账户: ${user.account}` }
+            })
+        } else {
+            userOptions.value = []
+        }
+        loading.value = false
+    } else {
+        userOptions.value = []
+    }
+}
+
+const queryProduct = async (query: string) => {
+    if (query) {
+        loading.value = true
+        const productList = await apiProductLists({
+            name: query
+        })
+        loading.value = false
+        if (productList.count > 0) {
+            productOptions.value = productList.lists.map((product: any) => {
+                return { value: `${product.id}`, label: `ID: ${product.id} / 名称: ${product.name}` }
+            })
+        } else {
+            productOptions.value = []
+        }
+        loading.value = false
+    } else {
+        productOptions.value = []
+    }
+}
+
+
 const getDetail = async (row: Record<string, any>) => {
     const data = await apiDeviceDetail({
         id: row.id

admin/src/views/device/index.vue

@@ -6,6 +6,20 @@
                 :model="queryParams"
                 inline
             >
+            <el-form-item label="用户ID" prop="user_id">
+    <el-input class="w-[280px]" v-model="queryParams.user_id" clearable placeholder="请输入用户ID" />
+</el-form-item>
+                <el-form-item label="土地ID" prop="land_id">
+    <el-input class="w-[280px]" v-model="queryParams.land_id" clearable placeholder="请输入土地ID" />
+</el-form-item>
+                <el-form-item label="产品ID" prop="product_id">
+                    <el-input
+                        class="w-[280px]"
+                        v-model="queryParams.product_id"
+                        clearable
+                        placeholder="请输入产品ID"
+                    />
+</el-form-item>
                 <el-form-item label="设备编码" prop="code">
     <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入设备编码" />
 </el-form-item>
@@ -63,35 +77,64 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <el-button v-perms="['device.device/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['device.device/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button>
             <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange" style="width: 100%">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="ID" prop="id" show-overflow-tooltip />
-                    <el-table-column label="设备编码" prop="code" show-overflow-tooltip />
-                    <el-table-column label="设备名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="土地ID" prop="land_id" show-overflow-tooltip />
-                    <el-table-column label="土地名称" prop="title" show-overflow-tooltip />
-                    <el-table-column label="设备类型" prop="type">
+                    <el-table-column label="用户信息" width="200">
+                        <template #default="{ row }">
+                            <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="mr-2" type="success">ID: {{ row.land_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">名称: {{ row.land_title }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="产品信息" width="200">
+                        <template #default="{ row }">
+                            <el-tag class="mr-2" type="success">ID: {{ row.product_id }}</el-tag>
+                            <el-tag class="mr-2" type="success">名称: {{ row.product_name }}</el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="设备编码" width="120" prop="code" show-overflow-tooltip />
+                    <el-table-column label="设备名称" width="200" prop="name" show-overflow-tooltip />
+                    <el-table-column label="设备类型" width="150" prop="type">
     <template #default="{ row }">
         <dict-value :options="dictData.device_type" :value="row.type" />
     </template>
 </el-table-column>
-                    <el-table-column label="设备状态" prop="status">
+                    <el-table-column label="设备状态" width="100" align="center" prop="status">
     <template #default="{ row }">
         <dict-value :options="dictData.device_status" :value="row.status" />
     </template>
 </el-table-column>
-                    <el-table-column label="是否在线" prop="is_online">
+                    <el-table-column label="是否在线" width="100" align="center" prop="is_online">
     <template #default="{ row }">
         <dict-value :options="dictData.device_online_status" :value="row.is_online" />
     </template>
 </el-table-column>
-                    <el-table-column label="是否绑定土地" prop="is_bind">
+                    <el-table-column label="是否绑定土地" width="150" align="center" prop="is_bind">
     <template #default="{ row }">
         <dict-value :options="dictData.device_bind_status" :value="row.is_bind" />
     </template>
 </el-table-column>
-<el-table-column label="创建时间" width="160" prop="create_time">
+<el-table-column label="创建时间" width="160" align="center" prop="create_time">
     <template #default="{ row }">
       <span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
     </template>
@@ -191,19 +234,27 @@ import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 
+const { query } = useRoute()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
 
+let product_id = query.product_id
+if (typeof product_id == 'undefined') {
+    product_id = ''
+}
 
 // 查询条件
 const queryParams = reactive({
+    user_id: '',
+    land_id: '',
+    product_id: product_id,
     code: '',
     name: '',
     type: '',
     status: '',
     is_online: '',
-    is_bind: '',
+    is_bind: ''
 })
 
 // 选中数据

admin/src/views/land/index.vue

@@ -40,7 +40,7 @@
                 删除
             </el-button>
             <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange" style="width: 100%">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="ID" prop="id" width="80" show-overflow-tooltip />
                     <el-table-column label="用户信息" width="200">
@@ -68,6 +68,22 @@
                             >
                                 编辑
                             </el-button>
+                            <el-button
+                                v-perms="['land.product/lists']"
+                                type="primary"
+                                link
+                            >
+                                <router-link
+                                    :to="{
+                                        path: getRoutePath('land.product/lists'),
+                                        query: {
+                                            land_id: row.id
+                                        }
+                                    }"
+                                >
+                                    产品信息
+                                </router-link>
+                            </el-button>
                             <el-button type="primary" link @click="handleDetail(row)"
                             >
                                 土地图片
@@ -88,22 +104,6 @@
                                     种植信息
                                 </router-link>
                             </el-button>
-                            <el-button
-                                v-perms="['land.product/lists']"
-                                type="primary"
-                                link
-                            >
-                                <router-link
-                                    :to="{
-                                        path: getRoutePath('land.product/lists'),
-                                        query: {
-                                            land_id: row.id
-                                        }
-                                    }"
-                                >
-                                    产品信息
-                                </router-link>
-                            </el-button>
                             <el-button
                                 v-perms="['land.land/delete']"
                                 type="danger"

admin/src/views/land_plant/index.vue

@@ -66,17 +66,17 @@
                     <el-table-column label="种植品牌" prop="breed" show-overflow-tooltip />
                     <el-table-column label="种植面积" prop="area" show-overflow-tooltip />
                     <el-table-column label="种植人员" prop="user" show-overflow-tooltip />
-                    <el-table-column label="生长状态" prop="status">
+                    <el-table-column label="生长状态" align="center" prop="status">
     <template #default="{ row }">
         <dict-value :options="dictData.plant_status" :value="row.status" />
     </template>
 </el-table-column>
-                    <el-table-column label="溯源二维码" width="150" prop="qr_code">
+                    <el-table-column label="溯源二维码" width="150" align="center" prop="qr_code">
     <template #default="{ row }">
         <el-image style="width:50px;height:50px;" :src="row.qr_code" />
     </template>
 </el-table-column>
-                    <el-table-column label="播种时间" width="180" prop="plant_date">
+                    <el-table-column label="播种时间" width="180" align="center" prop="plant_date">
     <template #default="{ row }">
       <span>{{ row.plant_date ? timeFormat(row.plant_date, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
     </template>

admin/src/views/land_plant_action/index.vue

@@ -52,14 +52,14 @@
                             <el-tag class="mr-2" type="success">类型: {{ row.kind }} 品牌: {{ row.breed }}</el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column label="种植操作类型" prop="type">
+                    <el-table-column label="种植操作类型" align="center" prop="type">
     <template #default="{ row }">
         <dict-value :options="dictData.land_plant_action" :value="row.type" />
     </template>
 </el-table-column>
                     <el-table-column label="种植操作" prop="type_text" show-overflow-tooltip />
                     <el-table-column label="种植操作详情" prop="detail" show-overflow-tooltip />
-                    <el-table-column label="种植操作时间" width="180" prop="plant_date">
+                    <el-table-column label="种植操作时间" width="180" align="center" prop="plant_date">
     <template #default="{ row }">
       <span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
     </template>

admin/src/views/product/index.vue

@@ -74,12 +74,12 @@
                     </el-table-column>
                     <el-table-column label="产品编号" prop="code" show-overflow-tooltip />
                     <el-table-column label="产品名称" prop="name" show-overflow-tooltip />
-                    <el-table-column label="产品状态" prop="status">
+                    <el-table-column label="产品状态" align="center" prop="status">
     <template #default="{ row }">
         <dict-value :options="dictData.product_status" :value="row.status" />
     </template>
 </el-table-column>
-                    <el-table-column label="创建时间" width="180" prop="create_time">
+                    <el-table-column label="创建时间" width="180" align="center" prop="create_time">
     <template #default="{ row }">
       <span>{{ row.create_time ? timeFormat(row.create_time, 'yyyy-mm-dd hh:MM:ss') : '' }}</span>
     </template>

app/adminapi/lists/device/DeviceLists.php

@@ -41,10 +41,23 @@ class DeviceLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['d.code', 'd.name', 'd.type', 'd.status', 'd.is_online', 'd.is_bind'],
+            '%like%' => ['d.name'],
+            '=' => ['d.user_id', 'd.code', 'd.type', 'd.status', 'd.is_online', 'd.is_bind'],
         ];
     }
 
+    public function querySearch(): array
+    {
+        $queryWhere = [];
+        if (!empty($this->params['land_id'])) {
+            $queryWhere['lp.land_id'] = $this->params['land_id'];
+        }
+        if (!empty($this->params['product_id'])) {
+            $queryWhere['pd.product_id'] = $this->params['product_id'];
+        }
+        return $queryWhere;
+    }
+
     public function userSearch(): array
     {
         $userWhere['d.user_id'] = 0;
@@ -71,10 +84,13 @@ class DeviceLists extends BaseAdminDataLists implements ListsSearchInterface
     public function lists(): array
     {
         return Db::name('device')->alias('d')
-            ->where($this->searchWhere)->where($this->userSearch())
-            // ->leftJoin('land_device ld','ld.device_id = d.id')
-            // ->leftJoin('land l','l.id = ld.land_id')
-            // ->field('d.*, ld.land_id, l.title')
+            ->where($this->searchWhere)->where($this->userSearch())->where($this->querySearch())
+            ->leftJoin('user u','u.id = d.user_id')
+            ->leftJoin('product_device pd','pd.device_id = d.id')
+            ->leftJoin('product p','p.id = pd.product_id')
+            ->leftJoin('land_product lp','lp.product_id = pd.product_id')
+            ->leftJoin('land l','l.id = lp.land_id')
+            ->field('d.*, u.account, pd.product_id, p.name as product_name, lp.land_id, l.title as land_title')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['d.id' => 'desc'])
             ->select()
@@ -90,7 +106,13 @@ class DeviceLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function count(): int
     {
-        return Db::name('device')->alias('d')->where($this->searchWhere)->where($this->userSearch())->count();
+        return Db::name('device')->alias('d')->where($this->searchWhere)->where($this->userSearch())->where($this->querySearch())
+            ->leftJoin('user u','u.id = d.user_id')
+            ->leftJoin('product_device pd','pd.device_id = d.id')
+            ->leftJoin('product p','p.id = pd.product_id')
+            ->leftJoin('land_product lp','lp.product_id = pd.product_id')
+            ->leftJoin('land l','l.id = lp.land_id')
+            ->count();
     }
 
 }

app/adminapi/lists/land/ProductLists.php

@@ -38,7 +38,8 @@ class ProductLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['p.user_id', 'p.code', 'p.name', 'p.status'],
+            '%like%' => ['p.name'],
+            '=' => ['p.user_id', 'p.code', 'p.status'],
         ];
     }
 

app/adminapi/logic/device/DeviceLogic.php

@@ -40,15 +40,21 @@ class DeviceLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            Device::create([
-                'code' => $params['code'],
-                'name' => $params['name'],
-                'type' => $params['type'],
-                'status' => $params['status'],
-                'is_online' => $params['is_online'],
+            $device = Device::create([
+                'code' => $params['code'],
+                'name' => $params['name'],
+                'type' => $params['type'],
+                'status' => $params['status'],
+                'is_online' => $params['is_online'],
                 'is_bind' => $params['is_bind'],
             ]);
-
+            Db::name('product_device')->insert([
+                'product_id' => $params['product_id'],
+                'device_id' => $device['id'],
+                'device_type' => $params['type'],
+                'create_time' => time(),
+                'update_time' => time()
+            ]);
             Db::commit();
             return true;
         } catch (\Exception $e) {
@@ -70,15 +76,22 @@ class DeviceLogic extends BaseLogic
     {
         Db::startTrans();
         try {
-            Device::where('id', $params['id'])->update([
-                'code' => $params['code'],
-                'name' => $params['name'],
-                'type' => $params['type'],
-                'status' => $params['status'],
-                'is_online' => $params['is_online'],
+            $device = Device::where('id', $params['id'])->update([
+                'code' => $params['code'],
+                'name' => $params['name'],
+                'type' => $params['type'],
+                'status' => $params['status'],
+                'is_online' => $params['is_online'],
                 'is_bind' => $params['is_bind'],
             ]);
-
+            Db::name('product_device')->where('device_id', $params['id'])->delete();
+            Db::name('product_device')->insert([
+                'product_id' => $params['product_id'],
+                'device_id' => $params['id'],
+                'device_type' => $params['type'],
+                'create_time' => time(),
+                'update_time' => time()
+            ]);
             Db::commit();
             return true;
         } catch (\Exception $e) {

app/adminapi/validate/land/ProductValidate.php

@@ -16,7 +16,7 @@ namespace app\adminapi\validate\land;
 
 
 use app\common\validate\BaseValidate;
-
+use think\facade\Db;
 
 /**
  * Product验证器
@@ -31,11 +31,11 @@ class ProductValidate extends BaseValidate
       * @var string[]
       */
     protected $rule = [
-        'id' => 'require',
-        'user_id' => 'require',
-        'code' => 'require',
-        'name' => 'require',
-        'status' => 'require',
+        'id' => 'require',
+        'user_id' => 'require',
+        'code' => 'require',
+        'name' => 'require',
+        'status' => 'require',
     ];
 
 
@@ -44,11 +44,11 @@ class ProductValidate extends BaseValidate
      * @var string[]
      */
     protected $field = [
-        'id' => 'id',
-        'user_id' => '用户id',
-        'code' => '产品编号',
-        'name' => '产品名称',
-        'status' => '产品状态',
+        'id' => 'id',
+        'user_id' => '用户id',
+        'code' => '产品编号',
+        'name' => '产品名称',
+        'status' => '产品状态',
     ];
 
 
@@ -84,7 +84,7 @@ class ProductValidate extends BaseValidate
      */
     public function sceneDelete()
     {
-        return $this->only(['id']);
+        return $this->only(['id'])->append('id', 'require|checkProduct');
     }
 
 
@@ -99,4 +99,13 @@ class ProductValidate extends BaseValidate
         return $this->only(['id']);
     }
 
+    public function checkProduct($value, $rule, $data)
+    {
+        $productDevice = Db::name('product_device')->where('product_id', $value)->findOrEmpty();
+        if (!empty($productDevice)) {
+            return '存在关联设备，无法删除';
+        }
+        return true;
+    }
+
 }