字段修改

src/views/basics/add/index.vue

@@ -11,14 +11,6 @@
             dict-code="line"
           />
         </a-form-item>
-        <a-form-item>
-          <j-list-select-tag
-            v-model="queryParam.stationId"
-            style="width: 150px"
-            placeholder="选择区间站场"
-            dict-code="station"
-          />
-        </a-form-item>
         <a-form-item>
           <a-tree-select
             v-model="queryParam.deptId"
@@ -31,6 +23,14 @@
             :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
           />
         </a-form-item>
+        <a-form-item>
+          <j-list-select-tag
+            v-model="queryParam.stationId"
+            style="width: 150px"
+            placeholder="选择区间站场"
+            dict-code="station"
+          />
+        </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.xingbie"

src/views/basics/check/view/bl/CheckAndEditModel.vue

@@ -39,11 +39,11 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
+      <a-form-model-item label="支柱号" prop="pillarCode">
+        <a-input v-model="model.pillarCode" />
       </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
+      <a-form-model-item label="公里标" prop="marker">
+        <a-input v-model="model.marker" />
       </a-form-model-item>
       <a-form-model-item label="生产厂家" prop="sccj">
         <a-input v-model="model.sccj" />
@@ -77,8 +77,8 @@ export default {
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        zzh: [{ required: true, message: '请输入' }],
-        glb: [{ required: true, message: '请输入' }],
+        pillarCode: [{ required: true, message: '请输入' }],
+        marker: [{ required: true, message: '请输入' }],
         sccj: [{ required: true, message: '请输入' }]
       },
       url: {

src/views/basics/check/view/bl/index.vue

@@ -3,6 +3,18 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-tree-select
+            v-model="queryParam.deptId"
+            style="width: 150px"
+            :show-search="true"
+            allow-clear
+            placeholder="选择车间"
+            :tree-data="treeData"
+            tree-node-filter-prop="label"
+            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+          />
+        </a-form-item>
         <a-form-item>
           <j-list-select-tag
             v-model="queryParam.lineId"
@@ -19,18 +31,6 @@
             dict-code="station"
           />
         </a-form-item>
-        <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
-            style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.xingbie"
@@ -41,14 +41,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
+            v-model="queryParam.marker"
             style="width: 150px"
             placeholder="输入公里标"
           />

src/views/basics/check/view/bl/indexColumns.js

@@ -36,14 +36,14 @@ function columns(vm) {
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '公里标',
       align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
+      dataIndex: 'marker',
+      key: 'marker'
     },
     {
       title: '生产厂家',

src/views/basics/check/view/dc/CheckAndEditModel.vue

@@ -39,8 +39,8 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="支柱号范围" prop="zzhfw">
-        <a-input v-model="model.zzhfw" />
+      <a-form-model-item label="支柱号范围" prop="pillarArea">
+        <a-input v-model="model.pillarArea" />
       </a-form-model-item>
       <a-form-model-item label="分相名称" prop="fenxiang">
         <a-input v-model="model.fenxiang" />
@@ -77,9 +77,8 @@ export default {
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        zzhfw: [{ required: true, message: '请输入' }],
-        glb: [{ required: true, message: '请输入' }],
-        cdh: [{ required: true, message: '请输入' }]
+        pillarArea: [{ required: true, message: '请输入' }],
+        fenxiang: [{ required: true, message: '请输入' }],
       },
       url: {
         add: '//business/catenary/bus/dmcgyq/add',

src/views/basics/check/view/dc/index.vue

@@ -4,6 +4,18 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
+          <a-form-item>
+            <a-tree-select
+              v-model="queryParam.deptId"
+              style="width: 150px"
+              :show-search="true"
+              allow-clear
+              placeholder="选择车间"
+              :tree-data="treeData"
+              tree-node-filter-prop="label"
+              :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+            />
+          </a-form-item>
           <j-list-select-tag
             v-model="queryParam.lineId"
             style="width: 150px"
@@ -19,18 +31,6 @@
             dict-code="station"
           />
         </a-form-item>
-        <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
-            style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.xingbie"
@@ -41,9 +41,9 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzhfw"
+            v-model="queryParam.pillarArea"
             style="width: 150px"
-            placeholder="输入支柱号"
+            placeholder="输入支柱号范围"
           />
         </a-form-item>
         <a-form-item>

src/views/basics/check/view/dc/indexColumns.js

@@ -42,8 +42,8 @@ function columns(vm) {
     {
       title: '支柱号范围',
       align: 'center',
-      dataIndex: 'zzhfw',
-      key: 'zzhfw'
+      dataIndex: 'pillarArea',
+      key: 'pillarArea'
     },
     {
       title: '磁枕里程',

src/views/basics/check/view/fd/CheckAndEditModel.vue

@@ -8,18 +8,18 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-        <a-form-model-item label="车间" prop="deptId">
-          <a-tree-select
-            v-model="model.deptId"
-            :show-search="true"
-            allow-clear
-            tree-default-expand-all
-            style="width: 100%"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-model-item>
+      <a-form-model-item label="车间" prop="deptId">
+        <a-tree-select
+          v-model="model.deptId"
+          :show-search="true"
+          allow-clear
+          tree-default-expand-all
+          style="width: 100%"
+          :tree-data="treeData"
+          tree-node-filter-prop="label"
+          :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+        />
+      </a-form-model-item>
       <a-form-model-item label="线别" prop="lineId">
         <j-list-select-tag
           v-model="model.lineId"
@@ -39,11 +39,11 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="支柱号范围" prop="zzhfw">
-        <a-input v-model="model.zzhfw" />
+      <a-form-model-item label="支柱号范围" prop="pillarArea">
+        <a-input v-model="model.pillarArea" />
       </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
+      <a-form-model-item label="公里标" prop="marker">
+        <a-input v-model="model.marker" />
       </a-form-model-item>
       <a-form-model-item label="道岔号" prop="cdh">
         <a-input v-model="model.cdh" />
@@ -74,8 +74,8 @@ export default {
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        zzhfw: [{ required: true, message: '请输入' }],
-        glb: [{ required: true, message: '请输入' }],
+        pillarArea: [{ required: true, message: '请输入' }],
+        marker: [{ required: true, message: '请输入' }],
         cdh: [{ required: true, message: '请输入' }]
       },
       url: {

src/views/basics/check/view/fd/index.vue

@@ -3,6 +3,18 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-tree-select
+            v-model="queryParam.deptId"
+            style="width: 150px"
+            :show-search="true"
+            allow-clear
+            placeholder="选择车间"
+            :tree-data="treeData"
+            tree-node-filter-prop="label"
+            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+          />
+        </a-form-item>
         <a-form-item>
           <j-list-select-tag
             v-model="queryParam.lineId"
@@ -19,18 +31,6 @@
             dict-code="station"
           />
         </a-form-item>
-        <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
-            style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.xingbie"
@@ -41,14 +41,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzhfw"
+            v-model="queryParam.pillarArea"
             style="width: 150px"
-            placeholder="输入支柱号"
+            placeholder="输入支柱号范围"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
+            v-model="queryParam.marker"
             style="width: 150px"
             placeholder="输入公里标"
           />

src/views/basics/check/view/fd/indexColumns.js

@@ -36,14 +36,14 @@ function columns(vm) {
     {
       title: '支柱号范围',
       align: 'center',
-      dataIndex: 'zzhfw',
-      key: 'zzhfw'
+      dataIndex: 'pillarArea',
+      key: 'pillarArea'
     },
     {
       title: '公里标',
       align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
+      dataIndex: 'marker',
+      key: 'marker'
     },
     {
       title: '道岔号',

src/views/basics/check/view/gl/CheckAndEditModel.vue

@@ -39,11 +39,11 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
+      <a-form-model-item label="支柱号" prop="pillarCode">
+        <a-input v-model="model.pillarCode" />
       </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
+      <a-form-model-item label="公里标" prop="marker">
+        <a-input v-model="model.marker" />
       </a-form-model-item>
       <a-form-model-item label="开关编号" prop="kgbh">
         <a-input v-model="model.kgbh" />
@@ -80,8 +80,8 @@ export default {
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        zzh: [{ required: true, message: '请输入' }],
-        glb: [{ required: true, message: '请输入' }],
+        pillarCode: [{ required: true, message: '请输入' }],
+        marker: [{ required: true, message: '请输入' }],
         kgbh: [{ required: true, message: '请输入' }],
         sccj: [{ required: true, message: '请输入' }],
         kgxh: [{ required: true, message: '请输入' }]

src/views/basics/check/view/gl/index.vue

@@ -3,6 +3,18 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-tree-select
+            v-model="queryParam.deptId"
+            style="width: 150px"
+            :show-search="true"
+            allow-clear
+            placeholder="选择车间"
+            :tree-data="treeData"
+            tree-node-filter-prop="label"
+            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+          />
+        </a-form-item>
         <a-form-item>
           <j-list-select-tag
             v-model="queryParam.lineId"
@@ -19,18 +31,6 @@
             dict-code="station"
           />
         </a-form-item>
-        <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
-            style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.xingbie"
@@ -41,14 +41,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
+            v-model="queryParam.marker"
             style="width: 150px"
             placeholder="输入公里标"
           />

src/views/basics/check/view/gl/indexColumns.js

@@ -36,14 +36,14 @@ function columns(vm) {
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '公里标',
       align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
+      dataIndex: 'marker',
+      key: 'marker'
     },
     {
       title: '开关编号',

src/views/basics/check/view/jc/CheckAndEditModel.vue

@@ -39,11 +39,11 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
+      <a-form-model-item label="支柱号范围" prop="pillarCode">
+        <a-input v-model="model.pillarCode" />
       </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
+      <a-form-model-item label="公里标范围" prop="marker">
+        <a-input v-model="model.marker" />
       </a-form-model-item>
       <a-form-model-item label="线岔号" prop="xch">
         <a-input v-model="model.xch" />
@@ -74,8 +74,8 @@ export default {
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        zzh: [{ required: true, message: '请输入' }],
-        glb: [{ required: true, message: '请输入' }],
+        pillarCode: [{ required: true, message: '请输入' }],
+        marker: [{ required: true, message: '请输入' }],
         xch: [{ required: true, message: '请输入' }]
       },
       url: {

src/views/basics/check/view/jc/index.vue

@@ -3,6 +3,18 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-tree-select
+            v-model="queryParam.deptId"
+            style="width: 150px"
+            :show-search="true"
+            allow-clear
+            placeholder="选择车间"
+            :tree-data="treeData"
+            tree-node-filter-prop="label"
+            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+          />
+        </a-form-item>
         <a-form-item>
           <j-list-select-tag
             v-model="queryParam.lineId"
@@ -19,18 +31,6 @@
             dict-code="station"
           />
         </a-form-item>
-        <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
-            style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.xingbie"
@@ -41,16 +41,16 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
-            placeholder="输入支柱号"
+            placeholder="输入支柱号范围"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
+            v-model="queryParam.marker"
             style="width: 150px"
-            placeholder="输入公里标"
+            placeholder="输入公里标范围"
           />
         </a-form-item>
         <a-form-item>

src/views/basics/check/view/jc/indexColumns.js

@@ -36,14 +36,14 @@ function columns(vm) {
     {
       title: '支柱号范围',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '公里标范围',
       align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
+      dataIndex: 'marker',
+      key: 'marker'
     },
     {
       title: '线岔号',

src/views/basics/check/view/wjc/CheckAndEditModel.vue

@@ -39,11 +39,11 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="支柱号" prop="zzh">
-        <a-input v-model="model.zzh" />
+      <a-form-model-item label="支柱号范围" prop="pillarCode">
+        <a-input v-model="model.pillarCode" />
       </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
+      <a-form-model-item label="公里标范围" prop="marker">
+        <a-input v-model="model.marker" />
       </a-form-model-item>
       <a-form-model-item label="线岔号" prop="xch">
         <a-input v-model="model.xch" />
@@ -74,8 +74,8 @@ export default {
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        zzh: [{ required: true, message: '请输入' }],
-        glb: [{ required: true, message: '请输入' }],
+        pillarCode: [{ required: true, message: '请输入' }],
+        marker: [{ required: true, message: '请输入' }],
         xch: [{ required: true, message: '请输入' }]
       },
       url: {

src/views/basics/check/view/wjc/index.vue

@@ -3,6 +3,18 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-form-item>
+          <a-tree-select
+            v-model="queryParam.deptId"
+            style="width: 150px"
+            :show-search="true"
+            allow-clear
+            placeholder="选择车间"
+            :tree-data="treeData"
+            tree-node-filter-prop="label"
+            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
+          />
+        </a-form-item>
         <a-form-item>
           <j-list-select-tag
             v-model="queryParam.lineId"
@@ -19,18 +31,6 @@
             dict-code="station"
           />
         </a-form-item>
-        <a-form-item>
-          <a-tree-select
-            v-model="queryParam.deptId"
-            style="width: 150px"
-            :show-search="true"
-            allow-clear
-            placeholder="选择车间"
-            :tree-data="treeData"
-            tree-node-filter-prop="label"
-            :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
-          />
-        </a-form-item>
         <a-form-item>
           <j-dict-select-tag
             v-model="queryParam.xingbie"
@@ -41,16 +41,16 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
-            placeholder="输入支柱号"
+            placeholder="输入支柱号范围"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
+            v-model="queryParam.marker"
             style="width: 150px"
-            placeholder="输入公里标"
+            placeholder="输入公里标范围"
           />
         </a-form-item>
         <a-form-item>

src/views/basics/check/view/wjc/indexColumns.js

@@ -36,14 +36,14 @@ function columns(vm) {
     {
       title: '支柱号范围',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '公里标范围',
       align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
+      dataIndex: 'marker',
+      key: 'marker'
     },
     {
       title: '线岔号',

src/views/basics/line/index.vue

@@ -16,7 +16,7 @@
             style="width: 150px"
             :show-search="true"
             allow-clear
-            placeholder="选择部门"
+            placeholder="选择车间"
             :tree-data="treeData"
             tree-node-filter-prop="label"
             :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"

src/views/basics/line/indexColumns.js

@@ -28,7 +28,7 @@ function columns(vm) {
       key: 'lineName'
     },
     {
-      title: '所属车间',
+      title: '车间',
       align: 'center',
       dataIndex: 'deptName',
       key: 'deptName'

src/views/basics/pillar/CheckAndEditModel.vue

@@ -8,8 +8,8 @@
     @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 label="支柱号" prop="pillarCode">
+        <a-input v-model="model.pillarCode" />
       </a-form-model-item>
       <a-form-model-item label="所属部门" prop="deptId">
         <a-tree-select
@@ -42,8 +42,8 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
+      <a-form-model-item label="公里标" prop="marker">
+        <a-input v-model="model.marker" />
       </a-form-model-item>
       <a-form-model-item label="支柱类型" prop="zzlx">
         <j-dict-select-tag
@@ -98,12 +98,12 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        zzh: [{ required: true, message: '请输入' }],
+        pillarCode: [{ required: true, message: '请输入' }],
         stationId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         deptId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        glb: [{ required: true, message: '请输入' }],
+        marker: [{ required: true, message: '请输入' }],
         zzlx: [{ required: true, message: '请选择' }],
         zzxh: [{ required: true, message: '请选择' }],
         cz: [{ required: true, message: '请选择' }],

src/views/basics/pillar/index.vue

@@ -25,7 +25,7 @@
             style="width: 150px"
             :show-search="true"
             allow-clear
-            placeholder="选择车间工区"
+            placeholder="选择车间"
             :tree-data="treeData"
             tree-node-filter-prop="label"
             :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
@@ -41,14 +41,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
+            v-model="queryParam.marker"
             style="width: 150px"
             placeholder="输入公里标"
           />

src/views/basics/pillar/indexColumns.js

@@ -22,7 +22,7 @@ function columns(vm) {
       key: 'stationName'
     },
     {
-      title: '车间/工区',
+      title: '车间',
       align: 'center',
       dataIndex: 'deptName',
       key: 'deptName'
@@ -36,14 +36,14 @@ function columns(vm) {
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '公里标',
       align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
+      dataIndex: 'marker',
+      key: 'marker'
     },
     {
       title: '规格型号',

src/views/basics/section/CheckAndEditModel.vue

@@ -36,11 +36,11 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="区间/站场" prop="stationId">
+      <a-form-model-item label="区间/站场" prop="stationType">
         <j-dict-select-tag
-          v-model="model.stationId"
+          v-model="model.stationType"
           type="radioButton"
-          dict-code="xingbie"
+          dict-code="station_type"
         />
       </a-form-model-item>
       <a-form-model-item label="起始公里标" prop="startMarker">

src/views/basics/suoting/index.vue

@@ -24,7 +24,7 @@
             style="width: 150px"
             :show-search="true"
             allow-clear
-            placeholder="选择部门"
+            placeholder="选择车间"
             :tree-data="treeData"
             tree-node-filter-prop="label"
             :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"

src/views/basics/suoting/indexColumns.js

@@ -21,6 +21,12 @@ function columns(vm) {
       dataIndex: 'lineName',
       key: 'lineName'
     },
+    {
+      title: '车间',
+      align: 'center',
+      dataIndex: 'deptName',
+      key: 'deptName'
+    },
     {
       title: '工区',
       align: 'center',

src/views/basics/tunnel/index.vue

@@ -18,26 +18,26 @@
             dict-code="line"
           />
         </a-form-item>
-        <a-form-item>
-          <j-list-select-tag
-            v-model="queryParam.stationId"
-            style="width: 150px"
-            placeholder="选择区间站场"
-            dict-code="station"
-          />
-        </a-form-item>
         <a-form-item>
           <a-tree-select
             v-model="queryParam.deptId"
             style="width: 150px"
             :show-search="true"
             allow-clear
-            placeholder="选择部门"
+            placeholder="选择车间"
             :tree-data="treeData"
             tree-node-filter-prop="label"
             :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
           />
         </a-form-item>
+        <a-form-item>
+          <j-list-select-tag
+            v-model="queryParam.stationId"
+            style="width: 150px"
+            placeholder="选择区间站场"
+            dict-code="station"
+          />
+        </a-form-item>
         <a-form-item>
           <a-button type="primary" @click="searchQuery">查询</a-button>
           <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>

src/views/basics/tunnel/indexColumns.js

@@ -9,6 +9,12 @@ function columns(vm) {
         return parseInt(index) + 1
       }
     },
+    {
+      title: '隧道名称',
+      align: 'center',
+      dataIndex: 'sdmc',
+      key: 'sdmc'
+    },
     {
       title: '线别',
       align: 'center',
@@ -27,12 +33,6 @@ function columns(vm) {
       dataIndex: 'stationName',
       key: 'stationName'
     },
-    {
-      title: '隧道名称',
-      align: 'center',
-      dataIndex: 'sdmc',
-      key: 'sdmc'
-    },
     {
       title: '两侧杆号',
       align: 'center',

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

@@ -37,14 +37,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.jcr"
+            v-model="queryParam.checkUser"
             style="width: 150px"
             placeholder="输入检查人"
           />

src/views/catenary/checklist/view/bl/indexColumns.js

@@ -21,24 +21,23 @@ function columns(vm) {
       dataIndex: 'stationName',
       key: 'stationName'
     },
-
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '检查人',
       align: 'center',
-      dataIndex: 'jcr',
-      key: 'jcr'
+      dataIndex: 'checkUser',
+      key: 'checkUser'
     },
     {
       title: '检查日期',
       align: 'center',
-      dataIndex: 'jcrq',
-      key: 'jcrq'
+      dataIndex: 'checkDate',
+      key: 'checkDate'
     }
   ]
   return cols

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

@@ -37,14 +37,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.jcr"
+            v-model="queryParam.checkUser"
             style="width: 150px"
             placeholder="输入检查人"
           />

src/views/catenary/checklist/view/dc/indexColumns.js

@@ -21,24 +21,23 @@ function columns(vm) {
       dataIndex: 'stationName',
       key: 'stationName'
     },
-
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '检查人',
       align: 'center',
-      dataIndex: 'jcr',
-      key: 'jcr'
+      dataIndex: 'checkUser',
+      key: 'checkUser'
     },
     {
       title: '检查日期',
       align: 'center',
-      dataIndex: 'jcrq',
-      key: 'jcrq'
+      dataIndex: 'checkDate',
+      key: 'checkDate'
     }
   ]
   return cols

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

@@ -37,14 +37,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.jcr"
+            v-model="queryParam.checkUser"
             style="width: 150px"
             placeholder="输入检查人"
           />

src/views/catenary/checklist/view/fd/indexColumns.js

@@ -21,24 +21,23 @@ function columns(vm) {
       dataIndex: 'stationName',
       key: 'stationName'
     },
-
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '检查人',
       align: 'center',
-      dataIndex: 'jcr',
-      key: 'jcr'
+      dataIndex: 'checkUser',
+      key: 'checkUser'
     },
     {
       title: '检查日期',
       align: 'center',
-      dataIndex: 'jcrq',
-      key: 'jcrq'
+      dataIndex: 'checkDate',
+      key: 'checkDate'
     }
   ]
   return cols

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

@@ -37,14 +37,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.jcr"
+            v-model="queryParam.checkUser"
             style="width: 150px"
             placeholder="输入检查人"
           />

src/views/catenary/checklist/view/gl/indexColumns.js

@@ -21,24 +21,23 @@ function columns(vm) {
       dataIndex: 'stationName',
       key: 'stationName'
     },
-
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '检查人',
       align: 'center',
-      dataIndex: 'jcr',
-      key: 'jcr'
+      dataIndex: 'checkUser',
+      key: 'checkUser'
     },
     {
       title: '检查日期',
       align: 'center',
-      dataIndex: 'jcrq',
-      key: 'jcrq'
+      dataIndex: 'checkDate',
+      key: 'checkDate'
     }
   ]
   return cols

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

@@ -37,14 +37,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.jcr"
+            v-model="queryParam.checkUser"
             style="width: 150px"
             placeholder="输入检查人"
           />

src/views/catenary/checklist/view/jc/indexColumns.js

@@ -21,24 +21,23 @@ function columns(vm) {
       dataIndex: 'stationName',
       key: 'stationName'
     },
-
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '检查人',
       align: 'center',
-      dataIndex: 'jcr',
-      key: 'jcr'
+      dataIndex: 'checkUser',
+      key: 'checkUser'
     },
     {
       title: '检查日期',
       align: 'center',
-      dataIndex: 'jcrq',
-      key: 'jcrq'
+      dataIndex: 'checkDate',
+      key: 'checkDate'
     }
   ]
   return cols

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

@@ -37,14 +37,14 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.zzh"
+            v-model="queryParam.pillarCode"
             style="width: 150px"
             placeholder="输入支柱号"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.jcr"
+            v-model="queryParam.checkUser"
             style="width: 150px"
             placeholder="输入检查人"
           />

src/views/catenary/checklist/view/wjc/indexColumns.js

@@ -12,33 +12,32 @@ function columns(vm) {
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '站场/区间',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
-
     {
       title: '支柱号',
       align: 'center',
-      dataIndex: 'zzh',
-      key: 'zzh'
+      dataIndex: 'pillarCode',
+      key: 'pillarCode'
     },
     {
       title: '检查人',
       align: 'center',
-      dataIndex: 'jcr',
-      key: 'jcr'
+      dataIndex: 'checkUser',
+      key: 'checkUser'
     },
     {
       title: '检查日期',
       align: 'center',
-      dataIndex: 'jcrq',
-      key: 'jcrq'
+      dataIndex: 'checkDate',
+      key: 'checkDate'
     }
   ]
   return cols

src/views/catenary/fault/CheckAndEditModel.vue

@@ -29,8 +29,8 @@
           dict-code="xingbie"
         />
       </a-form-model-item>
-      <a-form-model-item label="公里标" prop="glb">
-        <a-input v-model="model.glb" />
+      <a-form-model-item label="公里标" prop="marker">
+        <a-input v-model="model.marker"  placeholder="请输入" />
       </a-form-model-item>
       <a-form-model-item label="原因类型" prop="yylx">
         <j-dict-select-tag
@@ -39,9 +39,9 @@
           dict-code="gzyy"
         />
       </a-form-model-item>
-      <a-form-model-item label="日期" prop="jlrq">
+      <a-form-model-item label="日期" prop="operationDate">
         <a-date-picker
-          v-model="model.jlrq"
+          v-model="model.operationDate"
           style="width: 100%"
           format="YYYY-MM-DD"
           value-format="YYYY-MM-DD"
@@ -80,9 +80,9 @@ export default {
         lineId: [{ required: true, message: '请选择' }],
         substationId: [{ required: true, message: '请选择' }],
         xingbie: [{ required: true, message: '请选择' }],
-        glb: [{ required: true, message: '请输入' }],
+        marker: [{ required: true, message: '请输入' }],
         yylx: [{ required: true, message: '请选择' }],
-        jlrq: [{ required: true, message: '请选择' }]
+        operationDate: [{ required: true, message: '请选择' }]
 
       },
       url: {

src/views/catenary/fault/index.vue

@@ -37,7 +37,7 @@
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.glb"
+            v-model="queryParam.marker"
             style="width: 150px"
             placeholder="输入公里标"
           />

src/views/catenary/fault/indexColumns.js

@@ -36,14 +36,14 @@ function columns(vm) {
     {
       title: '公里标',
       align: 'center',
-      dataIndex: 'glb',
-      key: 'glb'
+      dataIndex: 'marker',
+      key: 'marker'
     },
     {
       title: '故障日期',
       align: 'center',
-      dataIndex: 'jlrq',
-      key: 'jlrq'
+      dataIndex: 'operationDate',
+      key: 'operationDate'
     },
     {
       title: '操作',

src/views/catenary/record/index.vue

@@ -43,13 +43,6 @@
             dict-code="station"
           />
         </a-form-item>
-        <a-form-item>
-          <a-input
-            v-model="queryParam.zzh"
-            style="width: 150px"
-            placeholder="输入支柱号"
-          />
-        </a-form-item>
         <a-form-item>
           <a-input
             v-model="queryParam.operator"

src/views/catenary/record/indexColumns.js

@@ -37,8 +37,8 @@ function columns(vm) {
     {
       title: '记录日期',
       align: 'center',
-      dataIndex: 'jcrq',
-      key: 'jcrq'
+      dataIndex: 'operationDate',
+      key: 'operationDate'
     }
   ]
   return cols

src/views/sys/log/index.vue

@@ -3,32 +3,6 @@
     <!-- 查询区域 -->
     <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>-->
-<!--          <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>-->
-<!--          <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.operName"
@@ -44,12 +18,6 @@
     </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>
@@ -59,7 +27,6 @@
         </a-button>
       </a-dropdown>
     </div>
-
     <!-- table区域-begin -->
     <div>
       <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">

src/views/sys/user/index.vue

@@ -37,7 +37,7 @@
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-form-item>
               <a-input
-                v-model="queryParam.glb"
+                v-model="queryParam.value"
                 style="width: 150px"
                 placeholder="姓名/部门/手机号"
               />