字段

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

@@ -20,21 +20,21 @@
           :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
         />
       </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
+      <a-form-model-item label="线别" prop="lineId">
         <j-list-select-tag
-          v-model="model.xb"
+          v-model="model.lineId"
           dict-code="line"
         />
       </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
+      <a-form-model-item label="站场区间" prop="stationId">
         <j-list-select-tag
-          v-model="model.qj"
+          v-model="model.stationId"
           dict-code="station"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
+      <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />
@@ -74,9 +74,9 @@ export default {
       model: {},
       validatorRules: {
         deptId: [{ required: true, message: '请选择' }],
-        xb: [{ required: true, message: '请选择' }],
-        qj: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        lineId: [{ required: true, message: '请选择' }],
+        stationId: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         zzh: [{ required: true, message: '请输入' }],
         glb: [{ required: true, message: '请输入' }],
         sccj: [{ required: true, message: '请输入' }]

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

@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.xb"
+            v-model="queryParam.lineId"
             style="width: 150px"
             placeholder="选择线别"
             dict-code="line"
@@ -13,7 +13,7 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.qj"
+            v-model="queryParam.stationId"
             style="width: 150px"
             placeholder="选择区间站场"
             dict-code="station"
@@ -33,7 +33,7 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.hb"
+            v-model="queryParam.xingbie"
             style="width: 150px"
             placeholder="选择行别"
             dict-code="xingbie"

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

@@ -12,26 +12,26 @@ function columns(vm) {
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '线别',
       align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     {
       title: '区间站场',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '行别',
       align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
+      dataIndex: 'xingbie',
+      key: 'xingbie'
     },
     {
       title: '支柱号',

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

@@ -34,7 +34,7 @@
       </a-form-model-item>
       <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />

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

@@ -8,9 +8,9 @@
     @close="close"
   >
     <a-form-model ref="form" :label-col="labelCol" :wrapper-col="wrapperCol" :rules="validatorRules" :model="model">
-      <a-form-model-item label="车间" prop="bm">
+      <a-form-model-item label="车间" prop="deptId">
         <a-tree-select
-          v-model="model.bm"
+          v-model="model.deptId"
           :show-search="true"
           allow-clear
           tree-default-expand-all
@@ -20,21 +20,21 @@
           :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
         />
       </a-form-model-item>
-      <a-form-model-item label="线别" prop="xb">
+      <a-form-model-item label="线别" prop="lineId">
         <j-list-select-tag
-          v-model="model.xb"
+          v-model="model.lineId"
           dict-code="line"
         />
       </a-form-model-item>
-      <a-form-model-item label="站场区间" prop="qj">
+      <a-form-model-item label="站场区间" prop="stationId">
         <j-list-select-tag
-          v-model="model.qj"
+          v-model="model.stationId"
           dict-code="station"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
+      <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />
@@ -76,10 +76,10 @@ export default {
       isCheck: false,
       model: {},
       validatorRules: {
-        bm: [{ required: true, message: '请选择' }],
-        xb: [{ required: true, message: '请选择' }],
-        qj: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        deptId: [{ required: true, message: '请选择' }],
+        lineId: [{ required: true, message: '请选择' }],
+        stationId: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         zzh: [{ required: true, message: '请输入' }],
         glb: [{ required: true, message: '请输入' }],
         kgbh: [{ required: true, message: '请输入' }],

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

@@ -5,7 +5,7 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.xb"
+            v-model="queryParam.lineId"
             style="width: 150px"
             placeholder="选择线别"
             dict-code="line"
@@ -13,7 +13,7 @@
         </a-form-item>
         <a-form-item>
           <j-list-select-tag
-            v-model="queryParam.qj"
+            v-model="queryParam.stationId"
             style="width: 150px"
             placeholder="选择区间站场"
             dict-code="station"
@@ -21,7 +21,7 @@
         </a-form-item>
         <a-form-item>
           <a-tree-select
-            v-model="queryParam.bm"
+            v-model="queryParam.deptId"
             style="width: 150px"
             :show-search="true"
             allow-clear
@@ -33,7 +33,7 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.hb"
+            v-model="queryParam.xingbie"
             style="width: 150px"
             placeholder="选择行别"
             dict-code="xingbie"

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

@@ -12,26 +12,26 @@ function columns(vm) {
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '线别',
       align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     {
       title: '区间站场',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '行别',
       align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
+      dataIndex: 'xingbie',
+      key: 'xingbie'
     },
     {
       title: '支柱号',

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

@@ -32,9 +32,9 @@
           dict-code="station"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
+      <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />
@@ -73,7 +73,7 @@ export default {
         deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         zzh: [{ required: true, message: '请输入' }],
         glb: [{ required: true, message: '请输入' }],
         xch: [{ required: true, message: '请输入' }]

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

@@ -33,7 +33,7 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.hb"
+            v-model="queryParam.xingbie"
             style="width: 150px"
             placeholder="选择行别"
             dict-code="xingbie"

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

@@ -12,26 +12,26 @@ function columns(vm) {
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '线别',
       align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     {
       title: '区间站场',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '行别',
       align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
+      dataIndex: 'xingbie',
+      key: 'xingbie'
     },
     {
       title: '支柱号范围',

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

@@ -32,9 +32,9 @@
           dict-code="station"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="hb">
+      <a-form-model-item label="行别" prop="xingbie">
         <j-dict-select-tag
-          v-model="model.hb"
+          v-model="model.xingbie"
           type="radioButton"
           dict-code="xingbie"
         />
@@ -73,7 +73,7 @@ export default {
         deptId: [{ required: true, message: '请选择' }],
         lineId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
-        hb: [{ required: true, message: '请选择' }],
+        xingbie: [{ required: true, message: '请选择' }],
         zzh: [{ required: true, message: '请输入' }],
         glb: [{ required: true, message: '请输入' }],
         xch: [{ required: true, message: '请输入' }]

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

@@ -33,7 +33,7 @@
         </a-form-item>
         <a-form-item>
           <j-dict-select-tag
-            v-model="queryParam.hb"
+            v-model="queryParam.xingbie"
             style="width: 150px"
             placeholder="选择行别"
             dict-code="xingbie"

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

@@ -12,26 +12,26 @@ function columns(vm) {
     {
       title: '车间',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'deptName',
+      key: 'deptName'
     },
     {
       title: '线别',
       align: 'center',
-      dataIndex: 'xb',
-      key: 'xb'
+      dataIndex: 'lineName',
+      key: 'lineName'
     },
     {
       title: '区间站场',
       align: 'center',
-      dataIndex: 'qj',
-      key: 'qj'
+      dataIndex: 'stationName',
+      key: 'stationName'
     },
     {
       title: '行别',
       align: 'center',
-      dataIndex: 'hb',
-      key: 'hb'
+      dataIndex: 'xingbie',
+      key: 'xingbie'
     },
     {
       title: '支柱号范围',

src/views/dashboard/index.vue

@@ -1,13 +1,15 @@
 <template>
-  <el-card class="content-z">
-    <div class="dashboard-text">name: {{ user.nickName }}</div>
-    <el-button v-permission="['system:user:resetPwd']">默认按钮</el-button>
+  <el-card class="content-z ddd" style="display: flex;justify-content: center">
+    <img :src="index" alt="" style="margin-top:20px">
+    <h3 class="wl">WELCOME</h3>
+    <h3 class="title">欢迎进入供电生产管理系统</h3>
+
   </el-card>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-
+import index from '@/assets/icon/index.jpg'
 export default {
   name: 'Dashboard',
   computed: {
@@ -15,20 +17,40 @@ export default {
       'user'
     ])
   },
+  data() {
+    return {
+      index: index
+    }
+  },
   methods: {
   }
 }
 </script>
 
-<style lang="scss" scoped>
-  .dashboard {
-    &-container {
-      margin: 30px;
-    }
+<style scoped>
+  @import '~@/assets/less/common.less'
+</style>
 
-    &-text {
-      font-size: 30px;
-      line-height: 46px;
-    }
+<style lang="css" scoped>
+  .ddd{
+    height: calc(100vh - 158px);
+  }
+  .wl{
+    color: #495060;
+    font-family: Source Han Sans CN;
+    font-weight: medium;
+    font-size: 40px;
+    line-height: 40px;
+    letter-spacing: 0px;
+    text-align: center;
+  }
+  .title{
+    color: #4A5060;
+    font-family: Source Han Sans CN;
+    font-weight: regular;
+    font-size: 28px;
+    line-height: 40px;
+    letter-spacing: 0px;
+    text-align: center;
   }
 </style>