From ae0bc19500d3afa3088b69622c8684cc7fcbfb83 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 25 Nov 2023 15:48:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/config/index.ts | 4 +-- .../controller/BaseAdminController.php | 1 - .../controller/device/DeviceController.php | 6 ++--- app/adminapi/lists/device/AirMonitorLists.php | 17 +++++++++++-- app/adminapi/lists/device/DeviceLists.php | 25 ++++++++++++++----- .../lists/device/MonitorAlarmLists.php | 17 +++++++++++-- .../lists/device/SoilMonitorLists.php | 17 +++++++++++-- app/adminapi/lists/land/LandLists.php | 17 +++++++++++-- .../lists/land/LandPlantActionLists.php | 17 +++++++++++-- app/adminapi/lists/land/LandPlantLists.php | 17 +++++++++++-- app/adminapi/lists/user/UserLists.php | 18 +++++++++++-- 11 files changed, 130 insertions(+), 26 deletions(-) diff --git a/admin/src/config/index.ts b/admin/src/config/index.ts index 10bbb3da..4bf4e940 100644 --- a/admin/src/config/index.ts +++ b/admin/src/config/index.ts @@ -2,8 +2,8 @@ const config = { terminal: 1, //终端 title: '后台管理系统', //网站默认标题 version: '1.6.0', //版本号 - baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名 - // baseUrl: 'http://127.0.0.1:30005/', + // baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ''}/`, //请求接口域名 + baseUrl: 'http://127.0.0.1:30005/', urlPrefix: 'adminapi', //请求默认前缀 timeout: 10 * 1000 //请求超时时长 } diff --git a/app/adminapi/controller/BaseAdminController.php b/app/adminapi/controller/BaseAdminController.php index db1bbe17..66e8ccea 100644 --- a/app/adminapi/controller/BaseAdminController.php +++ b/app/adminapi/controller/BaseAdminController.php @@ -34,7 +34,6 @@ class BaseAdminController extends BaseLikeAdminController if (isset($this->request->adminInfo) && $this->request->adminInfo) { $this->adminInfo = $this->request->adminInfo; $this->adminId = $this->request->adminInfo['admin_id']; - $this->userId = $this->request->adminInfo['user_id']; } } diff --git a/app/adminapi/controller/device/DeviceController.php b/app/adminapi/controller/device/DeviceController.php index 34db92bf..d66db9e1 100644 --- a/app/adminapi/controller/device/DeviceController.php +++ b/app/adminapi/controller/device/DeviceController.php @@ -16,9 +16,9 @@ namespace app\adminapi\controller\device; -use app\adminapi\controller\BaseAdminController; -use app\adminapi\lists\device\DeviceLists; -use app\adminapi\logic\device\DeviceLogic; +use app\adminapi\controller\BaseAdminController; +use app\adminapi\lists\device\DeviceLists; +use app\adminapi\logic\device\DeviceLogic; use app\adminapi\validate\device\DeviceValidate; diff --git a/app/adminapi/lists/device/AirMonitorLists.php b/app/adminapi/lists/device/AirMonitorLists.php index 1a450659..12923c99 100644 --- a/app/adminapi/lists/device/AirMonitorLists.php +++ b/app/adminapi/lists/device/AirMonitorLists.php @@ -44,6 +44,19 @@ class AirMonitorLists extends BaseAdminDataLists implements ListsSearchInterface return array_intersect(array_keys($this->params), $allowSearch); } + public function userSearch(): array + { + $userWhere['user_id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['user_id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['user_id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } /** * @notes 获取列表 @@ -56,7 +69,7 @@ class AirMonitorLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - return AirMonitor::withSearch($this->setSearch(), $this->params)->with('device') + return AirMonitor::withSearch($this->setSearch(), $this->params)->where($this->userSearch())->with('device') ->field(['id', 'device_id', 'wind_direction', 'wind_speed', 'temperature', 'moisture', 'co2_content', 'pressure', 'rainfall', 'light_intensity', 'create_time']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) @@ -73,7 +86,7 @@ class AirMonitorLists extends BaseAdminDataLists implements ListsSearchInterface */ public function count(): int { - return AirMonitor::withSearch($this->setSearch(), $this->params)->count(); + return AirMonitor::withSearch($this->setSearch(), $this->params)->where($this->userSearch())->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/device/DeviceLists.php b/app/adminapi/lists/device/DeviceLists.php index a11baa6a..18433bb0 100644 --- a/app/adminapi/lists/device/DeviceLists.php +++ b/app/adminapi/lists/device/DeviceLists.php @@ -45,6 +45,19 @@ class DeviceLists extends BaseAdminDataLists implements ListsSearchInterface ]; } + public function userSearch(): array + { + $userWhere['d.user_id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['user_id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['d.user_id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } /** * @notes 获取列表 @@ -57,11 +70,11 @@ class DeviceLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - return Db::name('device')->where($this->searchWhere) - ->alias('d') - ->leftJoin('land_device ld','ld.device_id = d.id') - ->leftJoin('land l','l.id = ld.land_id') - ->field('d.*, ld.land_id, l.title') + 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') ->limit($this->limitOffset, $this->limitLength) ->order(['d.id' => 'desc']) ->select() @@ -77,7 +90,7 @@ class DeviceLists extends BaseAdminDataLists implements ListsSearchInterface */ public function count(): int { - return Db::name('device')->where($this->searchWhere)->alias('d')->count(); + return Db::name('device')->alias('d')->where($this->searchWhere)->where($this->userSearch())->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/device/MonitorAlarmLists.php b/app/adminapi/lists/device/MonitorAlarmLists.php index b5fcfd6a..e97b40b3 100644 --- a/app/adminapi/lists/device/MonitorAlarmLists.php +++ b/app/adminapi/lists/device/MonitorAlarmLists.php @@ -47,6 +47,19 @@ class MonitorAlarmLists extends BaseAdminDataLists implements ListsSearchInterfa return array_intersect(array_keys($this->params), $allowSearch); } + public function userSearch(): array + { + $userWhere['user_id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['user_id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['user_id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } /** * @notes 获取列表 @@ -59,7 +72,7 @@ class MonitorAlarmLists extends BaseAdminDataLists implements ListsSearchInterfa */ public function lists(): array { - return MonitorAlarm::withSearch($this->setSearch(), $this->params)->with('device') + return MonitorAlarm::withSearch($this->setSearch(), $this->params)->where($this->userSearch())->with('device') ->field(['id', 'device_id', 'type', 'content', 'value', 'solution', 'create_time']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) @@ -76,7 +89,7 @@ class MonitorAlarmLists extends BaseAdminDataLists implements ListsSearchInterfa */ public function count(): int { - return MonitorAlarm::withSearch($this->setSearch(), $this->params)->count(); + return MonitorAlarm::withSearch($this->setSearch(), $this->params)->where($this->userSearch())->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/device/SoilMonitorLists.php b/app/adminapi/lists/device/SoilMonitorLists.php index 544dafa9..8dc958e8 100644 --- a/app/adminapi/lists/device/SoilMonitorLists.php +++ b/app/adminapi/lists/device/SoilMonitorLists.php @@ -44,6 +44,19 @@ class SoilMonitorLists extends BaseAdminDataLists implements ListsSearchInterfac return array_intersect(array_keys($this->params), $allowSearch); } + public function userSearch(): array + { + $userWhere['user_id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['user_id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['user_id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } /** * @notes 获取列表 @@ -56,7 +69,7 @@ class SoilMonitorLists extends BaseAdminDataLists implements ListsSearchInterfac */ public function lists(): array { - return SoilMonitor::withSearch($this->setSearch(), $this->params)->with('device') + return SoilMonitor::withSearch($this->setSearch(), $this->params)->where($this->userSearch())->with('device') ->field(['id', 'device_id', 'temperature', 'moisture', 'conductivity', 'ph', 'n_content', 'p_content', 'k_content', 'create_time']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) @@ -73,7 +86,7 @@ class SoilMonitorLists extends BaseAdminDataLists implements ListsSearchInterfac */ public function count(): int { - return SoilMonitor::withSearch($this->setSearch(), $this->params)->count(); + return SoilMonitor::withSearch($this->setSearch(), $this->params)->where($this->userSearch())->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/land/LandLists.php b/app/adminapi/lists/land/LandLists.php index 8b5a3835..b21d591f 100644 --- a/app/adminapi/lists/land/LandLists.php +++ b/app/adminapi/lists/land/LandLists.php @@ -43,6 +43,19 @@ class LandLists extends BaseAdminDataLists implements ListsSearchInterface ]; } + public function userSearch(): array + { + $userWhere['user_id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['user_id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['user_id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } /** * @notes 获取列表 @@ -55,7 +68,7 @@ class LandLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - return Land::where($this->searchWhere)->with('user') + 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']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) @@ -72,7 +85,7 @@ class LandLists extends BaseAdminDataLists implements ListsSearchInterface */ public function count(): int { - return Land::where($this->searchWhere)->count(); + return Land::where($this->searchWhere)->where($this->userSearch())->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/land/LandPlantActionLists.php b/app/adminapi/lists/land/LandPlantActionLists.php index cdebc64f..e4dd2bba 100644 --- a/app/adminapi/lists/land/LandPlantActionLists.php +++ b/app/adminapi/lists/land/LandPlantActionLists.php @@ -42,6 +42,19 @@ class LandPlantActionLists extends BaseAdminDataLists implements ListsSearchInte ]; } + public function userSearch(): array + { + $userWhere['user_id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['user_id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['user_id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } /** * @notes 获取列表 @@ -54,7 +67,7 @@ class LandPlantActionLists extends BaseAdminDataLists implements ListsSearchInte */ public function lists(): array { - return LandPlantAction::where($this->searchWhere)->with('landPlant') + return LandPlantAction::where($this->searchWhere)->where($this->userSearch())->with('landPlant') ->field(['id', 'plant_id', 'type', 'type_text', 'detail']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) @@ -71,7 +84,7 @@ class LandPlantActionLists extends BaseAdminDataLists implements ListsSearchInte */ public function count(): int { - return LandPlantAction::where($this->searchWhere)->count(); + return LandPlantAction::where($this->searchWhere)->where($this->userSearch())->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/land/LandPlantLists.php b/app/adminapi/lists/land/LandPlantLists.php index 212daad1..c583ee35 100644 --- a/app/adminapi/lists/land/LandPlantLists.php +++ b/app/adminapi/lists/land/LandPlantLists.php @@ -57,6 +57,19 @@ class LandPlantLists extends BaseAdminDataLists implements ListsSearchInterface return $where; } + public function userSearch(): array + { + $userWhere['user_id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['user_id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['user_id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } /** * @notes 获取列表 @@ -69,7 +82,7 @@ class LandPlantLists extends BaseAdminDataLists implements ListsSearchInterface */ public function lists(): array { - return LandPlant::where($this->queryWhere())->where($this->searchWhere)->with('land') + return LandPlant::where($this->queryWhere())->where($this->searchWhere)->where($this->userSearch())->with('land') ->field(['id', 'land_id', 'kind', 'breed', 'area', 'user', 'status', 'pic', 'qr_code', 'plant_date', 'remark']) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) @@ -86,7 +99,7 @@ class LandPlantLists extends BaseAdminDataLists implements ListsSearchInterface */ public function count(): int { - return LandPlant::where($this->queryWhere())->where($this->searchWhere)->count(); + return LandPlant::where($this->queryWhere())->where($this->searchWhere)->where($this->userSearch())->count(); } } \ No newline at end of file diff --git a/app/adminapi/lists/user/UserLists.php b/app/adminapi/lists/user/UserLists.php index 493babd0..af2b6354 100644 --- a/app/adminapi/lists/user/UserLists.php +++ b/app/adminapi/lists/user/UserLists.php @@ -39,6 +39,20 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface return array_intersect(array_keys($this->params), $allowSearch); } + public function userSearch(): array + { + $userWhere['id'] = 0; + // 超级管理员数据 + if ($this->adminInfo['root'] && !$this->adminInfo['user_id']) { + unset($userWhere['id']); + } + // 普通用户数据 + if (!$this->adminInfo['root'] && $this->adminInfo['user_id']) { + $userWhere['id'] = $this->adminInfo['user_id']; + } + return $userWhere; + } + /** * @notes 获取用户列表 * @return array @@ -51,7 +65,7 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface public function lists(): array { $field = "id,sn,nickname,sex,avatar,account,mobile,channel,is_disable,create_time"; - $lists = User::withSearch($this->setSearch(), $this->params) + $lists = User::withSearch($this->setSearch(), $this->params)->where($this->userSearch()) ->limit($this->limitOffset, $this->limitLength) ->field($field) ->order('id desc') @@ -73,7 +87,7 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface */ public function count(): int { - return User::withSearch($this->setSearch(), $this->params)->count(); + return User::withSearch($this->setSearch(), $this->params)->where($this->userSearch())->count(); } From 4951519cc7d41c5983d8253b56179e34041cfd8d Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Sat, 25 Nov 2023 18:13:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/api/product.ts | 37 +++ admin/src/views/land/index.vue | 21 +- admin/src/views/land_plant/index.vue | 10 +- admin/src/views/land_plant_action/index.vue | 13 +- admin/src/views/product/edit.vue | 235 ++++++++++++++++++ admin/src/views/product/index.vue | 177 +++++++++++++ .../controller/land/ProductController.php | 108 ++++++++ app/adminapi/lists/device/DeviceLists.php | 2 +- .../lists/land/LandPlantActionLists.php | 4 +- app/adminapi/lists/land/LandPlantLists.php | 4 +- app/adminapi/lists/land/ProductLists.php | 103 ++++++++ app/adminapi/logic/land/ProductLogic.php | 123 +++++++++ .../validate/land/ProductValidate.php | 102 ++++++++ app/common/model/land/LandPlant.php | 12 + app/common/model/land/Product.php | 45 ++++ .../{403.84781eb9.js => 403.05da3570.js} | 2 +- .../{404.029ec793.js => 404.6e04f093.js} | 2 +- ...be6a13f6.js => account-adjust.4ff2b12b.js} | 2 +- ...e_type_script_setup_true_lang.346b0c00.js} | 2 +- ...dd-nav.cc6cc9d7.js => add-nav.1c402159.js} | 2 +- ...e_type_script_setup_true_lang.3e7a8e2a.js} | 2 +- ...rticle.b9be25bc.js => article.4d287075.js} | 2 +- public/admin/assets/attr-setting.247c8178.js | 1 - public/admin/assets/attr-setting.e8171778.js | 1 + ...e_type_script_setup_true_lang.d5897e92.js} | 2 +- .../{attr.ea09dc3f.js => attr.3be0b795.js} | 2 +- .../{attr.537ec0f0.js => attr.4498c9de.js} | 2 +- .../{attr.07c93ce5.js => attr.54bbced0.js} | 2 +- .../{attr.0f59b217.js => attr.8a2bb375.js} | 2 +- .../{attr.97287d27.js => attr.c4198cd9.js} | 2 +- ...e_type_script_setup_true_lang.07f1a4d2.js} | 2 +- ...e_type_script_setup_true_lang.4dc78784.js} | 2 +- ...e_type_script_setup_true_lang.6004a552.js} | 2 +- ...e_type_script_setup_true_lang.6067e2c5.js} | 2 +- ...e_type_script_setup_true_lang.d4fc6423.js} | 2 +- .../{auth.3b09b0a7.js => auth.85db0959.js} | 2 +- ...e_type_script_setup_true_lang.bdec551c.js} | 2 +- ...0f809a3.js => balance_details.8ab60ebe.js} | 2 +- .../{cache.f71ab1dc.js => cache.d871697a.js} | 2 +- ...w.ae3478fe.js => code-preview.4e196933.js} | 2 +- ...e_type_script_setup_true_lang.18ef299e.js} | 2 +- .../{code.cf6b994a.js => code.8c5a77a0.js} | 2 +- ...{config.9a143933.js => config.9f0afc88.js} | 2 +- ...sumer.74ef0498.js => consumer.9b0bd8a0.js} | 2 +- ...ontent.0e38a0ea.js => content.135dcac7.js} | 2 +- ...ontent.0037cffe.js => content.2c12e5a1.js} | 2 +- ...ontent.460578c6.js => content.516bd45e.js} | 2 +- ...ontent.37d5ba2d.js => content.740a3837.js} | 2 +- ...ontent.4cf4a898.js => content.a27f90b3.js} | 2 +- ...ontent.58d9f7b0.js => content.b4659b8a.js} | 2 +- ...ontent.83655b0d.js => content.b946ec59.js} | 2 +- ...ontent.d5635328.js => content.f9c9a79f.js} | 2 +- ...e_type_script_setup_true_lang.05b4ddd6.js} | 2 +- ...e_type_script_setup_true_lang.6e35fba5.js} | 2 +- ...e_type_script_setup_true_lang.d8a9d3d7.js} | 2 +- ...ble.5ed709ea.js => data-table.9306dbfa.js} | 2 +- ...e_type_script_setup_true_lang.fe0aa57a.js} | 2 +- ...c2d6bebc.js => decoration-img.1195b404.js} | 2 +- ...ion.f4e7f4f1.js => decoration.ce0616d0.js} | 2 +- ....26fe594c.js => default_reply.bf9f0b9e.js} | 2 +- ...ent.59370c77.js => department.a612b789.js} | 2 +- ...{detail.d376edf3.js => detail.a850b2dd.js} | 2 +- .../{dict.ec80181d.js => dict.e29a9abf.js} | 2 +- .../{edit.f433f7eb.js => edit.1a140ca9.js} | 2 +- .../{edit.c9b9ea28.js => edit.36a2e690.js} | 2 +- .../{edit.4181bc52.js => edit.380d0cfe.js} | 2 +- .../{edit.6ab1a958.js => edit.3a909a98.js} | 2 +- .../{edit.a21f9a23.js => edit.3b2fdd48.js} | 2 +- .../{edit.47c79f3f.js => edit.3c6740c6.js} | 2 +- .../{edit.677cdfe0.js => edit.3d8fd34c.js} | 2 +- .../{edit.023e1a21.js => edit.3f1cfad5.js} | 2 +- public/admin/assets/edit.41700928.js | 1 + .../{edit.81a65046.js => edit.4836ce6d.js} | 2 +- .../{edit.fa1be1f3.js => edit.4f9cdcbe.js} | 2 +- .../{edit.c2de4831.js => edit.5e2c229d.js} | 2 +- .../{edit.88879d37.js => edit.68f97538.js} | 2 +- .../{edit.95ce0a9e.js => edit.89be6270.js} | 2 +- .../{edit.dbd23695.js => edit.8aabc429.js} | 2 +- .../{edit.fc3e9bd5.js => edit.a1da0579.js} | 2 +- .../{edit.dc66671a.js => edit.a9322bbe.js} | 2 +- .../{edit.7be3a18b.js => edit.b5766374.js} | 2 +- .../{edit.5cb1ff84.js => edit.ba927496.js} | 2 +- .../{edit.6317bd32.js => edit.c4e837e0.js} | 2 +- .../{edit.6728ad81.js => edit.c72a3499.js} | 2 +- .../{edit.679b7961.js => edit.c7ca1d13.js} | 2 +- .../{edit.02207132.js => edit.d2605e4c.js} | 2 +- .../{edit.3ce44095.js => edit.e12d7e49.js} | 2 +- .../{edit.ae5269d1.js => edit.fc9fa70a.js} | 2 +- ...e_type_script_setup_true_lang.4621eb89.js} | 2 +- ...e_type_script_setup_true_lang.6740f81a.js} | 2 +- ...e_type_script_setup_true_lang.7325a465.js} | 2 +- ...e_type_script_setup_true_lang.7c16af46.js} | 2 +- ...e_type_script_setup_true_lang.8ca5f919.js} | 2 +- ...e_type_script_setup_true_lang.a3920319.js} | 2 +- ...e_type_script_setup_true_lang.a41336a2.js} | 2 +- ...e_type_script_setup_true_lang.abb7aaf3.js} | 2 +- ...e_type_script_setup_true_lang.adc4fc58.js} | 2 +- ...e_type_script_setup_true_lang.b6c3bf10.js} | 2 +- ...e_type_script_setup_true_lang.dc831a49.js} | 2 +- ...e_type_script_setup_true_lang.fd53b0e8.js} | 2 +- ...true_name_airMonitorEdit_lang.19d956ea.js} | 2 +- ...tup_true_name_deviceEdit_lang.eaf7fc54.js} | 2 +- ...setup_true_name_landEdit_lang.9f80aed9.js} | 2 +- ...name_landPlantActionEdit_lang.63e99f87.js} | 2 +- ..._true_name_landPlantEdit_lang.aaae8567.js} | 2 +- ...ue_name_monitorAlarmEdit_lang.a6395a30.js} | 2 +- ...ame_monitorThresholdEdit_lang.a3e781b2.js} | 2 +- ...tup_true_name_productEdit_lang.ebf8e0a2.js | 1 + ...nt.0b6aaa10.js => environment.06c2a2ae.js} | 2 +- .../{error.b98f46da.js => error.15134837.js} | 2 +- .../{file.1f9c8caf.js => file.3953c168.js} | 2 +- ...{filing.a50fdaf0.js => filing.15e7d221.js} | 2 +- ...inance.4ae39933.js => finance.11edd0f1.js} | 2 +- ...y.2c82fd9f.js => follow_reply.a00abc09.js} | 2 +- .../assets/{h5.07a39a7a.js => h5.e485668c.js} | 2 +- .../{icon.2111dcfe.js => icon.540f4fa1.js} | 2 +- .../{index.71315001.js => index.0d1c4374.js} | 2 +- public/admin/assets/index.18f03ac7.js | 1 - .../{index.ee54d815.js => index.2059c19c.js} | 2 +- public/admin/assets/index.38f5faab.js | 1 - .../{index.56740466.js => index.3ac11f0a.js} | 2 +- .../{index.36a7ea39.js => index.3c28be6f.js} | 2 +- .../{index.3469feab.js => index.45300070.js} | 2 +- public/admin/assets/index.4607d47a.js | 1 + .../{index.19d8323b.js => index.4c7d3240.js} | 2 +- .../{index.48a4b326.js => index.4e79e644.js} | 2 +- .../{index.ae1a243e.js => index.58b54680.js} | 2 +- .../{index.ff934b26.js => index.5b8228b7.js} | 2 +- public/admin/assets/index.62a64e52.js | 1 + .../{index.a14201df.js => index.66f21513.js} | 2 +- .../{index.1201141c.js => index.68e8c7d0.js} | 2 +- .../{index.c3f35ce2.js => index.7938743a.js} | 2 +- public/admin/assets/index.7b0058f7.js | 1 + public/admin/assets/index.7c5c8d56.js | 1 - .../{index.1e41275c.js => index.7e37b5ef.js} | 2 +- .../{index.053972f4.js => index.93187eca.js} | 2 +- .../{index.61a95cac.js => index.94eee5dc.js} | 2 +- .../{index.ca595b55.js => index.98bba7e2.js} | 2 +- public/admin/assets/index.a146cc7a.js | 1 + .../{index.f76d3482.js => index.a15bb04c.js} | 2 +- .../{index.f5848b22.js => index.a3cee107.js} | 2 +- .../{index.634a3ae9.js => index.a5978a42.js} | 2 +- .../{index.cae7b92c.js => index.a97e0bd4.js} | 2 +- .../{index.1ae7f577.js => index.aabf5733.js} | 2 +- .../{index.df10c2bd.js => index.ac7469a8.js} | 2 +- .../{index.4408bf84.js => index.acf08945.js} | 2 +- .../{index.c4dc6053.js => index.b033cb19.js} | 2 +- public/admin/assets/index.b3c90baa.js | 1 - .../{index.7ca7c5a9.js => index.b48a23e3.js} | 2 +- .../{index.c822c6b6.js => index.b684b635.js} | 2 +- .../{index.ac745dd0.js => index.b90caa8d.js} | 2 +- .../{index.f1f560ec.js => index.c5a54c00.js} | 2 +- .../{index.a05ee0ed.js => index.cf606501.js} | 2 +- .../{index.c54e75e2.js => index.dc602add.js} | 2 +- .../{index.641c9c1f.js => index.e48a4b3c.js} | 2 +- .../{index.aff0441b.js => index.e492f1bc.js} | 2 +- .../{index.63c1b5f2.js => index.e9371f07.js} | 2 +- public/admin/assets/index.ea8fd952.js | 1 + ...e_type_script_setup_true_lang.2706f2d5.js} | 2 +- ...e_vue_type_style_index_0_lang.2d317f31.js} | 2 +- ...on.3bcfab72.js => information.340b8744.js} | 2 +- ...ournal.1ad59bcd.js => journal.bfb3bf04.js} | 2 +- ....d75f9915.js => keyword_reply.b522a913.js} | 2 +- .../{link.eea20b83.js => link.78bf42bb.js} | 2 +- .../{login.b56f3b7d.js => login.0b8db2e2.js} | 2 +- ...54c5b1a9.js => login_register.cfe1887a.js} | 2 +- .../{menu.1813b4bb.js => menu.4b48eb0a.js} | 2 +- .../{menu.87ae1a4e.js => menu.819b6d54.js} | 2 +- .../{menu.ad30a713.js => menu.dae3962e.js} | 2 +- ...essage.e79a5473.js => message.47dcd063.js} | 2 +- ...a-attr.10805487.js => oa-attr.5ed2a38b.js} | 2 +- ...f1e33.js => oa-menu-form-edit.ad71eeff.js} | 2 +- ...e_type_script_setup_true_lang.f0bc3995.js} | 2 +- ...m.c26289a2.js => oa-menu-form.ff098bcf.js} | 2 +- ...e_type_script_setup_true_lang.d0962032.js} | 2 +- ...phone.401d3627.js => oa-phone.07c68139.js} | 2 +- ...g.5d6e9636.js => open_setting.3e28b1e8.js} | 2 +- ...rflow.8db98b1f.js => overflow.85c62c87.js} | 2 +- .../{pay.c875eba0.js => pay.79e14b43.js} | 2 +- .../assets/{pc.be44eab3.js => pc.ad493ad3.js} | 2 +- ...{picker.71c413a3.js => picker.6e32b18e.js} | 2 +- ...{picker.3c951b52.js => picker.8d3cfe49.js} | 2 +- ...e_type_script_setup_true_lang.6f5c4c0a.js} | 2 +- .../{post.d7c84cfd.js => post.0a1c09a9.js} | 2 +- ...-pc.61e81017.js => preview-pc.9c67176e.js} | 2 +- ...review.6068296a.js => preview.0e69a0a0.js} | 2 +- ...tocol.1b17d50c.js => protocol.629480f2.js} | 2 +- ...c70a1ba.js => recharge_record.cf040fff.js} | 2 +- ...log.f5145b32.js => refund-log.dda0bbfb.js} | 2 +- ...e_type_script_setup_true_lang.3cf504a8.js} | 2 +- ....e5a67a52.js => refund_record.bbc1980c.js} | 2 +- ....0d11b676.js => relations-add.cf2967ae.js} | 2 +- ...e_type_script_setup_true_lang.d503afc1.js} | 2 +- ...text.4901f9fd.js => rich_text.7d5cfd19.js} | 2 +- .../{role.0dca4491.js => role.261e60fd.js} | 2 +- ...etting.fc8e3b3e.js => setting.b0b192a3.js} | 2 +- .../{setup.53b9142d.js => setup.7729eba4.js} | 2 +- ...r.6601ccc2.js => soil_monitor.846239cc.js} | 2 +- ...{system.7352f651.js => system.4bcf1c87.js} | 2 +- ...{tabbar.43c2867a.js => tabbar.fe9fa747.js} | 2 +- ...{upload.9b8358ce.js => upload.7b16b357.js} | 2 +- ...3f58fdc1.js => useDictOptions.6d454027.js} | 2 +- ...nuOa.854d4a0d.js => useMenuOa.a15e346c.js} | 2 +- .../{user.59f88f3d.js => user.17a473b4.js} | 2 +- .../{weapp.4f5cdbbf.js => weapp.abb17747.js} | 2 +- ...ebsite.c3fcf66f.js => website.a0690a07.js} | 2 +- .../{wx_oa.e5bff3dd.js => wx_oa.c74a4507.js} | 2 +- public/admin/index.html | 2 +- 208 files changed, 1170 insertions(+), 199 deletions(-) create mode 100644 admin/src/api/product.ts create mode 100644 admin/src/views/product/edit.vue create mode 100644 admin/src/views/product/index.vue create mode 100644 app/adminapi/controller/land/ProductController.php create mode 100644 app/adminapi/lists/land/ProductLists.php create mode 100644 app/adminapi/logic/land/ProductLogic.php create mode 100644 app/adminapi/validate/land/ProductValidate.php create mode 100644 app/common/model/land/Product.php rename public/admin/assets/{403.84781eb9.js => 403.05da3570.js} (92%) rename public/admin/assets/{404.029ec793.js => 404.6e04f093.js} (86%) rename public/admin/assets/{account-adjust.be6a13f6.js => account-adjust.4ff2b12b.js} (75%) rename public/admin/assets/{account-adjust.vue_vue_type_script_setup_true_lang.f25407a2.js => account-adjust.vue_vue_type_script_setup_true_lang.346b0c00.js} (94%) rename public/admin/assets/{add-nav.cc6cc9d7.js => add-nav.1c402159.js} (70%) rename public/admin/assets/{add-nav.vue_vue_type_script_setup_true_lang.bd4f6eab.js => add-nav.vue_vue_type_script_setup_true_lang.3e7a8e2a.js} (91%) rename public/admin/assets/{article.b9be25bc.js => article.4d287075.js} (94%) delete mode 100644 public/admin/assets/attr-setting.247c8178.js create mode 100644 public/admin/assets/attr-setting.e8171778.js rename public/admin/assets/{attr-setting.vue_vue_type_script_setup_true_lang.fa9b1b17.js => attr-setting.vue_vue_type_script_setup_true_lang.d5897e92.js} (91%) rename public/admin/assets/{attr.ea09dc3f.js => attr.3be0b795.js} (66%) rename public/admin/assets/{attr.537ec0f0.js => attr.4498c9de.js} (69%) rename public/admin/assets/{attr.07c93ce5.js => attr.54bbced0.js} (67%) rename public/admin/assets/{attr.0f59b217.js => attr.8a2bb375.js} (67%) rename public/admin/assets/{attr.97287d27.js => attr.c4198cd9.js} (66%) rename public/admin/assets/{attr.vue_vue_type_script_setup_true_lang.95135583.js => attr.vue_vue_type_script_setup_true_lang.07f1a4d2.js} (93%) rename public/admin/assets/{attr.vue_vue_type_script_setup_true_lang.9c41bf35.js => attr.vue_vue_type_script_setup_true_lang.4dc78784.js} (95%) rename public/admin/assets/{attr.vue_vue_type_script_setup_true_lang.89cf9773.js => attr.vue_vue_type_script_setup_true_lang.6004a552.js} (94%) rename public/admin/assets/{attr.vue_vue_type_script_setup_true_lang.d9f65535.js => attr.vue_vue_type_script_setup_true_lang.6067e2c5.js} (94%) rename public/admin/assets/{attr.vue_vue_type_script_setup_true_lang.5232de07.js => attr.vue_vue_type_script_setup_true_lang.d4fc6423.js} (92%) rename public/admin/assets/{auth.3b09b0a7.js => auth.85db0959.js} (67%) rename public/admin/assets/{auth.vue_vue_type_script_setup_true_lang.aaed2f27.js => auth.vue_vue_type_script_setup_true_lang.bdec551c.js} (92%) rename public/admin/assets/{balance_details.d0f809a3.js => balance_details.8ab60ebe.js} (95%) rename public/admin/assets/{cache.f71ab1dc.js => cache.d871697a.js} (94%) rename public/admin/assets/{code-preview.ae3478fe.js => code-preview.4e196933.js} (79%) rename public/admin/assets/{code-preview.vue_vue_type_script_setup_true_lang.25f23930.js => code-preview.vue_vue_type_script_setup_true_lang.18ef299e.js} (95%) rename public/admin/assets/{code.cf6b994a.js => code.8c5a77a0.js} (92%) rename public/admin/assets/{config.9a143933.js => config.9f0afc88.js} (96%) rename public/admin/assets/{consumer.74ef0498.js => consumer.9b0bd8a0.js} (81%) rename public/admin/assets/{content.0e38a0ea.js => content.135dcac7.js} (85%) rename public/admin/assets/{content.0037cffe.js => content.2c12e5a1.js} (94%) rename public/admin/assets/{content.460578c6.js => content.516bd45e.js} (94%) rename public/admin/assets/{content.37d5ba2d.js => content.740a3837.js} (85%) rename public/admin/assets/{content.4cf4a898.js => content.a27f90b3.js} (93%) rename public/admin/assets/{content.58d9f7b0.js => content.b4659b8a.js} (85%) rename public/admin/assets/{content.83655b0d.js => content.b946ec59.js} (95%) rename public/admin/assets/{content.d5635328.js => content.f9c9a79f.js} (95%) rename public/admin/assets/{content.vue_vue_type_script_setup_true_lang.72a5c9f9.js => content.vue_vue_type_script_setup_true_lang.05b4ddd6.js} (89%) rename public/admin/assets/{content.vue_vue_type_script_setup_true_lang.01a0513c.js => content.vue_vue_type_script_setup_true_lang.6e35fba5.js} (88%) rename public/admin/assets/{content.vue_vue_type_script_setup_true_lang.bc11abe9.js => content.vue_vue_type_script_setup_true_lang.d8a9d3d7.js} (89%) rename public/admin/assets/{data-table.5ed709ea.js => data-table.9306dbfa.js} (77%) rename public/admin/assets/{data-table.vue_vue_type_script_setup_true_lang.84a53756.js => data-table.vue_vue_type_script_setup_true_lang.fe0aa57a.js} (92%) rename public/admin/assets/{decoration-img.c2d6bebc.js => decoration-img.1195b404.js} (96%) rename public/admin/assets/{decoration.f4e7f4f1.js => decoration.ce0616d0.js} (85%) rename public/admin/assets/{default_reply.26fe594c.js => default_reply.bf9f0b9e.js} (93%) rename public/admin/assets/{department.59370c77.js => department.a612b789.js} (85%) rename public/admin/assets/{detail.d376edf3.js => detail.a850b2dd.js} (93%) rename public/admin/assets/{dict.ec80181d.js => dict.e29a9abf.js} (92%) rename public/admin/assets/{edit.f433f7eb.js => edit.1a140ca9.js} (70%) rename public/admin/assets/{edit.c9b9ea28.js => edit.36a2e690.js} (85%) rename public/admin/assets/{edit.4181bc52.js => edit.380d0cfe.js} (70%) rename public/admin/assets/{edit.6ab1a958.js => edit.3a909a98.js} (70%) rename public/admin/assets/{edit.a21f9a23.js => edit.3b2fdd48.js} (96%) rename public/admin/assets/{edit.47c79f3f.js => edit.3c6740c6.js} (91%) rename public/admin/assets/{edit.677cdfe0.js => edit.3d8fd34c.js} (80%) rename public/admin/assets/{edit.023e1a21.js => edit.3f1cfad5.js} (70%) create mode 100644 public/admin/assets/edit.41700928.js rename public/admin/assets/{edit.81a65046.js => edit.4836ce6d.js} (75%) rename public/admin/assets/{edit.fa1be1f3.js => edit.4f9cdcbe.js} (85%) rename public/admin/assets/{edit.c2de4831.js => edit.5e2c229d.js} (66%) rename public/admin/assets/{edit.88879d37.js => edit.68f97538.js} (70%) rename public/admin/assets/{edit.95ce0a9e.js => edit.89be6270.js} (70%) rename public/admin/assets/{edit.dbd23695.js => edit.8aabc429.js} (94%) rename public/admin/assets/{edit.fc3e9bd5.js => edit.a1da0579.js} (77%) rename public/admin/assets/{edit.dc66671a.js => edit.a9322bbe.js} (96%) rename public/admin/assets/{edit.7be3a18b.js => edit.b5766374.js} (70%) rename public/admin/assets/{edit.5cb1ff84.js => edit.ba927496.js} (97%) rename public/admin/assets/{edit.6317bd32.js => edit.c4e837e0.js} (85%) rename public/admin/assets/{edit.6728ad81.js => edit.c72a3499.js} (85%) rename public/admin/assets/{edit.679b7961.js => edit.c7ca1d13.js} (64%) rename public/admin/assets/{edit.02207132.js => edit.d2605e4c.js} (67%) rename public/admin/assets/{edit.3ce44095.js => edit.e12d7e49.js} (80%) rename public/admin/assets/{edit.ae5269d1.js => edit.fc9fa70a.js} (76%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.7ce782c1.js => edit.vue_vue_type_script_setup_true_lang.4621eb89.js} (96%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.ff994d70.js => edit.vue_vue_type_script_setup_true_lang.6740f81a.js} (94%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.c41d9e9e.js => edit.vue_vue_type_script_setup_true_lang.7325a465.js} (94%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.c8a8213f.js => edit.vue_vue_type_script_setup_true_lang.7c16af46.js} (97%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.2727162d.js => edit.vue_vue_type_script_setup_true_lang.8ca5f919.js} (95%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.3e77488a.js => edit.vue_vue_type_script_setup_true_lang.a3920319.js} (96%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.58b76a3e.js => edit.vue_vue_type_script_setup_true_lang.a41336a2.js} (97%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.353695f3.js => edit.vue_vue_type_script_setup_true_lang.abb7aaf3.js} (93%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.125df31d.js => edit.vue_vue_type_script_setup_true_lang.adc4fc58.js} (95%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.ace2e0e3.js => edit.vue_vue_type_script_setup_true_lang.b6c3bf10.js} (95%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.c9aa39fa.js => edit.vue_vue_type_script_setup_true_lang.dc831a49.js} (98%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_lang.82d137c0.js => edit.vue_vue_type_script_setup_true_lang.fd53b0e8.js} (93%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_name_airMonitorEdit_lang.6225d412.js => edit.vue_vue_type_script_setup_true_name_airMonitorEdit_lang.19d956ea.js} (97%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_name_deviceEdit_lang.ab961278.js => edit.vue_vue_type_script_setup_true_name_deviceEdit_lang.eaf7fc54.js} (97%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_name_landEdit_lang.2fd897a4.js => edit.vue_vue_type_script_setup_true_name_landEdit_lang.9f80aed9.js} (98%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_name_landPlantActionEdit_lang.ccb12b7f.js => edit.vue_vue_type_script_setup_true_name_landPlantActionEdit_lang.63e99f87.js} (96%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_name_landPlantEdit_lang.d4af43a1.js => edit.vue_vue_type_script_setup_true_name_landPlantEdit_lang.aaae8567.js} (96%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_name_monitorAlarmEdit_lang.af30966f.js => edit.vue_vue_type_script_setup_true_name_monitorAlarmEdit_lang.a6395a30.js} (96%) rename public/admin/assets/{edit.vue_vue_type_script_setup_true_name_monitorThresholdEdit_lang.a79c5aaf.js => edit.vue_vue_type_script_setup_true_name_monitorThresholdEdit_lang.a3e781b2.js} (98%) create mode 100644 public/admin/assets/edit.vue_vue_type_script_setup_true_name_productEdit_lang.ebf8e0a2.js rename public/admin/assets/{environment.0b6aaa10.js => environment.06c2a2ae.js} (95%) rename public/admin/assets/{error.b98f46da.js => error.15134837.js} (96%) rename public/admin/assets/{file.1f9c8caf.js => file.3953c168.js} (93%) rename public/admin/assets/{filing.a50fdaf0.js => filing.15e7d221.js} (94%) rename public/admin/assets/{finance.4ae39933.js => finance.11edd0f1.js} (90%) rename public/admin/assets/{follow_reply.2c82fd9f.js => follow_reply.a00abc09.js} (93%) rename public/admin/assets/{h5.07a39a7a.js => h5.e485668c.js} (96%) rename public/admin/assets/{icon.2111dcfe.js => icon.540f4fa1.js} (96%) rename public/admin/assets/{index.71315001.js => index.0d1c4374.js} (89%) delete mode 100644 public/admin/assets/index.18f03ac7.js rename public/admin/assets/{index.ee54d815.js => index.2059c19c.js} (67%) delete mode 100644 public/admin/assets/index.38f5faab.js rename public/admin/assets/{index.56740466.js => index.3ac11f0a.js} (93%) rename public/admin/assets/{index.36a7ea39.js => index.3c28be6f.js} (96%) rename public/admin/assets/{index.3469feab.js => index.45300070.js} (96%) create mode 100644 public/admin/assets/index.4607d47a.js rename public/admin/assets/{index.19d8323b.js => index.4c7d3240.js} (95%) rename public/admin/assets/{index.48a4b326.js => index.4e79e644.js} (97%) rename public/admin/assets/{index.ae1a243e.js => index.58b54680.js} (97%) rename public/admin/assets/{index.ff934b26.js => index.5b8228b7.js} (86%) create mode 100644 public/admin/assets/index.62a64e52.js rename public/admin/assets/{index.a14201df.js => index.66f21513.js} (94%) rename public/admin/assets/{index.1201141c.js => index.68e8c7d0.js} (95%) rename public/admin/assets/{index.c3f35ce2.js => index.7938743a.js} (98%) create mode 100644 public/admin/assets/index.7b0058f7.js delete mode 100644 public/admin/assets/index.7c5c8d56.js rename public/admin/assets/{index.1e41275c.js => index.7e37b5ef.js} (93%) rename public/admin/assets/{index.053972f4.js => index.93187eca.js} (93%) rename public/admin/assets/{index.61a95cac.js => index.94eee5dc.js} (90%) rename public/admin/assets/{index.ca595b55.js => index.98bba7e2.js} (88%) create mode 100644 public/admin/assets/index.a146cc7a.js rename public/admin/assets/{index.f76d3482.js => index.a15bb04c.js} (86%) rename public/admin/assets/{index.f5848b22.js => index.a3cee107.js} (95%) rename public/admin/assets/{index.634a3ae9.js => index.a5978a42.js} (97%) rename public/admin/assets/{index.cae7b92c.js => index.a97e0bd4.js} (75%) rename public/admin/assets/{index.1ae7f577.js => index.aabf5733.js} (95%) rename public/admin/assets/{index.df10c2bd.js => index.ac7469a8.js} (88%) rename public/admin/assets/{index.4408bf84.js => index.acf08945.js} (95%) rename public/admin/assets/{index.c4dc6053.js => index.b033cb19.js} (97%) delete mode 100644 public/admin/assets/index.b3c90baa.js rename public/admin/assets/{index.7ca7c5a9.js => index.b48a23e3.js} (93%) rename public/admin/assets/{index.c822c6b6.js => index.b684b635.js} (96%) rename public/admin/assets/{index.ac745dd0.js => index.b90caa8d.js} (94%) rename public/admin/assets/{index.f1f560ec.js => index.c5a54c00.js} (93%) rename public/admin/assets/{index.a05ee0ed.js => index.cf606501.js} (98%) rename public/admin/assets/{index.c54e75e2.js => index.dc602add.js} (85%) rename public/admin/assets/{index.641c9c1f.js => index.e48a4b3c.js} (95%) rename public/admin/assets/{index.aff0441b.js => index.e492f1bc.js} (94%) rename public/admin/assets/{index.63c1b5f2.js => index.e9371f07.js} (93%) create mode 100644 public/admin/assets/index.ea8fd952.js rename public/admin/assets/{index.vue_vue_type_script_setup_true_lang.967b1c62.js => index.vue_vue_type_script_setup_true_lang.2706f2d5.js} (96%) rename public/admin/assets/{index.vue_vue_type_style_index_0_lang.86c854bb.js => index.vue_vue_type_style_index_0_lang.2d317f31.js} (91%) rename public/admin/assets/{information.3bcfab72.js => information.340b8744.js} (94%) rename public/admin/assets/{journal.1ad59bcd.js => journal.bfb3bf04.js} (92%) rename public/admin/assets/{keyword_reply.d75f9915.js => keyword_reply.b522a913.js} (95%) rename public/admin/assets/{link.eea20b83.js => link.78bf42bb.js} (87%) rename public/admin/assets/{login.b56f3b7d.js => login.0b8db2e2.js} (98%) rename public/admin/assets/{login_register.54c5b1a9.js => login_register.cfe1887a.js} (95%) rename public/admin/assets/{menu.1813b4bb.js => menu.4b48eb0a.js} (96%) rename public/admin/assets/{menu.87ae1a4e.js => menu.819b6d54.js} (86%) rename public/admin/assets/{menu.ad30a713.js => menu.dae3962e.js} (78%) rename public/admin/assets/{message.e79a5473.js => message.47dcd063.js} (87%) rename public/admin/assets/{oa-attr.10805487.js => oa-attr.5ed2a38b.js} (87%) rename public/admin/assets/{oa-menu-form-edit.cbef1e33.js => oa-menu-form-edit.ad71eeff.js} (73%) rename public/admin/assets/{oa-menu-form-edit.vue_vue_type_script_setup_true_lang.3009c01e.js => oa-menu-form-edit.vue_vue_type_script_setup_true_lang.f0bc3995.js} (90%) rename public/admin/assets/{oa-menu-form.c26289a2.js => oa-menu-form.ff098bcf.js} (72%) rename public/admin/assets/{oa-menu-form.vue_vue_type_script_setup_true_lang.0fe1cf30.js => oa-menu-form.vue_vue_type_script_setup_true_lang.d0962032.js} (97%) rename public/admin/assets/{oa-phone.401d3627.js => oa-phone.07c68139.js} (92%) rename public/admin/assets/{open_setting.5d6e9636.js => open_setting.3e28b1e8.js} (96%) rename public/admin/assets/{overflow.8db98b1f.js => overflow.85c62c87.js} (96%) rename public/admin/assets/{pay.c875eba0.js => pay.79e14b43.js} (85%) rename public/admin/assets/{pc.be44eab3.js => pc.ad493ad3.js} (64%) rename public/admin/assets/{picker.71c413a3.js => picker.6e32b18e.js} (95%) rename public/admin/assets/{picker.3c951b52.js => picker.8d3cfe49.js} (97%) rename public/admin/assets/{picker.vue_vue_type_script_setup_true_lang.3b83d75e.js => picker.vue_vue_type_script_setup_true_lang.6f5c4c0a.js} (97%) rename public/admin/assets/{post.d7c84cfd.js => post.0a1c09a9.js} (86%) rename public/admin/assets/{preview-pc.61e81017.js => preview-pc.9c67176e.js} (63%) rename public/admin/assets/{preview.6068296a.js => preview.0e69a0a0.js} (62%) rename public/admin/assets/{protocol.1b17d50c.js => protocol.629480f2.js} (85%) rename public/admin/assets/{recharge_record.3c70a1ba.js => recharge_record.cf040fff.js} (95%) rename public/admin/assets/{refund-log.f5145b32.js => refund-log.dda0bbfb.js} (80%) rename public/admin/assets/{refund-log.vue_vue_type_script_setup_true_lang.5fc56384.js => refund-log.vue_vue_type_script_setup_true_lang.3cf504a8.js} (96%) rename public/admin/assets/{refund_record.e5a67a52.js => refund_record.bbc1980c.js} (97%) rename public/admin/assets/{relations-add.0d11b676.js => relations-add.cf2967ae.js} (71%) rename public/admin/assets/{relations-add.vue_vue_type_script_setup_true_lang.cd377094.js => relations-add.vue_vue_type_script_setup_true_lang.d503afc1.js} (94%) rename public/admin/assets/{rich_text.4901f9fd.js => rich_text.7d5cfd19.js} (85%) rename public/admin/assets/{role.0dca4491.js => role.261e60fd.js} (83%) rename public/admin/assets/{setting.fc8e3b3e.js => setting.b0b192a3.js} (92%) rename public/admin/assets/{setup.53b9142d.js => setup.7729eba4.js} (84%) rename public/admin/assets/{soil_monitor.6601ccc2.js => soil_monitor.846239cc.js} (85%) rename public/admin/assets/{system.7352f651.js => system.4bcf1c87.js} (91%) rename public/admin/assets/{tabbar.43c2867a.js => tabbar.fe9fa747.js} (93%) rename public/admin/assets/{upload.9b8358ce.js => upload.7b16b357.js} (94%) rename public/admin/assets/{useDictOptions.3f58fdc1.js => useDictOptions.6d454027.js} (88%) rename public/admin/assets/{useMenuOa.854d4a0d.js => useMenuOa.a15e346c.js} (93%) rename public/admin/assets/{user.59f88f3d.js => user.17a473b4.js} (82%) rename public/admin/assets/{weapp.4f5cdbbf.js => weapp.abb17747.js} (95%) rename public/admin/assets/{website.c3fcf66f.js => website.a0690a07.js} (88%) rename public/admin/assets/{wx_oa.e5bff3dd.js => wx_oa.c74a4507.js} (93%) diff --git a/admin/src/api/product.ts b/admin/src/api/product.ts new file mode 100644 index 00000000..8bee7081 --- /dev/null +++ b/admin/src/api/product.ts @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 用户列表 +export function getUserList(params: any) { + return request.get({ url: '/user.user/lists', params }, { ignoreCancelToken: true }) +} + +// 土地表列表 +export function apiLandLists(params: any) { + console.log(params) + return request.get({ url: '/land.land/lists', params }) +} + +// 产品列表列表 +export function apiProductLists(params: any) { + return request.get({ url: '/land.product/lists', params }) +} + +// 添加产品列表 +export function apiProductAdd(params: any) { + return request.post({ url: '/land.product/add', params }) +} + +// 编辑产品列表 +export function apiProductEdit(params: any) { + return request.post({ url: '/land.product/edit', params }) +} + +// 删除产品列表 +export function apiProductDelete(params: any) { + return request.post({ url: '/land.product/delete', params }) +} + +// 产品列表详情 +export function apiProductDetail(params: any) { + return request.get({ url: '/land.product/detail', params }) +} \ No newline at end of file diff --git a/admin/src/views/land/index.vue b/admin/src/views/land/index.vue index 6a048a65..bdda9027 100644 --- a/admin/src/views/land/index.vue +++ b/admin/src/views/land/index.vue @@ -37,14 +37,13 @@ + - - - +