From a0e69726a7aab12ac78da281a5ce8921e1eacbba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E8=82=83?= <15833576927@163.com>
Date: Tue, 21 May 2024 11:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=97=E5=88=97=E8=A1=A8=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/baseSelection/index.vue |  18 +-
 src/layout/components/Navbar.vue       |   2 +-
 src/views/system/base/baseTable.vue    | 580 +++++++------------------
 src/views/system/base/massifForm.vue   |   3 +-
 src/views/system/base/massifMap.vue    |   6 +
 5 files changed, 163 insertions(+), 446 deletions(-)

diff --git a/src/components/baseSelection/index.vue b/src/components/baseSelection/index.vue
index 7d7bf6e..a447664 100644
--- a/src/components/baseSelection/index.vue
+++ b/src/components/baseSelection/index.vue
@@ -2,18 +2,18 @@
 import useSettingsStore from "@/store/modules/settings.js";
 
 const baseList = ref([
-  {id: 1, baseName: '广西农投基地'},
-  {id: 2, baseName: '广西农垦基地'},
-  {id: 4, baseName: '基地3'},
-  {id: 3, baseName: '基地4'},
-  {id: 5, baseName: '种植资源圃1'},
-  {id: 6, baseName: '种植资源圃2'},
+  {baseId: 1, baseName: '广西农投基地'},
+  {baseId: 2, baseName: '广西农垦基地'},
+  {baseId: 4, baseName: '基地3'},
+  {baseId: 3, baseName: '基地4'},
+  {baseId: 5, baseName: '种植资源圃1'},
+  {baseId: 6, baseName: '种植资源圃2'},
 ])
 const route = useRoute();
 onMounted(()=>{
   if (route.query.baseId){
     baseList.value.forEach(item => {
-      if (item.id === Number(route.query.baseId)){
+      if (item.baseId === Number(route.query.baseId)){
         clickBase(item)
       }
     })
@@ -36,8 +36,8 @@ const clickBase = (item) => {
     <title-divider title="育种基地/资源圃"></title-divider>
     <div class="base-list">
       <div class="base-item" v-for="item in baseList" @click="clickBase(item)">
-        <i-local-two theme="filled" size="22" :fill="currentBase.id !== item.id ? '#6c6c6c' : theme"/>
-        <div class="base-name" :class="{'base-active':currentBase.id === item.id}">{{item.baseName}}</div>
+        <i-local-two theme="filled" size="22" :fill="currentBase.baseId !== item.baseId ? '#6c6c6c' : theme"/>
+        <div class="base-name" :class="{'base-active':currentBase.baseId === item.baseId}">{{item.baseName}}</div>
       </div>
     </div>
   </div>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index aa28116..6fff674 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -7,7 +7,7 @@
 
     <div class="right-menu">
       <template v-if="appStore.device !== 'mobile'">
-        <header-search id="header-search" class="right-menu-item" />
+        <header-search v-if="false" id="header-search" class="right-menu-item" />
         <el-tooltip content="显示大屏" effect="dark" placement="bottom">
           <i-tv class="right-menu-item" theme="outline" size="24" :fill="iconColor"/>
         </el-tooltip>
diff --git a/src/views/system/base/baseTable.vue b/src/views/system/base/baseTable.vue
index b2817ec..be81579 100644
--- a/src/views/system/base/baseTable.vue
+++ b/src/views/system/base/baseTable.vue
@@ -11,117 +11,99 @@
           <el-col :span="6" class="current-base-name">当前基地：{{currentBase.baseName || '请选择基地'}}</el-col>
           <el-col :span="6" class="current-base-total"><i-pound theme="filled" size="16" fill="#333"/>地块总数：{{currentBase.baseName || '请选择基地'}}</el-col>
           <el-col :span="6" class="current-base-area"><i-chart-line-area size="16" fill="#333"/>地块面积：{{currentBase.area || '请选择基地'}}</el-col>
-          <el-col :span="6" class="handoff-model" @click="toBaseMap"><el-button type="text">切换地图模式</el-button></el-col>
+          <el-col :span="6" class="handoff-model" @click="toBaseMap(false)"><el-link type="primary">切换地图模式</el-link></el-col>
         </el-row>
         <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-                v-model="queryParams.userName"
-                placeholder="请输入用户名称"
-                clearable
-                style="width: 240px"
-                @keyup.enter="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-                v-model="queryParams.phonenumber"
-                placeholder="请输入手机号码"
-                clearable
-                style="width: 240px"
-                @keyup.enter="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="状态" prop="status">
-            <el-select
-                v-model="queryParams.status"
-                placeholder="用户状态"
-                clearable
-                style="width: 240px"
-            >
-              <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="创建时间" style="width: 308px;">
-            <el-date-picker
-                v-model="dateRange"
-                value-format="YYYY-MM-DD"
-                type="daterange"
-                range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
+          <el-row :gutter="10">
+            <el-col :span="6">
+              <el-form-item label="种植季">
+                <el-select v-model="queryParams.plantingSeason">
+                  <el-option v-for="item in plantingSeasonList" :value="item.value" :label="item.label"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="地块名称">
+                <el-input
+                    v-model="queryParams.userName"
+                    placeholder="请输入地块"
+                    clearable
+                    @keyup.enter="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="地块性质" prop="status">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="地块性质"
+                    clearable
+                >
+                  <el-option
+                      v-for="item in massifType"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="当前作物" prop="status">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="当前作物"
+                    clearable
+                >
+                  <el-option
+                      v-for="item in cropClass"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="地块状态" prop="status">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="地块状态"
+                    clearable
+                >
+                  <el-option
+                      v-for="dict in sys_normal_disable"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :offset="12">
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
-
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-                type="primary"
-                plain
-                icon="Plus"
-                @click="handleAdd"
-                v-hasPermi="['system:user:add']"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="success"
-                plain
-                icon="Edit"
-                :disabled="single"
-                @click="handleUpdate"
-                v-hasPermi="['system:user:edit']"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="danger"
-                plain
-                icon="Delete"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['system:user:remove']"
-            >删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="info"
-                plain
-                icon="Upload"
-                @click="handleImport"
-                v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-                type="warning"
-                plain
-                icon="Download"
-                @click="handleExport"
-                v-hasPermi="['system:user:export']"
-            >导出</el-button>
-          </el-col>
+          <el-button type="primary" icon="Download" @click="exportExcel">导出Excel</el-button>
+          <el-button type="primary" icon="Plus" @click="toAddMassif" :disabled="!currentBase.baseId">坐标点新增地块</el-button>
+          <el-button type="primary" icon="EditPen" @click="toBaseMap(true)" :disabled="!currentBase.baseId">绘制地块</el-button>
           <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column label="地块编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="地块名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="地块面积(亩)" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="网格地块数量" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="地块性质" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="当前作物" align="center" key="phonenumber" prop="phonenumber" v-if="columns[5].visible" width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[6].visible">
             <template #default="scope">
               <el-switch
                   v-model="scope.row.status"
@@ -131,25 +113,23 @@
               ></el-switch>
             </template>
           </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建人" align="center" prop="createTime" v-if="columns[7].visible" width="160"></el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[8].visible" width="160">
             <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
             <template #default="scope">
+              <el-tooltip content="详情" placement="top">
+                <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"></el-button>
+              </el-tooltip>
               <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
                 <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
               </el-tooltip>
               <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
                 <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
               </el-tooltip>
-              <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
-                <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"></el-button>
-              </el-tooltip>
-              <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
-                <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
-              </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
@@ -162,165 +142,18 @@
         />
       </el-col>
     </el-row>
-
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" v-model="open" width="600px" append-to-body>
-      <el-form :model="form" :rules="rules" ref="userRef" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <el-tree-select
-                  v-model="form.deptId"
-                  :data="deptOptions"
-                  :props="{ value: 'id', label: 'label', children: 'children' }"
-                  value-key="id"
-                  placeholder="请选择归属部门"
-                  check-strictly
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择">
-                <el-option
-                    v-for="dict in sys_user_sex"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                    v-for="dict in sys_normal_disable"
-                    :key="dict.value"
-                    :label="dict.value"
-                >{{ dict.label }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择">
-                <el-option
-                    v-for="item in postOptions"
-                    :key="item.postId"
-                    :label="item.postName"
-                    :value="item.postId"
-                    :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择">
-                <el-option
-                    v-for="item in roleOptions"
-                    :key="item.roleId"
-                    :label="item.roleName"
-                    :value="item.roleId"
-                    :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
-      <el-upload
-          ref="uploadRef"
-          :limit="1"
-          accept=".xlsx, .xls"
-          :headers="upload.headers"
-          :action="upload.url + '?updateSupport=' + upload.updateSupport"
-          :disabled="upload.isUploading"
-          :on-progress="handleFileUploadProgress"
-          :on-success="handleFileSuccess"
-          :auto-upload="false"
-          drag
-      >
-        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <template #tip>
-          <div class="el-upload__tip text-center">
-            <div class="el-upload__tip">
-              <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-            </div>
-            <span>仅允许导入xls、xlsx格式文件。</span>
-            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-          </div>
-        </template>
-      </el-upload>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitFileForm">确 定</el-button>
-          <el-button @click="upload.open = false">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <!--地块表单-->
+    <massif-form ref="massifFormRef" @submit-success="submitSuccess"/>
   </div>
 </template>
 
 <script setup name="User">
-import { getToken } from "@/utils/auth";
 import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
-
+import MassifForm from "@/views/system/base/massifForm.vue";
+const massifFormRef = ref(null)
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const currentBase = ref({})
 const userList = ref([]);
 const open = ref(false);
@@ -332,67 +165,67 @@ const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
 const dateRange = ref([]);
-const deptName = ref("");
-const deptOptions = ref(undefined);
-const initPassword = ref(undefined);
-const postOptions = ref([]);
-const roleOptions = ref([]);
-/*** 用户导入参数 */
-const upload = reactive({
-  // 是否显示弹出层（用户导入）
-  open: false,
-  // 弹出层标题（用户导入）
-  title: "",
-  // 是否禁用上传
-  isUploading: false,
-  // 是否更新已经存在的用户数据
-  updateSupport: 0,
-  // 设置上传的请求头部
-  headers: { Authorization: "Bearer " + getToken() },
-  // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
-});
 // 列显隐信息
 const columns = ref([
-  { key: 0, label: `用户编号`, visible: true },
-  { key: 1, label: `用户名称`, visible: true },
-  { key: 2, label: `用户昵称`, visible: true },
-  { key: 3, label: `部门`, visible: true },
-  { key: 4, label: `手机号码`, visible: true },
-  { key: 5, label: `状态`, visible: true },
-  { key: 6, label: `创建时间`, visible: true }
+  { key: 0, label: `地块编号`, visible: true },
+  { key: 1, label: `地块名称`, visible: true },
+  { key: 2, label: `地块面积`, visible: true },
+  { key: 3, label: `网格地块数量`, visible: true },
+  { key: 4, label: `地块性质`, visible: true },
+  { key: 5, label: `当前作物`, visible: true },
+  { key: 6, label: `状态`, visible: true },
+  { key: 7, label: `创建人`, visible: true },
+  { key: 8, label: `创建时间`, visible: true },
 ]);
+// 打开添加弹窗
+const toAddMassif = () => {
+  massifFormRef.value.toAdd({
+    baseName:currentBase.value.baseName,
+    baseId:currentBase.value.baseId
+  })
+}
+const toUpdateMassif = (row) => {
+  massifFormRef.value.toUpdate(row)
+}
+const toViewMassif = (row) => {
+  massifFormRef.value.toView(row)
+}
+const exportExcel = () => {
 
+}
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     userName: undefined,
-    phonenumber: undefined,
+    plantingSeason: 2023,
     status: undefined,
     deptId: undefined
   },
-  rules: {
-    userName: [{ required: true, message: "用户名称不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
-    nickName: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
-    password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }, { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }],
-    email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
-    phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
-  }
+  plantingSeasonList:[
+    {value: 2023, label: '2023年种植季'},
+    {value: 2024, label: '2024年种植季'},
+  ],
+  // 地块性质
+  massifType: [
+    {label: '旱地', value: 1},
+    {label: '水浇地', value: 2},
+    {label: '水田', value: 2},
+  ],
+  // 作物种类
+  cropClass: [
+    {label: '甘蔗', value: 1},
+    {label: '其他', value: 9},
+  ]
 });
+// 提交成功回调
+const submitSuccess = (value) =>{
 
-const { queryParams, form, rules } = toRefs(data);
+}
+const { queryParams, form, rules ,
+  plantingSeasonList,massifType,cropClass} = toRefs(data);
 
-/** 通过条件过滤节点  */
-const filterNode = (value, data) => {
-  if (!value) return true;
-  return data.label.indexOf(value) !== -1;
-};
-/** 根据名称筛选部门树 */
-watch(deptName, val => {
-  proxy.$refs["deptTreeRef"].filter(val);
-});
 /** 查询用户列表 */
 function getList() {
   loading.value = true;
@@ -402,11 +235,6 @@ function getList() {
     total.value = res.total;
   });
 };
-/** 节点单击事件 */
-function handleNodeClick(data) {
-  queryParams.value.deptId = data.id;
-  handleQuery();
-};
 /** 搜索按钮操作 */
 function handleQuery() {
   queryParams.value.pageNum = 1;
@@ -447,148 +275,27 @@ function handleStatusChange(row) {
     row.status = row.status === "0" ? "1" : "0";
   });
 };
-/** 更多操作 */
-function handleCommand(command, row) {
-  switch (command) {
-    case "handleResetPwd":
-      handleResetPwd(row);
-      break;
-    case "handleAuthRole":
-      handleAuthRole(row);
-      break;
-    default:
-      break;
-  }
-};
-/** 跳转角色分配 */
-function handleAuthRole(row) {
-  const userId = row.userId;
-  router.push("/system/user-auth/role/" + userId);
-};
-/** 重置密码按钮操作 */
-function handleResetPwd(row) {
-  proxy.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    closeOnClickModal: false,
-    inputPattern: /^.{5,20}$/,
-    inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
-    inputValidator: (value) => {
-      if (/<|>|"|'|\||\\/.test(value)) {
-        return "不能包含非法字符：< > \" ' \\\ |"
-      }
-    },
-  }).then(({ value }) => {
-    resetUserPwd(row.userId, value).then(response => {
-      proxy.$modal.msgSuccess("修改成功，新密码是：" + value);
-    });
-  }).catch(() => {});
-};
 /** 选择条数  */
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.userId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 };
-/** 导入按钮操作 */
-function handleImport() {
-  upload.title = "用户导入";
-  upload.open = true;
-};
-/** 下载模板操作 */
-function importTemplate() {
-  proxy.download("system/user/importTemplate", {
-  }, `user_template_${new Date().getTime()}.xlsx`);
-};
-/**文件上传中处理 */
-const handleFileUploadProgress = (event, file, fileList) => {
-  upload.isUploading = true;
-};
-/** 文件上传成功处理 */
-const handleFileSuccess = (response, file, fileList) => {
-  upload.open = false;
-  upload.isUploading = false;
-  proxy.$refs["uploadRef"].handleRemove(file);
-  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-  getList();
-};
-/** 提交上传文件 */
-function submitFileForm() {
-  proxy.$refs["uploadRef"].submit();
-};
-/** 重置操作表单 */
-function reset() {
-  form.value = {
-    userId: undefined,
-    deptId: undefined,
-    userName: undefined,
-    nickName: undefined,
-    password: undefined,
-    phonenumber: undefined,
-    email: undefined,
-    sex: undefined,
-    status: "0",
-    remark: undefined,
-    postIds: [],
-    roleIds: []
-  };
-  proxy.resetForm("userRef");
-};
-/** 取消按钮 */
-function cancel() {
-  open.value = false;
-  reset();
-};
-/** 新增按钮操作 */
-function handleAdd() {
-  reset();
-  getUser().then(response => {
-    postOptions.value = response.posts;
-    roleOptions.value = response.roles;
-    open.value = true;
-    title.value = "添加用户";
-    form.value.password = initPassword.value;
-  });
-};
 /** 修改按钮操作 */
 function handleUpdate(row) {
   reset();
   const userId = row.userId || ids.value;
   getUser(userId).then(response => {
     form.value = response.data;
-    postOptions.value = response.posts;
-    roleOptions.value = response.roles;
-    form.value.postIds = response.postIds;
-    form.value.roleIds = response.roleIds;
     open.value = true;
     title.value = "修改用户";
     form.password = "";
   });
 };
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["userRef"].validate(valid => {
-    if (valid) {
-      if (form.value.userId != undefined) {
-        updateUser(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          open.value = false;
-          getList();
-        });
-      } else {
-        addUser(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          open.value = false;
-          getList();
-        });
-      }
-    }
-  });
-};
 // 切换地图模式
