线路修改

src/views/basics/line/CheckAndEditModel.vue

@@ -26,19 +26,31 @@
           :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
         />
       </a-form-model-item>
-      <a-form-model-item label="行别" prop="xingbie">
-        <j-dict-select-tag
-          v-model="model.xingbie"
-          type="radioButton"
-          dict-code="xingbie"
-        />
+<!--      <a-form-model-item label="行别" prop="xingbie">-->
+<!--        <j-dict-select-tag-->
+<!--          v-model="model.xingbie"-->
+<!--          type="radioButton"-->
+<!--          dict-code="xingbie"-->
+<!--        />-->
+<!--      </a-form-model-item>-->
+      <a-form-model-item label="上行起始公里标" prop="upStartMarker">
+        <a-input v-model="model.upStartMarker" style="width: 100%" />
+      </a-form-model-item>
+      <a-form-model-item label="上行结束公里标" prop="upEndMarker">
+        <a-input v-model="model.upEndMarker" style="width: 100%" />
       </a-form-model-item>
-      <a-form-model-item label="开始公里标" prop="lineStartMarker">
-        <a-input v-model="model.lineStartMarker" style="width: 100%" />
+      <a-form-model-item label="下行结束公里标" prop="downStartMarker">
+        <a-input v-model="model.downStartMarker" style="width: 100%" />
       </a-form-model-item>
-      <a-form-model-item label="结束公里标" prop="lineEndMarker">
-        <a-input v-model="model.lineEndMarker" style="width: 100%" />
+      <a-form-model-item label="下行起始公里标" prop="downEndMarker">
+        <a-input v-model="model.downEndMarker" style="width: 100%" />
       </a-form-model-item>
+      <!--      <a-form-model-item label="开始公里标" prop="lineStartMarker">-->
+      <!--        <a-input v-model="model.lineStartMarker" style="width: 100%" />-->
+      <!--      </a-form-model-item>-->
+      <!--      <a-form-model-item label="结束公里标" prop="lineEndMarker">-->
+      <!--        <a-input v-model="model.lineEndMarker" style="width: 100%" />-->
+      <!--      </a-form-model-item>-->
     </a-form-model>
   </j-modal>
 </template>
