zcy пре 4 година
родитељ
комит
3a3aee2b32

+ 183 - 0
src/components/RightModel/index.vue

@@ -0,0 +1,183 @@
+<template>
+  <a-drawer
+    :title="title"
+    :mask-closable="true"
+    width="650"
+    placement="right"
+    :closable="true"
+    :visible="visible"
+    style="overflow: auto;padding-bottom: 53px;"
+    @close="close"
+  >
+
+    <a-form>
+      <a-form-item label="所拥有的权限">
+        <a-tree
+          checkable
+          :checked-keys="checkedKeys"
+          :tree-data="treeData"
+          :selected-keys="selectedKeys"
+          :expanded-keys="expandedKeysss"
+          :check-strictly="checkStrictly"
+          @check="onCheck"
+          @expand="onExpand"
+          @select="onTreeNodeSelect"
+        >
+          <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
+            {{ slotTitle }}<a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;" />
+          </span>
+        </a-tree>
+      </a-form-item>
+    </a-form>
+
+    <div class="drawer-bootom-button">
+      <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+          <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+          <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
+          <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
+          <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
+          <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
+        </a-menu>
+        <a-button>
+          树操作 <a-icon type="up" />
+        </a-button>
+      </a-dropdown>
+      <a-popconfirm title="确定放弃编辑?" ok-text="确定" cancel-text="取消" @confirm="close">
+        <a-button style="margin-right: .8rem">取消</a-button>
+      </a-popconfirm>
+      <a-button type="primary" :loading="loading" ghost style="margin-right: 0.8rem" @click="handleSubmit(false)">仅保存</a-button>
+      <a-button type="primary" :loading="loading" @click="handleSubmit(true)">保存并关闭</a-button>
+    </div>
+
+  </a-drawer>
+
+</template>
+<script>
+  import { getAction } from '@/api/request'
+
+export default {
+  name: 'RoleModal',
+  components: {
+  },
+  data() {
+    return {
+      jobId: '',
+      title: '',
+      treeList: '',
+      treeKey: '',
+      treeData: [],
+      defaultCheckedKeys: [],
+      checkedKeys: [],
+      expandedKeysss: [],
+      allTreeKeys: [],
+      autoExpandParent: true,
+      checkStrictly: true,
+      visible: false,
+      loading: false,
+      selectedKeys: []
+    }
+  },
+  watch: {
+    visible() {
+      if (this.visible) {
+        this.loadData()
+      }
+    }
+  },
+  methods: {
+    onTreeNodeSelect(id) {
+      if (id && id.length > 0) {
+        this.selectedKeys = id
+      }
+      this.$refs.datarule.show(this.selectedKeys[0], this.jobId)
+    },
+    onCheck(o) {
+      if (this.checkStrictly) {
+        this.checkedKeys = o.checked
+      } else {
+        this.checkedKeys = o
+      }
+    },
+    show(jobId) {
+      this.jobId = jobId
+      this.visible = true
+    },
+    close() {
+      this.reset()
+      this.$emit('close')
+      this.visible = false
+    },
+    onExpand(expandedKeys) {
+      this.expandedKeysss = expandedKeys
+      this.autoExpandParent = false
+    },
+    reset() {
+      this.expandedKeysss = []
+      this.checkedKeys = []
+      this.defaultCheckedKeys = []
+      this.loading = false
+    },
+    expandAll() {
+      this.expandedKeysss = this.allTreeKeys
+    },
+    closeAll() {
+      this.expandedKeysss = []
+    },
+    checkALL() {
+      this.checkedKeys = this.allTreeKeys
+    },
+    cancelCheckALL() {
+      // this.checkedKeys = this.defaultCheckedKeys
+      this.checkedKeys = []
+    },
+    switchCheckStrictly(v) {
+      if (v == 1) {
+        this.checkStrictly = false
+      } else if (v == 2) {
+        this.checkStrictly = true
+      }
+    },
+    handleCancel() {
+      this.close()
+    },
+    handleSubmit(exit) {
+      const that = this
+      const params = {
+        jobId: that.jobId,
+        permissionIds: that.checkedKeys.join(','),
+        lastpermissionIds: that.defaultCheckedKeys.join(',')
+      }
+      console.log(params);
+    },
+    loadData() {
+      getAction(this.treeList).then((res) => {
+        this.treeData = res.result.treeList
+        this.allTreeKeys = res.result.ids
+        getAction({ jobId: this.jobId }).then((res) => {
+          this.checkedKeys = [...res.result]
+          this.defaultCheckedKeys = [...res.result]
+          this.expandedKeysss = this.allTreeKeys
+          console.log(this.defaultCheckedKeys)
+        })
+      })
+    }
+  }
+}
+
+</script>
+<style lang="less" scoped>
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+</style>

