修改

src/views/basics/line/index.vue

@@ -101,7 +101,12 @@
         :row-selection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange"
       >
-
+        <template slot="deptName" slot-scope="text, record">
+          <span v-for="(item, index) in record['deptLines']">
+            <span v-if="record['deptLines'].length -1 != index"> {{item.deptName || item.deptId}} ，</span>
+            <span v-else>{{item.deptName || item.deptId}} </span>
+          </span>
+        </template>
         <span slot="action" slot-scope="text, record">
           <a-button size="small" type="primary" @click="handleEdit(record)">
             编辑

src/views/basics/line/indexColumns.js

@@ -15,12 +15,12 @@ function columns(vm) {
     //   dataIndex: 'lineSjbh',
     //   key: 'lineSjbh'
     // },
-    {
-      title: '段别',
-      align: 'center',
-      dataIndex: 'deptParentName',
-      key: 'deptParentName'
-    },
+    // {
+    //   title: '段别',
+    //   align: 'center',
+    //   dataIndex: 'deptParentName',
+    //   key: 'deptParentName'
+    // },
     {
       title: '线路名称',
       align: 'center',
@@ -31,6 +31,7 @@ function columns(vm) {
       title: '车间',
       align: 'center',
       dataIndex: 'deptName',
+      scopedSlots: { customRender: 'deptName' },
       key: 'deptName'
     },
     // {

src/views/basics/section/CheckAndEditModel.vue

@@ -93,9 +93,7 @@ export default {
   },
   watch: {
     'model.lineId': {
-      deep: true,
       handler: function(newV, oldV) {
-        debugger
         if (this.model.lineId) {
           this.loadTree(this.model.lineId)
         }

src/views/basics/section/index.vue

@@ -61,17 +61,21 @@
     <!-- 操作按钮区域 -->
     <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-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-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-icon type="down"/>
         </a-button>
       </a-dropdown>
     </div>
@@ -79,7 +83,8 @@
     <!-- 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;
+        <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>
 
@@ -96,16 +101,19 @@
         @change="handleTableChange"
       >
         <template slot="deptName" slot-scope="text, record">
-          {{record['deptStations'][0].deptName || record['deptStations'][0].deptId }}
+          <span v-for="(item, index) in record['deptStations']">
+            <span v-if="record['deptStations'].length -1 != index"> {{item.deptName || item.deptId}} ，</span>
+            <span v-else>{{item.deptName || item.deptId}} </span>
+          </span>
         </template>
         <template slot="lineName" slot-scope="text, record">
-          {{ record['deptStations'][0].lineName || record['deptStations'][0].lineId }}
+          {{ record.lineName || record.lineId }}
         </template>
         <span slot="action" slot-scope="text, record">
           <a-button size="small" type="primary" @click="handleEdit(record)">
             编辑
           </a-button>
-          <a-divider type="vertical" />
+          <a-divider type="vertical"/>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.stationId)">
             <a-button size="small" type="danger">
               删除
@@ -113,53 +121,53 @@
           </a-popconfirm>
         </span>
       </a-table>
-      <check-and-edit-model ref="modalForm" @ok="modalFormOk" />
+      <check-and-edit-model ref="modalForm" @ok="modalFormOk"/>
     </div>
     <!-- table区域-end -->
     <!-- 表单区域 -->
   </el-card>
 </template>
 <script>
-import { listMixin } from '@/mixin/listMixin'
-import columns from './indexColumns'
-import CheckAndEditModel from './CheckAndEditModel'
-import {getAction} from "@/api/request";
+  import {listMixin} from '@/mixin/listMixin'
+  import columns from './indexColumns'
+  import CheckAndEditModel from './CheckAndEditModel'
+  import {getAction} from "@/api/request";
 
-export default {
-  components: {
-    CheckAndEditModel
-  },
-  mixins: [listMixin],
-  data() {
-    return {
-      // 查询条件
-      queryParam: {},
-      // 表头
-      columns: columns(this),
-      treeData: [],
-      url: {
-        list: '/business/catenary/bus/station/list',
-        delete: '/business/catenary/bus/station/',
-        exportXlsUrl: '/exportXlsUrl',
-        tree: '/system/dept/treeSelect',
-        importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
-      }
-    }
-  },
-  created() {
-    this.loadTree()
-  },
-  methods: {
-    loadTree() {
-      this.treeData = []
-      getAction(this.url.tree).then((res) => {
-        if (res.code === 200) {
-          this.treeData = res.data
+  export default {
+    components: {
+      CheckAndEditModel
+    },
+    mixins: [listMixin],
+    data() {
+      return {
+        // 查询条件
+        queryParam: {},
+        // 表头
+        columns: columns(this),
+        treeData: [],
+        url: {
+          list: '/business/catenary/bus/station/list',
+          delete: '/business/catenary/bus/station/',
+          exportXlsUrl: '/exportXlsUrl',
+          tree: '/system/dept/treeSelect',
+          importExcelUrl: `${process.env.VUE_APP_BASE_API}/importExcelUrl`
         }
-      })
+      }
+    },
+    created() {
+      this.loadTree()
+    },
+    methods: {
+      loadTree() {
+        this.treeData = []
+        getAction(this.url.tree).then((res) => {
+          if (res.code === 200) {
+            this.treeData = res.data
+          }
+        })
+      }
     }
   }
-}
 </script>
 <style scoped>
   @import '~@/assets/less/common.less'

src/views/basics/section/indexColumns.js

@@ -32,8 +32,8 @@ function columns(vm) {
     {
       title: '区间/站场',
       align: 'center',
-      dataIndex: 'stationType',
-      key: 'stationType'
+      dataIndex: 'stationTypeText',
+      key: 'stationTypeText'
     },
     {
       title: '行别',

src/views/basics/tunnel/CheckAndEditModel.vue

@@ -44,8 +44,14 @@
       <a-form-model-item label="两侧杆号" prop="lcgh">
         <a-input v-model="model.lcgh" style="width: 100%" />
       </a-form-model-item>
-      <a-form-model-item label="起止里程/中心里程" prop="qzlcZxlc">
-        <a-input v-model="model.qzlcZxlc" style="width: 100%" />
+      <a-form-model-item label="起始里程" prop="startMarker">
+        <a-input v-model="model.startMarker" style="width: 100%" />
+      </a-form-model-item>
+      <a-form-model-item label="中心里程" prop="centerMarker">
+        <a-input v-model="model.centerMarker" style="width: 100%" />
+      </a-form-model-item>
+      <a-form-model-item label="终止里程" prop="endMarker">
+        <a-input v-model="model.endMarker" style="width: 100%" />
       </a-form-model-item>
       <a-form-model-item label="隧道长度/M" prop="sdcd">
         <a-input v-model="model.sdcd" style="width: 100%" />
@@ -80,7 +86,9 @@ export default {
         deptId: [{ required: true, message: '请选择' }],
         stationId: [{ required: true, message: '请选择' }],
         lcgh: [{ required: true, message: '请输入' }],
-        qzlcZxlc: [{ required: true, message: '请输入' }],
+        startMarker: [{ required: true, message: '请输入' }],
+        centerMarker: [{ required: true, message: '请输入' }],
+        endMarker: [{ required: true, message: '请输入' }],
         sdcd: [{ required: true, message: '请输入' }]
 
       },

src/views/basics/tunnel/indexColumns.js

@@ -40,10 +40,22 @@ function columns(vm) {
       key: 'lcgh'
     },
     {
-      title: '起止里程/中心里程',
+      title: '起始里程',
       align: 'center',
-      dataIndex: 'qzlcZxlc',
-      key: 'qzlcZxlc'
+      dataIndex: 'startMarker',
+      key: 'startMarker'
+    },
+    {
+      title: '中心里程',
+      align: 'center',
+      dataIndex: 'centerMarker',
+      key: 'centerMarker'
+    },
+    {
+      title: '终止里程',
+      align: 'center',
+      dataIndex: 'endMarker',
+      key: 'endMarker'
     },
     {
       title: '隧道长度/M',

src/views/sys/user/index.vue

@@ -87,9 +87,9 @@
             <template slot="dept" slot-scope="text, record">
               {{ record['dept'].deptName }}
             </template>
-            <template slot="leader" slot-scope="text, record">
-              {{ record['dept'].leader }}
-            </template>
+<!--            <template slot="leader" slot-scope="text, record">-->
+<!--              {{ record['dept'].leader }}-->
+<!--            </template>-->
             <template slot="status" slot-scope="text, record">
               <a-switch
                 v-if="JSPermission(['pc:system:user:edit'])"

src/views/sys/user/indexColumns.js

@@ -36,9 +36,8 @@ function columns(vm) {
     {
       title: '职务',
       align: 'center',
-      dataIndex: 'leader',
-      scopedSlots: { customRender: 'leader' },
-      key: 'leader'
+      dataIndex: 'roleIds',
+      key: 'roleIds'
     },
     {
       title: '手机号',