@@ -54,8 +66,8 @@ export default {
   data() {
     return {
       treeData: [],
-      labelCol: { span: 4 },
-      wrapperCol: { span: 19 },
+      labelCol: { span: 5 },
+      wrapperCol: { span: 18 },
       dataSource: [],
       title: '',
       visible: false,
@@ -65,9 +77,11 @@ export default {
         lineSjbh: [{ required: true, message: '请输入' }],
         lineName: [{ required: true, message: '请输入' }],
         deptId: [{ required: true, message: '请选择' }],
-        xingbie: [{ required: true, message: '请选择' }],
-        lineStartMarker: [{ required: true, message: '请输入' }],
-        lineEndMarker: [{ required: true, message: '请输入' }]
+        // xingbie: [{ required: true, message: '请选择' }],
+        upStartMarker: [{ required: true, message: '请输入' }],
+        upEndMarker: [{ required: true, message: '请输入' }]
+        // lineStartMarker: [{ required: true, message: '请输入' }],
+        // lineEndMarker: [{ required: true, message: '请输入' }]
 
       },
       url: {

src/views/basics/line/index.vue

@@ -22,26 +22,40 @@
             :replace-fields="{children:'children', title:'label', key:'id', value: 'id' }"
           />
         </a-form-item>
+<!--        <a-form-item>-->
+<!--          <j-dict-select-tag-->
+<!--            v-model="queryParam.xingbie"-->
+<!--            style="width: 150px"-->
+<!--            placeholder="选择行别"-->
+<!--            dict-code="xingbie"-->
+<!--          />-->
+<!--        </a-form-item>-->
         <a-form-item>
-          <j-dict-select-tag
-            v-model="queryParam.xingbie"
+          <a-input
+            v-model="queryParam.upStartMarker"
+            style="width: 150px"
+            placeholder="输入上行开始公里标"
+          />
+        </a-form-item>
+        <a-form-item>
+          <a-input
+            v-model="queryParam.upEndMarker"
             style="width: 150px"
-            placeholder="选择行别"
-            dict-code="xingbie"
+            placeholder="输入上行结束公里标"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.lineStartMarker"
+            v-model="queryParam.downStartMarker"
             style="width: 150px"
-            placeholder="输入开始公里标"
+            placeholder="输入下行开始公里标"
           />
         </a-form-item>
         <a-form-item>
           <a-input
-            v-model="queryParam.lineEndMarker"
+            v-model="queryParam.downEndMarker"
             style="width: 150px"
-            placeholder="输入结束公里标"
+            placeholder="输入下行结束公里标"
           />
         </a-form-item>
         <a-form-item>

src/views/basics/line/indexColumns.js

@@ -33,23 +33,47 @@ function columns(vm) {
       dataIndex: 'deptName',
       key: 'deptName'
     },
+    // {
+    //   title: '行别',
+    //   align: 'center',
+    //   dataIndex: 'xingbieText',
+    //   key: 'xingbieText'
+    // },
+    // {
+    //   title: '开始公里标',
+    //   align: 'center',
+    //   dataIndex: 'lineStartMarker',
+    //   key: 'lineStartMarker'
+    // },
+    // {
+    //   title: '结束公里标',
+    //   align: 'center',
+    //   dataIndex: 'lineEndMarker',
+    //   key: 'lineEndMarker'
+    // },
     {
-      title: '行别',
+      title: '上行开始公里标',
       align: 'center',
-      dataIndex: 'xingbieText',
-      key: 'xingbieText'
+      dataIndex: 'upStartMarker',
+      key: 'upStartMarker'
     },
     {
-      title: '开始公里标',
+      title: '上行结束公里标',
       align: 'center',
-      dataIndex: 'lineStartMarker',
-      key: 'lineStartMarker'
+      dataIndex: 'upEndMarker',
+      key: 'upEndMarker'
     },
     {
-      title: '结束公里标',
+      title: '下行开始公里标',
       align: 'center',
-      dataIndex: 'lineEndMarker',
-      key: 'lineEndMarker'
+      dataIndex: 'downStartMarker',
+      key: 'downStartMarker'
+    },
+    {
+      title: '下行结束公里标',
+      align: 'center',
+      dataIndex: 'downEndMarker',
+      key: 'downEndMarker'
     },
     {
       title: '操作',

src/views/catenary/fault/CheckAndEditModel.vue

@@ -30,7 +30,7 @@
         />
       </a-form-model-item>
       <a-form-model-item label="公里标" prop="marker">
-        <a-input v-model="model.marker"  placeholder="请输入" />
+        <a-input v-model="model.marker" placeholder="请输入" />
       </a-form-model-item>
       <a-form-model-item label="原因类型" prop="yylx">
         <j-dict-select-tag
@@ -51,6 +51,13 @@
       <a-form-model-item label="图片上传" prop="imgList">
         <j-image-upload v-model="model.pics" :is-multiple="true" biz-path="scott/pic" />
       </a-form-model-item>
+      <a-form-model-item label="故障描述" prop="gzms">
+        <a-textarea
+          v-model="model.gzms"
+          placeholder="请输入"
+          :auto-size="{ minRows: 3, maxRows: 5 }"
+        />
+      </a-form-model-item>
     </a-form-model>
   </j-modal>
 </template>
@@ -82,7 +89,8 @@ export default {
         xingbie: [{ required: true, message: '请选择' }],
         marker: [{ required: true, message: '请输入' }],
         yylx: [{ required: true, message: '请选择' }],
-        operationDate: [{ required: true, message: '请选择' }]
+        operationDate: [{ required: true, message: '请选择' }],
+        gzms: [{ required: true, message: '请输入' }]
 
       },
       url: {

src/views/login/index.vue

@@ -109,8 +109,8 @@ export default {
       pic: pic,
       title: title,
       loginForm: {
-        username: 'railway',
-        password: 'admin123',
+        username: '',
+        password: '',
         code: '',
         uuid: ''
       },

src/views/sys/role/indexColumns.js

@@ -9,8 +9,8 @@ function columns(vm) {
     {
       title: '本职务成员数量',
       align: 'center',
-      dataIndex: 'bm',
-      key: 'bm'
+      dataIndex: 'userCount',
+      key: 'userCount'
     },
     {
       title: '职务描述',