+ 21 - 56
src/views/sys/dept/index.vue

@@ -1,78 +1,38 @@
 <template>
   <el-card style="margin: 15px">
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" style="margin: 5px 0;float: right">
+      <a-button type="primary" icon="plus" @click="handleAdd">新增</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>
+
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
-            style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
         <a-form-item>
           <a-input
             v-model="queryParam.glb"
             style="width: 150px"
-            placeholder="输入公里标"
+            placeholder="部门名称"
           />
         </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
         <a-form-item>
           <a-button type="primary" @click="searchQuery">查询</a-button>
           <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
         </a-form-item>
       </a-form>
     </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button 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" @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>
@@ -89,7 +49,9 @@
         :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
       >
-
+        <template slot="status" slot-scope="text, record">
+          <a-switch v-model="record['status']" checked-children="启用" un-checked-children="停用" @change="changeStatus($event,record)" />
+        </template>
         <span slot="action" slot-scope="text, record">
           <a-button size="small" type="primary" @click="handleEdit(record)">
             编辑
@@ -135,6 +97,9 @@ export default {
   created() {
   },
   methods: {
+    changeStatus(val, row) {
+      console.log(val, row.id)
+    }
   }
 }
 </script>

+ 9 - 36
src/views/sys/dept/indexColumns.js

