提交

src/views/catenary/checklist/view/bl/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/checklist/view/dc/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/checklist/view/fd/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/checklist/view/gl/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/checklist/view/jc/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/checklist/view/wjc/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/record/view/bl/CheckAndEditModel.vue

@@ -1,147 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="700"
-    :visible="visible"
-    :mask-closable="false"
-    cancel-text="关闭"
-    @close="close"
-  >
-    <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
-      </a-form-model-item>
-      <a-form-model-item label="所属部门" prop="bm">
-      </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
-        <j-dict-select-tag
-          v-model="model.xb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
-        <j-dict-select-tag
-          v-model="model.qj"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.hb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
-      </a-form-model-item>
-      <a-form-model-item label="支柱类型" prop="zzlx">
-        <j-dict-select-tag
-          v-model="model.zzlx"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱型号" prop="zzxh">
-        <j-dict-select-tag
-          v-model="model.zzxh"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱用途" prop="zzyt">
-        <j-dict-select-tag
-          v-model="model.zzyt"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="材质" prop="cz">
-        <j-dict-select-tag
-          v-model="model.cz"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="直线/曲外/曲内" prop="zxqwqn">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.zxqwqn"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-    </a-form-model>
-  </j-modal>
-</template>
-<script>
-import { httpAction } from '@/api/request'
-import JModal from '@/components/JModal'
-export default {
-  name: 'CheckAndEditModel',
-  components: {
-    JModal
-  },
-  data() {
-    return {
-      labelCol: { span: 4 },
-      wrapperCol: { span: 19 },
-      dataSource: [],
-      title: '',
-      visible: false,
-      isCheck: false,
-      model: {},
-      validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
-      },
-      url: {
-        add: '/business/catenary/bus/zzdzxx/add',
-        edit: '/business/catenary/bus/zzdzxx/update'
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    add() {
-      this.model = {}
-      this.visible = true
-    },
-    edit(record) {
-      this.model = Object.assign({}, record)
-      this.visible = true
-    },
-    close(isSubmit) {
-      if (isSubmit) {
-        this.checkData()
-      } else {
-        this.visible = false
-      }
-    },
-    checkData() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.saveData()
-        } else {
-          return false
-        }
-      })
-    },
-    saveData() {
-      let url, type
-      if (!this.model.id) {
-        url = this.url.add
-        type = 'post'
-      } else {
-        url = this.url.edit
-        type = 'put'
-      }
-      httpAction(url, this.model, type).then((res) => {
-        if (res.code === 200) {
-          this.$message.success(res.msg)
-          this.$emit('ok')
-          this.visible = false
-        } else {
-          console.log(res)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/catenary/record/view/bl/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/record/view/dc/CheckAndEditModel.vue

@@ -1,147 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="700"
-    :visible="visible"
-    :mask-closable="false"
-    cancel-text="关闭"
-    @close="close"
-  >
-    <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
-      </a-form-model-item>
-      <a-form-model-item label="所属部门" prop="bm">
-      </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
-        <j-dict-select-tag
-          v-model="model.xb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
-        <j-dict-select-tag
-          v-model="model.qj"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.hb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
-      </a-form-model-item>
-      <a-form-model-item label="支柱类型" prop="zzlx">
-        <j-dict-select-tag
-          v-model="model.zzlx"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱型号" prop="zzxh">
-        <j-dict-select-tag
-          v-model="model.zzxh"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱用途" prop="zzyt">
-        <j-dict-select-tag
-          v-model="model.zzyt"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="材质" prop="cz">
-        <j-dict-select-tag
-          v-model="model.cz"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="直线/曲外/曲内" prop="zxqwqn">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.zxqwqn"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-    </a-form-model>
-  </j-modal>
-</template>
-<script>
-import { httpAction } from '@/api/request'
-import JModal from '@/components/JModal'
-export default {
-  name: 'CheckAndEditModel',
-  components: {
-    JModal
-  },
-  data() {
-    return {
-      labelCol: { span: 4 },
-      wrapperCol: { span: 19 },
-      dataSource: [],
-      title: '',
-      visible: false,
-      isCheck: false,
-      model: {},
-      validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
-      },
-      url: {
-        add: '/business/catenary/bus/zzdzxx/add',
-        edit: '/business/catenary/bus/zzdzxx/update'
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    add() {
-      this.model = {}
-      this.visible = true
-    },
-    edit(record) {
-      this.model = Object.assign({}, record)
-      this.visible = true
-    },
-    close(isSubmit) {
-      if (isSubmit) {
-        this.checkData()
-      } else {
-        this.visible = false
-      }
-    },
-    checkData() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.saveData()
-        } else {
-          return false
-        }
-      })
-    },
-    saveData() {
-      let url, type
-      if (!this.model.id) {
-        url = this.url.add
-        type = 'post'
-      } else {
-        url = this.url.edit
-        type = 'put'
-      }
-      httpAction(url, this.model, type).then((res) => {
-        if (res.code === 200) {
-          this.$message.success(res.msg)
-          this.$emit('ok')
-          this.visible = false
-        } else {
-          console.log(res)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/catenary/record/view/dc/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/record/view/fd/CheckAndEditModel.vue

@@ -1,147 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="700"
-    :visible="visible"
-    :mask-closable="false"
-    cancel-text="关闭"
-    @close="close"
-  >
-    <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
-      </a-form-model-item>
-      <a-form-model-item label="所属部门" prop="bm">
-      </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
-        <j-dict-select-tag
-          v-model="model.xb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
-        <j-dict-select-tag
-          v-model="model.qj"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.hb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
-      </a-form-model-item>
-      <a-form-model-item label="支柱类型" prop="zzlx">
-        <j-dict-select-tag
-          v-model="model.zzlx"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱型号" prop="zzxh">
-        <j-dict-select-tag
-          v-model="model.zzxh"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱用途" prop="zzyt">
-        <j-dict-select-tag
-          v-model="model.zzyt"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="材质" prop="cz">
-        <j-dict-select-tag
-          v-model="model.cz"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="直线/曲外/曲内" prop="zxqwqn">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.zxqwqn"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-    </a-form-model>
-  </j-modal>
-</template>
-<script>
-import { httpAction } from '@/api/request'
-import JModal from '@/components/JModal'
-export default {
-  name: 'CheckAndEditModel',
-  components: {
-    JModal
-  },
-  data() {
-    return {
-      labelCol: { span: 4 },
-      wrapperCol: { span: 19 },
-      dataSource: [],
-      title: '',
-      visible: false,
-      isCheck: false,
-      model: {},
-      validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
-      },
-      url: {
-        add: '/business/catenary/bus/zzdzxx/add',
-        edit: '/business/catenary/bus/zzdzxx/update'
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    add() {
-      this.model = {}
-      this.visible = true
-    },
-    edit(record) {
-      this.model = Object.assign({}, record)
-      this.visible = true
-    },
-    close(isSubmit) {
-      if (isSubmit) {
-        this.checkData()
-      } else {
-        this.visible = false
-      }
-    },
-    checkData() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.saveData()
-        } else {
-          return false
-        }
-      })
-    },
-    saveData() {
-      let url, type
-      if (!this.model.id) {
-        url = this.url.add
-        type = 'post'
-      } else {
-        url = this.url.edit
-        type = 'put'
-      }
-      httpAction(url, this.model, type).then((res) => {
-        if (res.code === 200) {
-          this.$message.success(res.msg)
-          this.$emit('ok')
-          this.visible = false
-        } else {
-          console.log(res)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/catenary/record/view/fd/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/record/view/gl/CheckAndEditModel.vue

@@ -1,147 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="700"
-    :visible="visible"
-    :mask-closable="false"
-    cancel-text="关闭"
-    @close="close"
-  >
-    <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
-      </a-form-model-item>
-      <a-form-model-item label="所属部门" prop="bm">
-      </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
-        <j-dict-select-tag
-          v-model="model.xb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
-        <j-dict-select-tag
-          v-model="model.qj"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.hb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
-      </a-form-model-item>
-      <a-form-model-item label="支柱类型" prop="zzlx">
-        <j-dict-select-tag
-          v-model="model.zzlx"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱型号" prop="zzxh">
-        <j-dict-select-tag
-          v-model="model.zzxh"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱用途" prop="zzyt">
-        <j-dict-select-tag
-          v-model="model.zzyt"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="材质" prop="cz">
-        <j-dict-select-tag
-          v-model="model.cz"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="直线/曲外/曲内" prop="zxqwqn">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.zxqwqn"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-    </a-form-model>
-  </j-modal>
-</template>
-<script>
-import { httpAction } from '@/api/request'
-import JModal from '@/components/JModal'
-export default {
-  name: 'CheckAndEditModel',
-  components: {
-    JModal
-  },
-  data() {
-    return {
-      labelCol: { span: 4 },
-      wrapperCol: { span: 19 },
-      dataSource: [],
-      title: '',
-      visible: false,
-      isCheck: false,
-      model: {},
-      validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
-      },
-      url: {
-        add: '/business/catenary/bus/zzdzxx/add',
-        edit: '/business/catenary/bus/zzdzxx/update'
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    add() {
-      this.model = {}
-      this.visible = true
-    },
-    edit(record) {
-      this.model = Object.assign({}, record)
-      this.visible = true
-    },
-    close(isSubmit) {
-      if (isSubmit) {
-        this.checkData()
-      } else {
-        this.visible = false
-      }
-    },
-    checkData() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.saveData()
-        } else {
-          return false
-        }
-      })
-    },
-    saveData() {
-      let url, type
-      if (!this.model.id) {
-        url = this.url.add
-        type = 'post'
-      } else {
-        url = this.url.edit
-        type = 'put'
-      }
-      httpAction(url, this.model, type).then((res) => {
-        if (res.code === 200) {
-          this.$message.success(res.msg)
-          this.$emit('ok')
-          this.visible = false
-        } else {
-          console.log(res)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/catenary/record/view/gl/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/record/view/jc/CheckAndEditModel.vue

@@ -1,147 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="700"
-    :visible="visible"
-    :mask-closable="false"
-    cancel-text="关闭"
-    @close="close"
-  >
-    <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
-      </a-form-model-item>
-      <a-form-model-item label="所属部门" prop="bm">
-      </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
-        <j-dict-select-tag
-          v-model="model.xb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
-        <j-dict-select-tag
-          v-model="model.qj"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.hb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
-      </a-form-model-item>
-      <a-form-model-item label="支柱类型" prop="zzlx">
-        <j-dict-select-tag
-          v-model="model.zzlx"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱型号" prop="zzxh">
-        <j-dict-select-tag
-          v-model="model.zzxh"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱用途" prop="zzyt">
-        <j-dict-select-tag
-          v-model="model.zzyt"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="材质" prop="cz">
-        <j-dict-select-tag
-          v-model="model.cz"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="直线/曲外/曲内" prop="zxqwqn">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.zxqwqn"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-    </a-form-model>
-  </j-modal>
-</template>
-<script>
-import { httpAction } from '@/api/request'
-import JModal from '@/components/JModal'
-export default {
-  name: 'CheckAndEditModel',
-  components: {
-    JModal
-  },
-  data() {
-    return {
-      labelCol: { span: 4 },
-      wrapperCol: { span: 19 },
-      dataSource: [],
-      title: '',
-      visible: false,
-      isCheck: false,
-      model: {},
-      validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
-      },
-      url: {
-        add: '/business/catenary/bus/zzdzxx/add',
-        edit: '/business/catenary/bus/zzdzxx/update'
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    add() {
-      this.model = {}
-      this.visible = true
-    },
-    edit(record) {
-      this.model = Object.assign({}, record)
-      this.visible = true
-    },
-    close(isSubmit) {
-      if (isSubmit) {
-        this.checkData()
-      } else {
-        this.visible = false
-      }
-    },
-    checkData() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.saveData()
-        } else {
-          return false
-        }
-      })
-    },
-    saveData() {
-      let url, type
-      if (!this.model.id) {
-        url = this.url.add
-        type = 'post'
-      } else {
-        url = this.url.edit
-        type = 'put'
-      }
-      httpAction(url, this.model, type).then((res) => {
-        if (res.code === 200) {
-          this.$message.success(res.msg)
-          this.$emit('ok')
-          this.visible = false
-        } else {
-          console.log(res)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/catenary/record/view/jc/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/catenary/record/view/wjc/CheckAndEditModel.vue

@@ -1,147 +0,0 @@
-<template>
-  <j-modal
-    :title="title"
-    :width="700"
-    :visible="visible"
-    :mask-closable="false"
-    cancel-text="关闭"
-    @close="close"
-  >
-    <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
-      </a-form-model-item>
-      <a-form-model-item label="所属部门" prop="bm">
-      </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
-        <j-dict-select-tag
-          v-model="model.xb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
-        <j-dict-select-tag
-          v-model="model.qj"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.hb"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
-      </a-form-model-item>
-      <a-form-model-item label="支柱类型" prop="zzlx">
-        <j-dict-select-tag
-          v-model="model.zzlx"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱型号" prop="zzxh">
-        <j-dict-select-tag
-          v-model="model.zzxh"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="支柱用途" prop="zzyt">
-        <j-dict-select-tag
-          v-model="model.zzyt"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="材质" prop="cz">
-        <j-dict-select-tag
-          v-model="model.cz"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-      <a-form-model-item label="直线/曲外/曲内" prop="zxqwqn">
-        <j-dict-select-tag
-          type="radioButton"
-          v-model="model.zxqwqn"
-          dict-code="word_type"
-        />
-      </a-form-model-item>
-    </a-form-model>
-  </j-modal>
-</template>
-<script>
-import { httpAction } from '@/api/request'
-import JModal from '@/components/JModal'
-export default {
-  name: 'CheckAndEditModel',
-  components: {
-    JModal
-  },
-  data() {
-    return {
-      labelCol: { span: 4 },
-      wrapperCol: { span: 19 },
-      dataSource: [],
-      title: '',
-      visible: false,
-      isCheck: false,
-      model: {},
-      validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
-      },
-      url: {
-        add: '/business/catenary/bus/zzdzxx/add',
-        edit: '/business/catenary/bus/zzdzxx/update'
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    add() {
-      this.model = {}
-      this.visible = true
-    },
-    edit(record) {
-      this.model = Object.assign({}, record)
-      this.visible = true
-    },
-    close(isSubmit) {
-      if (isSubmit) {
-        this.checkData()
-      } else {
-        this.visible = false
-      }
-    },
-    checkData() {
-      this.$refs.form.validate(valid => {
-        if (valid) {
-          this.saveData()
-        } else {
-          return false
-        }
-      })
-    },
-    saveData() {
-      let url, type
-      if (!this.model.id) {
-        url = this.url.add
-        type = 'post'
-      } else {
-        url = this.url.edit
-        type = 'put'
-      }
-      httpAction(url, this.model, type).then((res) => {
-        if (res.code === 200) {
-          this.$message.success(res.msg)
-          this.$emit('ok')
-          this.visible = false
-        } else {
-          console.log(res)
-        }
-      })
-    }
-  }
-}
-</script>

src/views/catenary/record/view/wjc/index.vue

@@ -2,6 +2,18 @@
   <div>
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
+      <!-- 操作按钮区域 -->
+      <div class="table-operator" style="margin: 5px 0;float: right">
+        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-dropdown v-if="selectedRowKeys.length > 0">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
+          </a-menu>
+          <a-button style="margin-left: 8px">
+            批量操作 <a-icon type="down" />
+          </a-button>
+        </a-dropdown>
+      </div>
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <a-tree-select
@@ -43,26 +55,12 @@
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px">
-          批量操作 <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+      <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
         <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项&nbsp;&nbsp;
         <a style="margin-left: 24px" @click="onClearSelected">清空</a>
       </div>
-
       <a-table
         ref="table"
         size="middle"

src/views/sys/user/index.vue

@@ -5,6 +5,33 @@
         <leftTree @selected="getTreeData" />
       </a-col>
       <a-col :span="20">
+        <!-- 操作按钮区域 -->
+        <div class="table-operator" style="margin: 5px 0;float: right">
+          <a-button v-permission="['pc:system:user:add']" type="primary" icon="plus" @click="handleAdd">新增</a-button>
+          <!--          <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>-->
+          <!--          <a-upload-->
+          <!--            name="file"-->
+          <!--            :show-upload-list="false"-->
+          <!--            :multiple="false"-->
+          <!--            :headers="tokenHeader"-->
+          <!--            :action="url.importExcelUrl"-->
+          <!--            @change="handleImportExcel"-->
+          <!--          >-->
+          <!--            <a-button ghost type="danger" icon="import">导入</a-button>-->
+          <!--          </a-upload>-->
+          <a-dropdown v-if="selectedRowKeys.length > 0">
+            <a-menu slot="overlay">
+              <a-menu-item key="1" v-permission="['pc:system:user:remove']" @click="batchDel">
+                <a-icon type="delete" />
+                批量删除
+              </a-menu-item>
+            </a-menu>
+            <a-button style="margin-left: 8px">
+              批量操作
+              <a-icon type="down" />
+            </a-button>
+          </a-dropdown>
+        </div>
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -37,38 +64,9 @@
             </a-form-item>
           </a-form>
         </div>
-        <!-- 操作按钮区域 -->
-        <div class="table-operator" style="margin: 15px 0">
-          <a-button v-permission="['pc:system:user:add']" type="primary" icon="plus" @click="handleAdd">新增</a-button>
-          <!--          <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>-->
-          <!--          <a-upload-->
-          <!--            name="file"-->
-          <!--            :show-upload-list="false"-->
-          <!--            :multiple="false"-->
-          <!--            :headers="tokenHeader"-->
-          <!--            :action="url.importExcelUrl"-->
-          <!--            @change="handleImportExcel"-->
-          <!--          >-->
-          <!--            <a-button ghost type="danger" icon="import">导入</a-button>-->
-          <!--          </a-upload>-->
-
-          <a-dropdown v-if="selectedRowKeys.length > 0">
-            <a-menu slot="overlay">
-              <a-menu-item key="1" v-permission="['pc:system:user:remove']" @click="batchDel">
-                <a-icon type="delete" />
-                批量删除
-              </a-menu-item>
-            </a-menu>
-            <a-button style="margin-left: 8px">
-              批量操作
-              <a-icon type="down" />
-            </a-button>
-          </a-dropdown>
-        </div>
-
         <!-- table区域-begin -->
         <div>
-          <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+          <div class="ant-alert ant-alert-info" style="margin: 16px 0;">
             <i class="anticon anticon-info-circle ant-alert-icon" /> 已选择&nbsp;<a style="font-weight: 600">{{
               selectedRowKeys.length }}</a>项&nbsp;&nbsp;
             <a style="margin-left: 24px" @click="onClearSelected">清空</a>