增加发展定位和园区表

src/api/info/development.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询发展定位列表
+export function listDevelopment(query) {
+  return request({
+    url: '/info/development/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询发展定位详细
+export function getDevelopment(id) {
+  return request({
+    url: '/info/development/' + id,
+    method: 'get'
+  })
+}
+
+// 新增发展定位
+export function addDevelopment(data) {
+  return request({
+    url: '/info/development',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改发展定位
+export function updateDevelopment(data) {
+  return request({
+    url: '/info/development',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除发展定位
+export function delDevelopment(id) {
+  return request({
+    url: '/info/development/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出发展定位
+export function exportDevelopment(query) {
+  return request({
+    url: '/info/development/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/info/parkInfo.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询园区对象列表
+export function listParkInfo(query) {
+  return request({
+    url: '/info/parkInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询园区对象详细
+export function getParkInfo(parkId) {
+  return request({
+    url: '/info/parkInfo/' + parkId,
+    method: 'get'
+  })
+}
+
+// 新增园区对象
+export function addParkInfo(data) {
+  return request({
+    url: '/info/parkInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改园区对象
+export function updateParkInfo(data) {
+  return request({
+    url: '/info/parkInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除园区对象
+export function delParkInfo(parkId) {
+  return request({
+    url: '/info/parkInfo/' + parkId,
+    method: 'delete'
+  })
+}
+
+// 导出园区对象
+export function exportParkInfo(query) {
+  return request({
+    url: '/info/parkInfo/export',
+    method: 'get',
+    params: query
+  })
+}

src/components/FileUpload/index.vue

@@ -159,6 +159,7 @@ export default {
     },
     // 删除文件
     handleDelete(index) {
+      this.$emit('file-deleted');
       this.fileList.splice(index, 1);
       this.$emit("input", this.listToString(this.fileList));
     },

src/views/info/development/index.vue

@@ -0,0 +1,307 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+      <el-form-item label="名称" prop="developmentName">
+        <el-input
+          v-model="queryParams.developmentName"
+          placeholder="请输入名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="文件名称" prop="fileName">
+        <el-input
+          v-model="queryParams.fileName"
+          placeholder="请输入文件名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="orderBy">反序</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['info:development:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['info:development:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['info:development:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['info:development:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="developmentList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="名称" align="center" prop="developmentName" />
+      <el-table-column label="内容" align="center" prop="content" />
+<!--      <el-table-column label="文件路径" align="center" prop="url" />-->
+      <el-table-column label="文件名称" align="center" prop="fileName" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['info:development:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['info:development:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改发展定位对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="名称" prop="developmentName">
+          <el-input v-model="form.developmentName" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <el-input v-model="form.content" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="文件">
+          <fileUpload :limit="1" v-model="form.url" @fatherMethod="fatherMethod" @file-uploaded="handleFileUploaded"  @file-deleted="handleFileDeleted" />
+        </el-form-item>
+        <el-form-item label="文件名称" prop="fileName">
+          <el-input v-model="form.fileName" placeholder="请输入文件名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDevelopment, getDevelopment, delDevelopment, addDevelopment, updateDevelopment, exportDevelopment } from "@/api/info/development";
+
+export default {
+  name: "Development",
+  data() {
+    return {
+      isDesc: false,
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 发展定位表格数据
+      developmentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        developmentName: null,
+        fileName: null,
+        orderBy: ''
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+
+    orderBy(){
+      this.isDesc = !this.isDesc; // 切换排序顺序的状态
+      this.queryParams.orderBy = this.isDesc ? "DESC" : ""; // 根据状态设置 orderBy 值
+      this.handleQuery();
+    },
+
+
+    handleFileDeleted() {
+      // 清除 form.fileName
+      this.form.fileName = '';
+    },
+
+    handleFileUploaded(fileName) {
+      this.form.fileName = fileName;
+    },
+    fatherMethod(fileName){
+      this.form.fileName += fileName + " " ;
+    },
+    /** 查询发展定位列表 */
+    getList() {
+      this.loading = true;
+      listDevelopment(this.queryParams).then(response => {
+        this.developmentList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        content: null,
+        developmentName: null,
+        url: null,
+        fileName: null,
+        createTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加发展定位";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDevelopment(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改发展定位";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDevelopment(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDevelopment(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除发展定位编号为"' + ids + '"的数据项？').then(function() {
+        return delDevelopment(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有发展定位数据项？').then(() => {
+        this.exportLoading = true;
+        return exportDevelopment(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/info/equipmentInfo/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
-      <el-form-item label="房间" prop="roomId">
-        <template>
-          <el-select v-model="queryParams.roomId" filterable placeholder="请选择">
-            <el-option
-              v-for="item in roomList"
-              :key="item.roomId"
-              :label="item.roomName"
-              :value="item.roomId">
-            </el-option>
-          </el-select>
-        </template>
-      </el-form-item>
+<!--      <el-form-item label="房间" prop="roomId">-->
+<!--        <template>-->
+<!--          <el-select v-model="queryParams.roomId" filterable placeholder="请选择">-->
+<!--            <el-option-->
+<!--              v-for="item in roomList"-->
+<!--              :key="item.roomId"-->
+<!--              :label="item.roomName"-->
+<!--              :value="item.roomId">-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </template>-->
+<!--      </el-form-item>-->
       <el-form-item label="大楼" prop="buildingId">
         <template>
           <el-select v-model="queryParams.buildingId" filterable placeholder="请选择">
@@ -37,6 +37,16 @@
           </el-select>
         </template>
       </el-form-item>
+      <el-form-item label="园区" prop="parkId">
+        <el-select v-model="queryParams.parkId" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="item in parkList"
+            :key="item.parkId"
+            :label="item.parkName"
+            :value="item.parkId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="名称" prop="equipmentName">
         <el-input
           v-model="queryParams.equipmentName"
@@ -249,6 +259,16 @@
             </el-select>
           </template>
         </el-form-item>
+        <el-form-item label="园区" prop="parkId">
+          <el-select v-model="form.parkId" placeholder="请选择" clearable size="small">
+            <el-option
+              v-for="item in parkList"
+              :key="item.parkId"
+              :label="item.parkName"
+              :value="item.parkId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="设备编号" prop="equipCode">
           <el-input v-model="form.equipCode" placeholder="请输入" />
         </el-form-item>
@@ -321,11 +341,14 @@ import { listBuildingInfo, getBuildingInfo } from "@/api/info/buildingInfo";
 import { listAreaInfo, getAreaInfo } from "@/api/info/areaInfo";
 import { listRoomInfo, getRoomInfo } from "@/api/info/roomInfo";
 import { listEquipmentType, getEquipmentType } from "@/api/type/equipmentType";
+import { listParkInfo, getParkInfo, delParkInfo, addParkInfo, updateParkInfo, exportParkInfo } from "@/api/info/parkInfo";
+
 export default {
   name: "EquipmentInfo",
   dicts: ['equipment_info_type', 'device_status', 'equip_brand'],
   data() {
     return {
+      parkList: [],
       dialogVisible: false,
       map: null,
       handler: null,
@@ -365,7 +388,8 @@ export default {
         lngLat: null,
         rasterLngLat: null,
         typeName: null,
-        status: null
+        status: null,
+        parkId: null,
       },
       queryBuildingParams: {
         pageNum: 1,
@@ -387,9 +411,18 @@ export default {
     this.getRoomList();
     this.getAreaList();
     this.getEquipmentTypeList();
+    this.getParkList();
 
   },
   methods: {
+
+    getParkList() {
+      listParkInfo(this.queryBuildingParams).then(response => {
+        this.parkList = response.data.list;
+      });
+    },
+
+
     // 销毁天地图
     destructionTMap ()  {
       if (this.map) {
@@ -538,6 +571,7 @@ export default {
         status: null,
         brand: null,
         equipCode: null,
+        parkId: null,
 
       };
       this.resetForm("form");

src/views/info/forewarningInfo/index.vue

@@ -22,6 +22,16 @@
           </el-select>
         </template>
       </el-form-item>
+      <el-form-item label="园区" prop="parkId">
+        <el-select v-model="queryParams.parkId" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="item in parkList"
+            :key="item.parkId"
+            :label="item.parkName"
+            :value="item.parkId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="是否解决" prop="isResolve">
         <el-select v-model="queryParams.isResolve" placeholder="请选择是否解决" clearable size="small">
           <el-option
@@ -161,6 +171,16 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="园区" prop="parkId">
+          <el-select v-model="form.parkId" placeholder="请选择" clearable size="small">
+            <el-option
+              v-for="item in parkList"
+              :key="item.parkId"
+              :label="item.parkName"
+              :value="item.parkId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="设备名" prop="equipmentName">
           <el-input v-model="form.equipmentName" placeholder="请输入设备名" />
         </el-form-item>
@@ -194,12 +214,14 @@
 <script>
 import { listForewarningInfo, getForewarningInfo, delForewarningInfo, addForewarningInfo, updateForewarningInfo, exportForewarningInfo } from "@/api/info/forewarningInfo";
 import { listEquipmentInfo } from "@/api/info/equipmentInfo";
+import { listParkInfo, getParkInfo, delParkInfo, addParkInfo, updateParkInfo, exportParkInfo } from "@/api/info/parkInfo";
 
 export default {
   name: "ForewarningInfo",
   dicts: ['sys_yes_no'],
   data() {
     return {
+      parkList: [],
       equipmentList: [],
       // 遮罩层
       loading: true,
@@ -228,7 +250,8 @@ export default {
         forewarningName: null,
         equipmentId: null,
         isResolve: null,
-        resolveTime: null
+        resolveTime: null,
+        parkId: null
       },
       queryEquipmentParams: {
         pageNum: 1,
@@ -247,9 +270,16 @@ export default {
   created() {
     this.getList();
     this.getEquipmentList();
+    this.getParkList();
   },
   methods: {
 
+    getParkList() {
+      listParkInfo(this.queryEquipmentParams).then(response => {
+        this.parkList = response.data.list;
+      });
+    },
+
     onEquipmentChange(equipmentId) {
       const selectedEquipment = this.equipmentList.find(equipment => equipment.equipmentId === equipmentId);
       if (selectedEquipment) {
@@ -290,7 +320,8 @@ export default {
         equipmentName: null,
         createTime: null,
         isResolve: null,
-        resolveTime: null
+        resolveTime: null,
+        parkId: null
       };
       this.resetForm("form");
     },

src/views/info/organizationInfo/index.vue

@@ -49,6 +49,16 @@
           </el-select>
         </template>
       </el-form-item>
+      <el-form-item label="园区" prop="parkId">
+        <el-select v-model="queryParams.parkId" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="item in parkList"
+            :key="item.parkId"
+            :label="item.parkName"
+            :value="item.parkId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="户型" prop="houseTypeId">
         <template>
           <el-select v-model="queryParams.houseTypeId" filterable placeholder="请选择">
@@ -270,6 +280,16 @@
             </el-select>
           </template>
         </el-form-item>
+        <el-form-item label="园区" prop="parkId">
+          <el-select v-model="form.parkId" placeholder="请选择" clearable size="small">
+            <el-option
+              v-for="item in parkList"
+              :key="item.parkId"
+              :label="item.parkName"
+              :value="item.parkId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="户型" prop="houseTypeId">
           <template>
             <el-select v-model="form.houseTypeId" filterable placeholder="请选择">
@@ -368,11 +388,14 @@ import { listAreaInfo, getAreaInfo } from "@/api/info/areaInfo";
 import { listRoomInfo, getRoomInfo } from "@/api/info/roomInfo";
 import { listOrganizationType, getOrganizationType } from "@/api/type/organizationType";
 import { listHouseType, getHouseType } from "@/api/type/houseType";
+import { listParkInfo, getParkInfo, delParkInfo, addParkInfo, updateParkInfo, exportParkInfo } from "@/api/info/parkInfo";
+
 export default {
   name: "OrganizationInfo",
   dicts: ['sys_yes_no', 'industry_type'],
   data() {
     return {
+      parkList: [],
       dialogVisible: false,
       map: null,
       handler: null,
@@ -415,6 +438,7 @@ export default {
         important: null,
         industryType: null,
         houseTypeId: null,
+        parkId: null,
       },
       queryBuildingParams: {
         pageNum: 1,
@@ -437,9 +461,16 @@ export default {
     this.getAreaList();
     this.getOrganizationTypeList();
     this.getHouseTypeLst();
+    this.getParkList();
   },
   methods: {
 
+    getParkList() {
+      listParkInfo(this.queryBuildingParams).then(response => {
+        this.parkList = response.data.list;
+      });
+    },
+
 
     // 销毁天地图
     destructionTMap ()  {
@@ -608,6 +639,7 @@ export default {
         industryType: null,
         houseTypeId: null,
         floor: null,
+        parkId: null,
       };
       this.resetForm("form");
     },

src/views/info/parkInfo/index.vue

@@ -0,0 +1,270 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
+      <el-form-item label="园区名称" prop="parkName">
+        <el-input
+          v-model="queryParams.parkName"
+          placeholder="请输入园区名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['info:parkInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['info:parkInfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['info:parkInfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['info:parkInfo:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="parkInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="园区id" align="center" prop="parkId" />
+      <el-table-column label="园区名称" align="center" prop="parkName" />
+      <el-table-column label="坐标" align="center" prop="location" />
+      <el-table-column label="备注" align="center" prop="memo" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['info:parkInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['info:parkInfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改园区对象对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="园区名称" prop="parkName">
+          <el-input v-model="form.parkName" placeholder="请输入园区名称" />
+        </el-form-item>
+        <el-form-item label="坐标" prop="location">
+          <el-input v-model="form.location" placeholder="请输入坐标" />
+        </el-form-item>
+        <el-form-item label="备注" prop="memo">
+          <el-input v-model="form.memo" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listParkInfo, getParkInfo, delParkInfo, addParkInfo, updateParkInfo, exportParkInfo } from "@/api/info/parkInfo";
+
+export default {
+  name: "ParkInfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 园区对象表格数据
+      parkInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        parkName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parkId: [
+          { required: true, message: "园区id不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询园区对象列表 */
+    getList() {
+      this.loading = true;
+      listParkInfo(this.queryParams).then(response => {
+        this.parkInfoList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        parkId: null,
+        parkName: null,
+        location: null,
+        memo: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.parkId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加园区对象";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const parkId = row.parkId || this.ids
+      getParkInfo(parkId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改园区对象";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      if (this.form.location){
+        this.form.location = JSON.parse(this.form.location)
+      }
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.parkId != null) {
+            updateParkInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addParkInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const parkIds = row.parkId || this.ids;
+      this.$modal.confirm('是否确认删除园区对象编号为"' + parkIds + '"的数据项？').then(function() {
+        return delParkInfo(parkIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有园区对象数据项？').then(() => {
+        this.exportLoading = true;
+        return exportParkInfo(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/info/policyInfo/index.vue

@@ -151,7 +151,7 @@
           <el-input v-model="form.policyName" placeholder="请输入政策名称" />
         </el-form-item>
         <el-form-item label="政策文件">
-          <fileUpload v-model="form.url" @fatherMethod="fatherMethod" @file-uploaded="handleFileUploaded" />
+          <fileUpload :limit="1" v-model="form.url" @fatherMethod="fatherMethod" @file-uploaded="handleFileUploaded"  @file-deleted="handleFileDeleted" />
         </el-form-item>
         <el-form-item label="文件名" prop="fileName">
           <el-input v-model="form.fileName" placeholder="请输入文件名" />
@@ -228,6 +228,11 @@ export default {
       this.handleQuery();
     },
 
+    handleFileDeleted() {
+      // 清除 form.fileName
+      this.form.fileName = '';
+    },
+
     handleFileUploaded(fileName) {
       this.form.fileName = fileName;
     },

src/views/system/dict/data.vue

@@ -30,6 +30,16 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="园区" prop="parkId">
+        <el-select v-model="queryParams.parkId" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="item in parkList"
+            :key="item.parkId"
+            :label="item.parkName"
+            :value="item.parkId"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -139,6 +149,16 @@
         <el-form-item label="字典类型">
           <el-input v-model="form.dictType" :disabled="true" />
         </el-form-item>
+        <el-form-item label="园区" prop="parkId">
+          <el-select v-model="form.parkId" placeholder="请选择" clearable size="small">
+            <el-option
+              v-for="item in parkList"
+              :key="item.parkId"
+              :label="item.parkName"
+              :value="item.parkId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="数据标签" prop="dictLabel">
           <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
         </el-form-item>
@@ -182,12 +202,14 @@
 <script>
 import { listData, getData, delData, addData, updateData, exportData } from "@/api/system/dict/data";
 import { listType, getType } from "@/api/system/dict/type";
+import { listParkInfo, getParkInfo, delParkInfo, addParkInfo, updateParkInfo, exportParkInfo } from "@/api/info/parkInfo";
 
 export default {
   name: "Data",
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      parkList: [],
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -247,6 +269,10 @@ export default {
         dictType: undefined,
         status: undefined
       },
+      queryParkParams: {
+        pageNum: 1,
+        pageSize: 999999,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -267,8 +293,16 @@ export default {
     const dictId = this.$route.params && this.$route.params.dictId;
     this.getType(dictId);
     this.getTypeList();
+    this.getParkList();
   },
   methods: {
+
+    getParkList() {
+      listParkInfo(this.queryParkParams).then(response => {
+        this.parkList = response.data.list;
+      });
+    },
+
     /** 查询字典类型详细 */
     getType(dictId) {
       getType(dictId).then(response => {
@@ -312,6 +346,7 @@ export default {
         status: true,
         remark: undefined,
         icon: null,
+        parkId: undefined
       };
       this.resetForm("form");
     },