@@ -1,68 +1,41 @@
 function columns(vm) {
   const cols = [
     {
-      title: '序号',
-      key: 'rowIndex',
-      width: 60,
-      align: 'center',
-      customRender: function(t, r, index) {
-        return parseInt(index) + 1
-      }
-    },
-    {
-      title: '线别',
-      align: 'center',
+      title: '部门名称',
       dataIndex: 'xb',
       key: 'xb'
     },
     {
-      title: '区间/站场',
+      title: '状态',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'status',
+      scopedSlots: { customRender: 'status' },
+      key: 'status'
     },
     {
-      title: '车间/工区',
+      title: '成员数量',
       align: 'center',
       dataIndex: 'bm',
       key: 'bm'
     },
     {
-      title: '行别',
+      title: '部门描述',
       align: 'center',
       dataIndex: 'hb',
       key: 'hb'
     },
     {
-      title: '支柱号',
+      title: '更新时间',
       align: 'center',
       dataIndex: 'zzh',
       key: 'zzh'
     },
     {
-      title: '公里标',
+      title: '排序',
       align: 'center',
       dataIndex: 'glb',
       key: 'glb'
     },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
     {
       title: '操作',
       dataIndex: 'action',

+ 10 - 51
src/views/sys/job/view/bl/CheckAndEditModel.vue → src/views/sys/job/CheckAndEditModel.vue

@@ -8,62 +8,21 @@
     @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-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">
+      <a-form-model-item label="数据权限" prop="zxqwqn">
         <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"
+          v-model="model.zxqwqn"
           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 label="职务描述" prop="zzh">
+        <a-textarea
+          v-model="model.zzh"
+          placeholder="Controlled autosize"
+          :auto-size="{ minRows: 3, maxRows: 5 }"
         />
       </a-form-model-item>
     </a-form-model>
@@ -87,8 +46,8 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        name: [{ required: true, message: '请输入' }],
-        type: [{ required: true, message: '请选择' }]
+        zzh: [{ required: true, message: '请输入' }],
+        zxqwqn: [{ required: true, message: '请选择' }]
       },
       url: {
         add: '/business/catenary/bus/zzdzxx/add',

+ 123 - 45
src/views/sys/job/index.vue

@@ -1,62 +1,140 @@
 <template>
   <el-card style="margin: 15px">
-    <a-tabs v-model="activeKey">
-      <a-tab-pane
-        v-for="item in tabs"
-        :key="item.name"
-        :tab="item.title"
+    <!-- 操作按钮区域 -->
+    <div class="table-operator" style="margin: 5px 0;float: right">
+      <a-button type="primary" icon="plus" @click="handleAdd">新增</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>
+
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-input
+            v-model="queryParam.glb"
+            style="width: 150px"
+            placeholder="职务名称"
+          />
+        </a-form-item>
+        <a-form-item>
+          <a-button type="primary" @click="searchQuery">查询</a-button>
+          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+        </a-form-item>
+      </a-form>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <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"
+        bordered
+        row-key="id"
+        :columns="columns"
+        :data-source="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        @change="handleTableChange"
       >
-        <component
-          :is="item.name"
-          v-if="activeKey === item.name"
-        />
-      </a-tab-pane>
-    </a-tabs>
+        <template slot="status" slot-scope="text, record">
+          <a-switch v-model="record['status']" checked-children="启用" un-checked-children="停用" @change="changeStatus($event,record)" />
+        </template>
+        <span slot="action" slot-scope="text, record">
+          <a-button type="primary" @click="handleEdit(record)">
+            编辑
+          </a-button>
+          <a-divider type="vertical" />
+
+          <a-dropdown>
+            <a-button class="ant-dropdown-link" type="primary">
+              操作权限 <a-icon type="down" />
+            </a-button>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a href="javascript:;" @click="app(record)">APP功能菜单</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a href="javascript:;" @click="pc(record)">PC功能菜单</a>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a-button type="danger">
+              删除
+            </a-button>
+          </a-popconfirm>
+        </span>
+      </a-table>
+      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
+      <right-model ref="rightModal" @ok="updateQueryParam" />
+    </div>
+    <!-- table区域-end -->
+    <!-- 表单区域 -->
   </el-card>
 </template>
 <script>
-import fd from './view/fd'
-import bl from './view/fd'
-import dc from './view/fd'
-import gl from './view/fd'
-import jc from './view/fd'
-import wjc from './view/fd'
+import { listMixin } from '@/mixin/listMixin'
+import columns from './indexColumns'
+import CheckAndEditModel from './CheckAndEditModel'
+import rightModel from '@/components/RightModel'
 
 export default {
   components: {
-    fd,
-    bl,
-    dc,
-    gl,
-    jc,
-    wjc
+    CheckAndEditModel,
+    rightModel
   },
+  mixins: [listMixin],
   data() {
     return {
-      activeKey: 'fd',
-      tabs: [{
-        title: '分段分相绝缘器',
-        name: 'fd'
-      }, {
-        title: '避雷器',
-        name: 'bl'
-      }, {
-        title: '地磁感应装置',
-        name: 'dc'
-      }, {
-        title: '隔离开关',
-        name: 'gl'
-      }, {
-        title: '交叉线岔',
-        name: 'jc'
-      }, {
-        title: '无交叉线岔',
-        name: 'wjc'
-      }]
+      // 查询条件
+      queryParam: {},
+      // 表头
+      columns: columns(this),
+      url: {
+        list: '/business/catenary/bus/zzdzxx/list',
+        delete: '/business/catenary/bus/zzdzxx/',
+        exportXlsUrl: '/exportXlsUrl',
+        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
+      }
     }
   },
-  computed: {},
-  methods: {}
+  created() {
+  },
+  methods: {
+    changeStatus(val, row) {
+      console.log(val, row.id)
+    },
+    app(data) {
+      this.$refs.rightModal.title = 'app菜单权限'
+      this.$refs.rightModal.treeKey = '/treeKey'
+      this.$refs.rightModal.treeList = '/treeList'
+      this.$refs.rightModal.show()
+    },
+    pc(data) {
+      this.$refs.rightModal.title = 'pc菜单权限'
+      this.$refs.rightModal.treeKey = '/treeKey'
+      this.$refs.rightModal.treeList = '/treeList'
+      this.$refs.rightModal.show()
+    },
+    updateQueryParam(data) {
+      this.queryParam.unit = data.id
+      this.queryParam.unitName = data.departName
+    }
+  }
 }
 </script>
 <style scoped>

+ 45 - 0
src/views/sys/job/indexColumns.js

@@ -0,0 +1,45 @@
+function columns(vm) {
+  const cols = [
+    {
+      title: '职务名称',
+      dataIndex: 'xb',
+      key: 'xb'
+    },
+    {
+      title: '状态',
+      align: 'center',
+      dataIndex: 'status',
+      scopedSlots: { customRender: 'status' },
+      key: 'status'
+    },
+    {
+      title: '本职务成员数量',
+      align: 'center',
+      dataIndex: 'bm',
+      key: 'bm'
+    },
+    {
+      title: '职务描述',
+      align: 'center',
+      dataIndex: 'hb',
+      key: 'hb'
+    },
+    {
+      title: '更新时间',
+      align: 'center',
+      dataIndex: 'zzh',
+      key: 'zzh'
+    },
+    {
+      title: '操作',
+      dataIndex: 'action',
+      width: 350,
+      align: 'center',
+      slots: { title: 'actionName' },
+      scopedSlots: { customRender: 'action' }
+    }
+  ]
+  return cols
+}
+
+export default columns

+ 0 - 143
src/views/sys/job/view/bl/index.vue

@@ -1,143 +0,0 @@
-<template>
-  <div>
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
-            style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.glb"
-            style="width: 150px"
-            placeholder="输入公里标"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="searchQuery">查询</a-button>
-          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button 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" @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;">
-        <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"
-        bordered
-        row-key="id"
-        :columns="columns"
-        :data-source="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange"
-      >
-
-        <span slot="action" slot-scope="text, record">
-          <a-button size="small" type="primary" @click="handleEdit(record)">
-            编辑
-          </a-button>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a-button size="small" type="danger">
-              删除
-            </a-button>
-          </a-popconfirm>
-        </span>
-      </a-table>
-      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
-    </div>
-    <!-- table区域-end -->
-    <!-- 表单区域 -->
-  </div>
-</template>
-<script>
-import { listMixin } from '@/mixin/listMixin'
-import columns from './indexColumns'
-import CheckAndEditModel from './CheckAndEditModel'
-
-export default {
-  components: {
-    CheckAndEditModel
-  },
-  mixins: [listMixin],
-  data() {
-    return {
-      // 查询条件
-      queryParam: {},
-      // 表头
-      columns: columns(this),
-      url: {
-        list: '/business/catenary/bus/zzdzxx/list',
-        delete: '/business/catenary/bus/zzdzxx/',
-        exportXlsUrl: '/exportXlsUrl',
-        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-  @import '~@/assets/less/common.less'
-</style>

+ 0 - 77
src/views/sys/job/view/bl/indexColumns.js

@@ -1,77 +0,0 @@
-function columns(vm) {
-  const cols = [
-    {
-      title: '序号',
-      key: 'rowIndex',
-      width: 60,
-      align: 'center',
-      customRender: function(t, r, index) {
-        return parseInt(index) + 1
-      }
-    },
-    {
-      title: '线别',
-      align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
-    },
-    {
-      title: '区间/站场',
-      align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
-    },
-    {
-      title: '车间/工区',
-      align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
-    },
-    {
-      title: '行别',
-      align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
-    },
-    {
-      title: '支柱号',
-      align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
-    },
-    {
-      title: '公里标',
-      align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
-    },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      align: 'center',
-      slots: { title: 'actionName' },
-      scopedSlots: { customRender: 'action' }
-    }
-  ]
-  return cols
-}
-
-export default columns

+ 0 - 149
src/views/sys/job/view/dc/CheckAndEditModel.vue

@@ -1,149 +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) {
-      debugger
-      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 {
-        debugger
-        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>

+ 0 - 143
src/views/sys/job/view/dc/index.vue

@@ -1,143 +0,0 @@
-<template>
-  <div>
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
-            style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.glb"
-            style="width: 150px"
-            placeholder="输入公里标"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="searchQuery">查询</a-button>
-          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button 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" @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;">
-        <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"
-        bordered
-        row-key="id"
-        :columns="columns"
-        :data-source="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange"
-      >
-
-        <span slot="action" slot-scope="text, record">
-          <a-button size="small" type="primary" @click="handleEdit(record)">
-            编辑
-          </a-button>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a-button size="small" type="danger">
-              删除
-            </a-button>
-          </a-popconfirm>
-        </span>
-      </a-table>
-      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
-    </div>
-    <!-- table区域-end -->
-    <!-- 表单区域 -->
-  </div>
-</template>
-<script>
-import { listMixin } from '@/mixin/listMixin'
-import columns from './indexColumns'
-import CheckAndEditModel from './CheckAndEditModel'
-
-export default {
-  components: {
-    CheckAndEditModel
-  },
-  mixins: [listMixin],
-  data() {
-    return {
-      // 查询条件
-      queryParam: {},
-      // 表头
-      columns: columns(this),
-      url: {
-        list: '/business/catenary/bus/zzdzxx/list',
-        delete: '/business/catenary/bus/zzdzxx/',
-        exportXlsUrl: '/exportXlsUrl',
-        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-  @import '~@/assets/less/common.less'
-</style>

+ 0 - 77
src/views/sys/job/view/dc/indexColumns.js

@@ -1,77 +0,0 @@
-function columns(vm) {
-  const cols = [
-    {
-      title: '序号',
-      key: 'rowIndex',
-      width: 60,
-      align: 'center',
-      customRender: function(t, r, index) {
-        return parseInt(index) + 1
-      }
-    },
-    {
-      title: '线别',
-      align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
-    },
-    {
-      title: '区间/站场',
-      align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
-    },
-    {
-      title: '车间/工区',
-      align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
-    },
-    {
-      title: '行别',
-      align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
-    },
-    {
-      title: '支柱号',
-      align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
-    },
-    {
-      title: '公里标',
-      align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
-    },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      align: 'center',
-      slots: { title: 'actionName' },
-      scopedSlots: { customRender: 'action' }
-    }
-  ]
-  return cols
-}
-
-export default columns

+ 0 - 149
src/views/sys/job/view/fd/CheckAndEditModel.vue

@@ -1,149 +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) {
-      debugger
-      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 {
-        debugger
-        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>

+ 0 - 143
src/views/sys/job/view/fd/index.vue

@@ -1,143 +0,0 @@
-<template>
-  <div>
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
-            style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.glb"
-            style="width: 150px"
-            placeholder="输入公里标"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="searchQuery">查询</a-button>
-          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button 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" @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;">
-        <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"
-        bordered
-        row-key="id"
-        :columns="columns"
-        :data-source="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange"
-      >
-
-        <span slot="action" slot-scope="text, record">
-          <a-button size="small" type="primary" @click="handleEdit(record)">
-            编辑
-          </a-button>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a-button size="small" type="danger">
-              删除
-            </a-button>
-          </a-popconfirm>
-        </span>
-      </a-table>
-      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
-    </div>
-    <!-- table区域-end -->
-    <!-- 表单区域 -->
-  </div>
-</template>
-<script>
-import { listMixin } from '@/mixin/listMixin'
-import columns from './indexColumns'
-import CheckAndEditModel from './CheckAndEditModel'
-
-export default {
-  components: {
-    CheckAndEditModel
-  },
-  mixins: [listMixin],
-  data() {
-    return {
-      // 查询条件
-      queryParam: {},
-      // 表头
-      columns: columns(this),
-      url: {
-        list: '/business/catenary/bus/zzdzxx/list',
-        delete: '/business/catenary/bus/zzdzxx/',
-        exportXlsUrl: '/exportXlsUrl',
-        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-  @import '~@/assets/less/common.less'
-</style>

+ 0 - 77
src/views/sys/job/view/fd/indexColumns.js

@@ -1,77 +0,0 @@
-function columns(vm) {
-  const cols = [
-    {
-      title: '序号',
-      key: 'rowIndex',
-      width: 60,
-      align: 'center',
-      customRender: function(t, r, index) {
-        return parseInt(index) + 1
-      }
-    },
-    {
-      title: '线别',
-      align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
-    },
-    {
-      title: '区间/站场',
-      align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
-    },
-    {
-      title: '车间/工区',
-      align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
-    },
-    {
-      title: '行别',
-      align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
-    },
-    {
-      title: '支柱号',
-      align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
-    },
-    {
-      title: '公里标',
-      align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
-    },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      align: 'center',
-      slots: { title: 'actionName' },
-      scopedSlots: { customRender: 'action' }
-    }
-  ]
-  return cols
-}
-
-export default columns

+ 0 - 149
src/views/sys/job/view/gl/CheckAndEditModel.vue

@@ -1,149 +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) {
-      debugger
-      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 {
-        debugger
-        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>

+ 0 - 143
src/views/sys/job/view/gl/index.vue

@@ -1,143 +0,0 @@
-<template>
-  <div>
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
-            style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.glb"
-            style="width: 150px"
-            placeholder="输入公里标"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="searchQuery">查询</a-button>
-          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button 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" @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;">
-        <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"
-        bordered
-        row-key="id"
-        :columns="columns"
-        :data-source="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange"
-      >
-
-        <span slot="action" slot-scope="text, record">
-          <a-button size="small" type="primary" @click="handleEdit(record)">
-            编辑
-          </a-button>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a-button size="small" type="danger">
-              删除
-            </a-button>
-          </a-popconfirm>
-        </span>
-      </a-table>
-      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
-    </div>
-    <!-- table区域-end -->
-    <!-- 表单区域 -->
-  </div>
-</template>
-<script>
-import { listMixin } from '@/mixin/listMixin'
-import columns from './indexColumns'
-import CheckAndEditModel from './CheckAndEditModel'
-
-export default {
-  components: {
-    CheckAndEditModel
-  },
-  mixins: [listMixin],
-  data() {
-    return {
-      // 查询条件
-      queryParam: {},
-      // 表头
-      columns: columns(this),
-      url: {
-        list: '/business/catenary/bus/zzdzxx/list',
-        delete: '/business/catenary/bus/zzdzxx/',
-        exportXlsUrl: '/exportXlsUrl',
-        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-  @import '~@/assets/less/common.less'
-</style>

+ 0 - 77
src/views/sys/job/view/gl/indexColumns.js

@@ -1,77 +0,0 @@
-function columns(vm) {
-  const cols = [
-    {
-      title: '序号',
-      key: 'rowIndex',
-      width: 60,
-      align: 'center',
-      customRender: function(t, r, index) {
-        return parseInt(index) + 1
-      }
-    },
-    {
-      title: '线别',
-      align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
-    },
-    {
-      title: '区间/站场',
-      align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
-    },
-    {
-      title: '车间/工区',
-      align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
-    },
-    {
-      title: '行别',
-      align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
-    },
-    {
-      title: '支柱号',
-      align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
-    },
-    {
-      title: '公里标',
-      align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
-    },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      align: 'center',
-      slots: { title: 'actionName' },
-      scopedSlots: { customRender: 'action' }
-    }
-  ]
-  return cols
-}
-
-export default columns

+ 0 - 149
src/views/sys/job/view/jc/CheckAndEditModel.vue

@@ -1,149 +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) {
-      debugger
-      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 {
-        debugger
-        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>

+ 0 - 143
src/views/sys/job/view/jc/index.vue

@@ -1,143 +0,0 @@
-<template>
-  <div>
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
-            style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.glb"
-            style="width: 150px"
-            placeholder="输入公里标"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="searchQuery">查询</a-button>
-          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button 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" @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;">
-        <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"
-        bordered
-        row-key="id"
-        :columns="columns"
-        :data-source="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange"
-      >
-
-        <span slot="action" slot-scope="text, record">
-          <a-button size="small" type="primary" @click="handleEdit(record)">
-            编辑
-          </a-button>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a-button size="small" type="danger">
-              删除
-            </a-button>
-          </a-popconfirm>
-        </span>
-      </a-table>
-      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
-    </div>
-    <!-- table区域-end -->
-    <!-- 表单区域 -->
-  </div>
-</template>
-<script>
-import { listMixin } from '@/mixin/listMixin'
-import columns from './indexColumns'
-import CheckAndEditModel from './CheckAndEditModel'
-
-export default {
-  components: {
-    CheckAndEditModel
-  },
-  mixins: [listMixin],
-  data() {
-    return {
-      // 查询条件
-      queryParam: {},
-      // 表头
-      columns: columns(this),
-      url: {
-        list: '/business/catenary/bus/zzdzxx/list',
-        delete: '/business/catenary/bus/zzdzxx/',
-        exportXlsUrl: '/exportXlsUrl',
-        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-  @import '~@/assets/less/common.less'
-</style>

+ 0 - 77
src/views/sys/job/view/jc/indexColumns.js

@@ -1,77 +0,0 @@
-function columns(vm) {
-  const cols = [
-    {
-      title: '序号',
-      key: 'rowIndex',
-      width: 60,
-      align: 'center',
-      customRender: function(t, r, index) {
-        return parseInt(index) + 1
-      }
-    },
-    {
-      title: '线别',
-      align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
-    },
-    {
-      title: '区间/站场',
-      align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
-    },
-    {
-      title: '车间/工区',
-      align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
-    },
-    {
-      title: '行别',
-      align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
-    },
-    {
-      title: '支柱号',
-      align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
-    },
-    {
-      title: '公里标',
-      align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
-    },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      align: 'center',
-      slots: { title: 'actionName' },
-      scopedSlots: { customRender: 'action' }
-    }
-  ]
-  return cols
-}
-
-export default columns

+ 0 - 149
src/views/sys/job/view/wjc/CheckAndEditModel.vue

@@ -1,149 +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) {
-      debugger
-      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 {
-        debugger
-        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>

+ 0 - 143
src/views/sys/job/view/wjc/index.vue

@@ -1,143 +0,0 @@
-<template>
-  <div>
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
-            style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.sb"
-            style="width: 150px"
-            placeholder="选择所别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.hb"
-            style="width: 150px"
-            placeholder="选择行别"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.glb"
-            style="width: 150px"
-            placeholder="输入公里标"
-          />
-        </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="searchQuery">查询</a-button>
-          <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
-        </a-form-item>
-      </a-form>
-    </div>
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" style="margin: 15px 0">
-      <a-button 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" @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;">
-        <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"
-        bordered
-        row-key="id"
-        :columns="columns"
-        :data-source="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange"
-      >
-
-        <span slot="action" slot-scope="text, record">
-          <a-button size="small" type="primary" @click="handleEdit(record)">
-            编辑
-          </a-button>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a-button size="small" type="danger">
-              删除
-            </a-button>
-          </a-popconfirm>
-        </span>
-      </a-table>
-      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
-    </div>
-    <!-- table区域-end -->
-    <!-- 表单区域 -->
-  </div>
-</template>
-<script>
-import { listMixin } from '@/mixin/listMixin'
-import columns from './indexColumns'
-import CheckAndEditModel from './CheckAndEditModel'
-
-export default {
-  components: {
-    CheckAndEditModel
-  },
-  mixins: [listMixin],
-  data() {
-    return {
-      // 查询条件
-      queryParam: {},
-      // 表头
-      columns: columns(this),
-      url: {
-        list: '/business/catenary/bus/zzdzxx/list',
-        delete: '/business/catenary/bus/zzdzxx/',
-        exportXlsUrl: '/exportXlsUrl',
-        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-  @import '~@/assets/less/common.less'
-</style>

+ 0 - 77
src/views/sys/job/view/wjc/indexColumns.js

@@ -1,77 +0,0 @@
-function columns(vm) {
-  const cols = [
-    {
-      title: '序号',
-      key: 'rowIndex',
-      width: 60,
-      align: 'center',
-      customRender: function(t, r, index) {
-        return parseInt(index) + 1
-      }
-    },
-    {
-      title: '线别',
-      align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
-    },
-    {
-      title: '区间/站场',
-      align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
-    },
-    {
-      title: '车间/工区',
-      align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
-    },
-    {
-      title: '行别',
-      align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
-    },
-    {
-      title: '支柱号',
-      align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
-    },
-    {
-      title: '公里标',
-      align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
-    },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
-    {
-      title: '操作',
-      dataIndex: 'action',
-      align: 'center',
-      slots: { title: 'actionName' },
-      scopedSlots: { customRender: 'action' }
-    }
-  ]
-  return cols
-}
-
-export default columns

+ 20 - 29
src/views/sys/log/index.vue

@@ -4,18 +4,17 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xb"
+          <a-input
+            v-model="queryParam.glb"
             style="width: 150px"
-            placeholder="选择线别"
-            dict-code="sj_plan_status"
+            placeholder="输入搜索关键字"
           />
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.sb"
             style="width: 150px"
-            placeholder="选择所别"
+            placeholder="所属模块"
             dict-code="sj_plan_status"
           />
         </a-form-item>
@@ -23,29 +22,21 @@
           <j-dict-select-tag
             v-model="queryParam.hb"
             style="width: 150px"
-            placeholder="选择行别"
+            placeholder="操作类型"
             dict-code="sj_plan_status"
           />
         </a-form-item>
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.yy"
-            style="width: 150px"
-            placeholder="选择原因类型"
-            dict-code="sj_plan_status"
-          />
+          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-<a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
         </a-form-item>
         <a-form-item>
-          <a-input
-            v-model="queryParam.glb"
+          <j-dict-select-tag
+            v-model="queryParam.hb"
             style="width: 150px"
-            placeholder="输入公里标"
+            placeholder="操作人员"
+            dict-code="sj_plan_status"
           />
         </a-form-item>
-        <a-form-item>
-          <a-date-picker v-model="queryParam.date1" format="YYYY/MM/DD" placeholder="时间范围" />-
-          <a-date-picker v-model="queryParam.date2" format="YYYY/MM/DD" placeholder="时间范围" />
-        </a-form-item>
         <a-form-item>
           <a-button type="primary" @click="searchQuery">查询</a-button>
           <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
@@ -54,10 +45,10 @@
     </div>
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="margin: 15px 0">
-      <a-button 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-button 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">
@@ -94,12 +85,12 @@
           <a-button size="small" type="primary" @click="handleEdit(record)">
             编辑
           </a-button>
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a-button size="small" type="danger">
-              删除
-            </a-button>
-          </a-popconfirm>
+<!--          <a-divider type="vertical" />-->
+<!--          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
+<!--            <a-button size="small" type="danger">-->
+<!--              删除-->
+<!--            </a-button>-->
+<!--          </a-popconfirm>-->
         </span>
       </a-table>
       <check-and-edit-model ref="modalForm" @ok="modalFormOk" />

+ 5 - 35
src/views/sys/log/indexColumns.js

@@ -3,66 +3,36 @@ function columns(vm) {
     {
       title: '序号',
       key: 'rowIndex',
-      width: 60,
+      width: 120,
       align: 'center',
       customRender: function(t, r, index) {
         return parseInt(index) + 1
       }
     },
     {
-      title: '线别',
+      title: '操作编号',
       align: 'center',
       dataIndex: 'xb',
       key: 'xb'
     },
     {
-      title: '区间/站场',
+      title: '操作时间',
       align: 'center',
       dataIndex: 'qj',
       key: 'qj'
     },
     {
-      title: '车间/工区',
+      title: '操作人员',
       align: 'center',
       dataIndex: 'bm',
       key: 'bm'
     },
     {
-      title: '行别',
+      title: '所属模块 ',
       align: 'center',
       dataIndex: 'hb',
       key: 'hb'
     },
-    {
-      title: '支柱号',
-      align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
-    },
-    {
-      title: '公里标',
-      align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
-    },
-    {
-      title: '规格型号',
-      align: 'center',
-      dataIndex: 'zzxh',
-      key: 'zzxh'
-    },
-    {
-      title: '支柱类型',
-      align: 'center',
-      dataIndex: 'zzlx',
-      key: 'zzlx'
-    },
-    {
-      title: '安装时间',
-      align: 'center',
-      dataIndex: 'ccrq',
-      key: 'ccrq'
-    },
     {
       title: '操作',
       dataIndex: 'action',