新区域模型适配

ems-ui-cloud/src/api/basecfg/area.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询服务区列表
+// 查询区域对象列表
 export function listArea(query) {
   return request({
     url: '/ems/basecfg/area/list',
@@ -9,14 +9,7 @@ export function listArea(query) {
   })
 }
 
-export function listTotalArea() {
-  return request({
-    url: '/ems/basecfg/area/listTotal',
-    method: 'get'
-  })
-}
-
-// 查询服务区详细
+// 查询区域对象详细
 export function getArea(id) {
   return request({
     url: '/ems/basecfg/area/' + id,
@@ -24,7 +17,7 @@ export function getArea(id) {
   })
 }
 
-// 新增服务区
+// 新增区域对象
 export function addArea(data) {
   return request({
     url: '/ems/basecfg/area',
@@ -33,7 +26,7 @@ export function addArea(data) {
   })
 }
 
-// 修改服务区
+// 修改区域对象
 export function updateArea(data) {
   return request({
     url: '/ems/basecfg/area',
@@ -42,46 +35,10 @@ export function updateArea(data) {
   })
 }
 
-// 删除服务区
+// 删除区域对象
 export function delArea(id) {
   return request({
     url: '/ems/basecfg/area/' + id,
     method: 'delete'
   })
 }
-
-// 查询区域树结构
-export function areaTreeSelect(tier) {
-  return request({
-    url: '/ems/basecfg/area/areaTree?tier=' + tier,
-    method: 'get'
-  })
-}
-
-export function areaTreeSelectByCode(tier, code) {
-  return request({
-    url: '/ems/basecfg/area/areaTreeByCode?tier=' + tier + '&code=' + code,
-    method: 'get'
-  })
-}
-
-export function areaTreeSelectByTag(tier, tagCode) {
-  return request({
-    url: '/ems/basecfg/area/areaTreeByTag?tier=' + tier + '&tagCode=' + tagCode,
-    method: 'get'
-  })
-}
-
-export function areaWithFacsCategory(category, subCategory) {
-  return request({
-    url: '/ems/basecfg/area/listWithFacsCategory?facsCategory=' + category + '&facsSubCategory=' + subCategory,
-    method: 'get'
-  })
-}
-
-export function areaWithFacsCategoryAsTree(category, subCategory) {
-  return request({
-    url: '/ems/basecfg/area/listWithFacsCategoryAsTree?facsCategory=' + category + '&facsSubCategory=' + subCategory,
-    method: 'get'
-  })
-}

ems-ui-cloud/src/api/basecfg/areaold.js

@@ -0,0 +1,87 @@
+import request from '@/utils/request'
+
+// 查询服务区列表
+export function listArea(query) {
+  return request({
+    url: '/ems/basecfg/areaold/list',
+    method: 'get',
+    params: query
+  })
+}
+
+export function listTotalArea() {
+  return request({
+    url: '/ems/basecfg/areaold/listTotal',
+    method: 'get'
+  })
+}
+
+// 查询服务区详细
+export function getArea(id) {
+  return request({
+    url: '/ems/basecfg/areaold/' + id,
+    method: 'get'
+  })
+}
+
+// 新增服务区
+export function addArea(data) {
+  return request({
+    url: '/ems/basecfg/areaold',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改服务区
+export function updateArea(data) {
+  return request({
+    url: '/ems/basecfg/areaold',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除服务区
+export function delArea(id) {
+  return request({
+    url: '/ems/basecfg/areaold/' + id,
+    method: 'delete'
+  })
+}
+
+// 查询区域树结构
+export function areaTreeSelect(tier) {
+  return request({
+    url: '/ems/basecfg/areaold/areaTree?tier=' + tier,
+    method: 'get'
+  })
+}
+
+export function areaTreeSelectByCode(tier, code) {
+  return request({
+    url: '/ems/basecfg/areaold/areaTreeByCode?tier=' + tier + '&code=' + code,
+    method: 'get'
+  })
+}
+
+export function areaTreeSelectByTag(tier, tagCode) {
+  return request({
+    url: '/ems/basecfg/areaold/areaTreeByTag?tier=' + tier + '&tagCode=' + tagCode,
+    method: 'get'
+  })
+}
+
+export function areaWithFacsCategory(category, subCategory) {
+  return request({
+    url: '/ems/basecfg/areaold/listWithFacsCategory?facsCategory=' + category + '&facsSubCategory=' + subCategory,
+    method: 'get'
+  })
+}
+
+export function areaWithFacsCategoryAsTree(category, subCategory) {
+  return request({
+    url: '/ems/basecfg/areaold/listWithFacsCategoryAsTree?facsCategory=' + category + '&facsSubCategory=' + subCategory,
+    method: 'get'
+  })
+}

ems-ui-cloud/src/views/basecfg/area/index.vue

@@ -1,17 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-
-      <el-form-item label="地块名称" prop="areaName">
+      <el-form-item label="区域名称" prop="areaName">
         <el-input
           v-model="queryParams.areaName"
-          placeholder="请输入地块名称"
+          placeholder="请输入区域名称"
           clearable
           @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 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>
@@ -24,185 +23,82 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['basecfg:area:add']"
+          v-hasPermi="['ems:area:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-          type="success"
+          type="info"
           plain
-          icon="el-icon-edit"
+          icon="el-icon-sort"
           size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['basecfg:area: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="['basecfg:area:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['basecfg:area:export']"
-        >导出</el-button>
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="地块名称" align="center" prop="areaName" width="200px"/>
-      <el-table-column label="简称" align="left" prop="shortName" />
-      <el-table-column label="地块代码" align="center" prop="areaCode" width="200px" />
-      <el-table-column label="服务星级" align="center" prop="serviceStar" />
-      <el-table-column label="所在城市" align="left" prop="city" />
-      <el-table-column label="所在高速" align="left" prop="highway" />
-      <el-table-column label="方向" align="center" prop="direction" />
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="areaList"
+      row-key="areaCode"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
 
-      <el-table-column label="开业时间" align="center" prop="openDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.openDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="坐标" align="center" width="100px">
-        <template slot-scope="scope">
-          {{ scope.row.longitude + ',' + scope.row.latitude }}
-        </template>
-      </el-table-column>
+      <el-table-column label="区域名称" align="left" prop="areaName" />
+      <el-table-column label="区域简称" align="left" prop="shortName" />
+      <el-table-column label="区域编码" align="left" prop="areaCode" />
+      <el-table-column label="区域状态" align="center" prop="status" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:servicearea:edit']">
-            修改</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:servicearea:remove']">
-            删除</el-button>
-
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems:area:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['ems:area:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems:area: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="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px" class="form-inline">
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="地块代码" prop="areaCode">
-              <el-input v-model="form.areaCode" placeholder="请输入地块代码" :readonly="isReadOnly"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="地块名称" prop="areaName">
-              <el-input v-model="form.areaName" placeholder="请输入地块名称" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="地块简称" prop="shortName">
-              <el-input v-model="form.shortName" placeholder="请输入简称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="服务星级" prop="serviceStar">
-              <el-input v-model="form.serviceStar" placeholder="请输入服务星级" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="开业时间" prop="openDate" >
-              <el-date-picker clearable
-                              v-model="form.openDate"
-                              type="date"
-                              value-format="yyyy-MM-dd"
-                              placeholder="请选择开业时间" style="width: 100%">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所在城市" prop="city">
-              <el-input v-model="form.city" placeholder="请输入所在城市" />
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="所在高速" prop="highway">
-              <el-input v-model="form.highway" placeholder="请输入所在高速" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="方向" prop="direction">
-              <el-input v-model="form.direction" placeholder="请输入方向" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-        <el-col :span="24">
-          <el-form-item label="地址" prop="address">
-            <el-input v-model="form.address" placeholder="请输入地址" />
-          </el-form-item>
-        </el-col>
-        </el-row>
-
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="所有单位" prop="attrOrg">
-              <el-input v-model="form.attrOrg" placeholder="请输入所有单位" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="管理单位" prop="mgrOrg">
-              <el-input v-model="form.mgrOrg" placeholder="请输入管理单位" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="占地面积（亩）" prop="landArea">
-              <el-input v-model="form.landArea" placeholder="请输入占地面积" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="建筑面积（㎡）" prop="floorArea">
-              <el-input v-model="form.floorArea" placeholder="请输入建筑面积" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="经度" prop="longitude">
-              <el-input v-model="form.longitude" placeholder="请输入经度" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="纬度" prop="latitude">
-              <el-input v-model="form.latitude" placeholder="请输入纬度" />
-            </el-form-item>
-          </el-col>
-        </el-row>
 
+    <!-- 添加或修改区域对象对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="区域代码" prop="areaCode">
+          <el-input v-model="form.areaCode" placeholder="请输入区域代码" />
+        </el-form-item>
+        <el-form-item label="上级区域" prop="parentCode">
+          <treeselect v-model="form.parentCode" :options="areaOptions" :normalizer="normalizer" placeholder="请选择上级区域代码" />
+        </el-form-item>
+        <el-form-item label="区域名称" prop="areaName">
+          <el-input v-model="form.areaName" placeholder="请输入区域名称" />
+        </el-form-item>
+        <el-form-item label="区域简称" prop="shortName">
+          <el-input v-model="form.shortName" placeholder="请输入区域简称" />
+        </el-form-item>
+        <el-form-item label="区域描述" prop="desc">
+          <el-input v-model="form.desc" placeholder="请输入区域简称" />
+        </el-form-item>
+        <el-form-item label="显示顺序" prop="orderNum">
+          <el-input v-model="form.orderNum" placeholder="请输入显示顺序" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -213,61 +109,53 @@
 </template>
 
 <script>
-//引入后端api接口
 import { listArea, getArea, delArea, addArea, updateArea } from "@/api/basecfg/area";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Area",
+  components: {
+    Treeselect
+  },
   data() {
     return {
       // 遮罩层
       loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
       // 显示搜索条件
       showSearch: true,
-      // 总条数
-      total: 0,
-      // 服务区表格数据
+      // 区域对象表格数据
       areaList: [],
+      // 区域对象树选项
+      areaOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
       open: false,
-      isReadOnly: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         areaCode: null,
+        parentCode: null,
+        ancestors: null,
         areaName: null,
         shortName: null,
-        serviceStar: null,
-        city: null,
-        highway: null,
-        direction: null,
-        address: null,
-        attrOrg: null,
-        mgrOrg: null,
-        openDate: null,
-        landArea: null,
-        floorArea: null,
-        longitude: null,
-        latitude: null
+        desc: null,
+        orderNum: null,
+        status: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         areaCode: [
-          { required: true, message: "服务区代码不能为空", trigger: "blur" }
+          { required: true, message: "区域代码不能为空", trigger: "blur" }
         ],
         areaName: [
-          { required: true, message: "服务区名称不能为空", trigger: "blur" }
+          { required: true, message: "区域名称不能为空", trigger: "blur" }
         ],
       }
     };
@@ -276,15 +164,34 @@ export default {
     this.getList();
   },
   methods: {
-    /** 查询服务区列表 */
+    /** 查询区域对象列表 */
     getList() {
       this.loading = true;
       listArea(this.queryParams).then(response => {
-        this.areaList = response.rows;
-        this.total = response.total;
+        this.areaList = this.handleTree(response.data, "areaCode", "parentCode");
         this.loading = false;
       });
     },
+    /** 转换区域对象数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.areaCode,
+        label: node.areaName,
+        children: node.children
+      };
+    },
+	/** 查询区域对象下拉树结构 */
+    getTreeselect() {
+      listArea().then(response => {
+        this.areaOptions = [];
+        const data = { areaCode: 0, areaName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "areaCode", "parentCode");
+        this.areaOptions.push(data);
+      });
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -295,25 +202,18 @@ export default {
       this.form = {
         id: null,
         areaCode: null,
+        parentCode: null,
+        ancestors: null,
         areaName: null,
-        serviceStar: null,
-        city: null,
-        highway: null,
-        direction: null,
-        address: null,
-        attrOrg: null,
-        mgrOrg: null,
-        openDate: null,
-        landArea: null,
-        floorArea: null,
-        longitude: null,
-        latitude: null
+        shortName: null,
+        desc: null,
+        orderNum: null,
+        status: null
       };
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
@@ -321,28 +221,37 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
     /** 新增按钮操作 */
-    handleAdd() {
+    handleAdd(row) {
       this.reset();
+      this.getTreeselect();
+      if (row != null && row.areaCode) {
+        this.form.parentCode = row.areaCode;
+      } else {
+        this.form.parentCode = 0;
+      }
       this.open = true;
-      this.isReadOnly = false;
-      this.title = "添加服务区";
+      this.title = "添加区域对象";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.isReadOnly = true;
-      const id = row.id || this.ids
-      getArea(id).then(response => {
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentCode = row.areaCode;
+      }
+      getArea(row.id).then(response => {
         this.form = response.data;
         this.open = true;
-        this.title = "修改服务区";
+        this.title = "修改区域对象";
       });
     },
     /** 提交按钮 */
@@ -367,19 +276,12 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除服务区编号为"' + ids + '"的数据项？').then(function() {
-        return delArea(ids);
+      this.$modal.confirm('是否确认删除区域对象编号为"' + row.id + '"的数据项？').then(function() {
+        return delArea(row.id);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('ems/basecfg/area/export', {
-        ...this.queryParams
-      }, `area_${new Date().getTime()}.xlsx`)
     }
   }
 };

ems-ui-cloud/src/views/basecfg/areaold/index.vue

@@ -0,0 +1,386 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+      <el-form-item label="地块名称" prop="areaName">
+        <el-input
+          v-model="queryParams.areaName"
+          placeholder="请输入地块名称"
+          clearable
+          @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="['basecfg:area: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="['basecfg:area: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="['basecfg:area:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['basecfg:area:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="areaList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="地块名称" align="center" prop="areaName" width="200px"/>
+      <el-table-column label="简称" align="left" prop="shortName" />
+      <el-table-column label="地块代码" align="center" prop="areaCode" width="200px" />
+      <el-table-column label="服务星级" align="center" prop="serviceStar" />
+      <el-table-column label="所在城市" align="left" prop="city" />
+      <el-table-column label="所在高速" align="left" prop="highway" />
+      <el-table-column label="方向" align="center" prop="direction" />
+
+      <el-table-column label="开业时间" align="center" prop="openDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.openDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="坐标" align="center" width="100px">
+        <template slot-scope="scope">
+          {{ scope.row.longitude + ',' + scope.row.latitude }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text"  icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['basecfg:servicearea:edit']">
+            修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" class="deleteBtn" @click="handleDelete(scope.row)" v-hasPermi="['basecfg:servicearea: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="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px" class="form-inline">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="地块代码" prop="areaCode">
+              <el-input v-model="form.areaCode" placeholder="请输入地块代码" :readonly="isReadOnly"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地块名称" prop="areaName">
+              <el-input v-model="form.areaName" placeholder="请输入地块名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="地块简称" prop="shortName">
+              <el-input v-model="form.shortName" placeholder="请输入简称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务星级" prop="serviceStar">
+              <el-input v-model="form.serviceStar" placeholder="请输入服务星级" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="开业时间" prop="openDate" >
+              <el-date-picker clearable
+                              v-model="form.openDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择开业时间" style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所在城市" prop="city">
+              <el-input v-model="form.city" placeholder="请输入所在城市" />
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所在高速" prop="highway">
+              <el-input v-model="form.highway" placeholder="请输入所在高速" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="方向" prop="direction">
+              <el-input v-model="form.direction" placeholder="请输入方向" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+        <el-col :span="24">
+          <el-form-item label="地址" prop="address">
+            <el-input v-model="form.address" placeholder="请输入地址" />
+          </el-form-item>
+        </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所有单位" prop="attrOrg">
+              <el-input v-model="form.attrOrg" placeholder="请输入所有单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理单位" prop="mgrOrg">
+              <el-input v-model="form.mgrOrg" placeholder="请输入管理单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="占地面积（亩）" prop="landArea">
+              <el-input v-model="form.landArea" placeholder="请输入占地面积" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="建筑面积（㎡）" prop="floorArea">
+              <el-input v-model="form.floorArea" placeholder="请输入建筑面积" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="经度" prop="longitude">
+              <el-input v-model="form.longitude" placeholder="请输入经度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="纬度" prop="latitude">
+              <el-input v-model="form.latitude" placeholder="请输入纬度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+      </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>
+//引入后端api接口
+import { listArea, getArea, delArea, addArea, updateArea } from "@/api/basecfg/areaold";
+
+export default {
+  name: "Area",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 服务区表格数据
+      areaList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      isReadOnly: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        areaCode: null,
+        areaName: null,
+        shortName: null,
+        serviceStar: null,
+        city: null,
+        highway: null,
+        direction: null,
+        address: null,
+        attrOrg: null,
+        mgrOrg: null,
+        openDate: null,
+        landArea: null,
+        floorArea: null,
+        longitude: null,
+        latitude: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        areaCode: [
+          { required: true, message: "服务区代码不能为空", trigger: "blur" }
+        ],
+        areaName: [
+          { required: true, message: "服务区名称不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询服务区列表 */
+    getList() {
+      this.loading = true;
+      listArea(this.queryParams).then(response => {
+        this.areaList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        areaCode: null,
+        areaName: null,
+        serviceStar: null,
+        city: null,
+        highway: null,
+        direction: null,
+        address: null,
+        attrOrg: null,
+        mgrOrg: null,
+        openDate: null,
+        landArea: null,
+        floorArea: null,
+        longitude: null,
+        latitude: 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.isReadOnly = false;
+      this.title = "添加服务区";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.isReadOnly = true;
+      const id = row.id || this.ids
+      getArea(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) {
+            updateArea(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addArea(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 delArea(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/basecfg/area/export', {
+        ...this.queryParams
+      }, `area_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>