-const toBaseMap = () => {
-  if (currentBase.value.id){
-    router.push('/system/base/massifMap/'+currentBase.value.id)
+const toBaseMap = (toAdd) => {
+  if (currentBase.value.baseId){
+    router.push({path:'/system/base/massifMap/'+currentBase.value.baseId,query:toAdd?{toAdd:true}:{}})
   }else{
     router.push('/system/base/mapMarkers')
   }
@@ -602,4 +309,7 @@ const toBaseMap = () => {
     text-align: right;
   }
 }
+.el-form-item{
+  width: 100%;
+}
 </style>
diff --git a/src/views/system/base/massifForm.vue b/src/views/system/base/massifForm.vue
index 24b8ccf..6d79665 100644
--- a/src/views/system/base/massifForm.vue
+++ b/src/views/system/base/massifForm.vue
@@ -190,7 +190,8 @@ const rules = ref({
             </el-col>
             <el-col :span="12">
               <el-form-item label="所属基地/资源圃" prop="name">
-                <el-input disabled v-if="formStatus!==3"></el-input>
+                <el-input disabled v-if="formStatus!==3" v-model="formData.baseName"></el-input>
+                <div v-else>{{formData.baseName}}</div>
               </el-form-item>
             </el-col>
             <el-col :span="12">
diff --git a/src/views/system/base/massifMap.vue b/src/views/system/base/massifMap.vue
index f798bef..11bdb7d 100644
--- a/src/views/system/base/massifMap.vue
+++ b/src/views/system/base/massifMap.vue
@@ -398,6 +398,12 @@ const updateMassif = (value) => {
   polygonTemp.value = newPath
   computeArea(newPath)
 }
+onActivated(()=>{
+  if (Boolean(route.query.toAdd)){
+    router.replace({ query: {} });
+    addMassif()
+  }
+})
 // 点击新增地块
 const addMassif = () => {
   createdMouse.value = true