From c0bbf354558f71b997d8bdedd728af988859823c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 19 Apr 2022 17:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E7=BA=BF=E8=B7=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B44?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/datie_02/menus/index.vue |  2 +-
 src/views/newMap/displayCity/lineBoard.vue | 78 ++++++++++++++--------
 src/views/system/configLine/config.vue     |  9 ++-
 3 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/src/jmapNew/theme/datie_02/menus/index.vue b/src/jmapNew/theme/datie_02/menus/index.vue
index 219be537f..877011e54 100644
--- a/src/jmapNew/theme/datie_02/menus/index.vue
+++ b/src/jmapNew/theme/datie_02/menus/index.vue
@@ -115,7 +115,7 @@ export default {
 			const date = new Date(+new Date(`${new Date().toLocaleDateString()} ${timeFormat(time)}`));
 			this.initDate(date);
 		}
-    },// 1668
+    },// 138
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('config/updateMenuBar');
diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue
index 0cd4eae8d..eea45e0fa 100644
--- a/src/views/newMap/displayCity/lineBoard.vue
+++ b/src/views/newMap/displayCity/lineBoard.vue
@@ -2,12 +2,14 @@
 	<el-dialog
 		title="车站股道图"
 		:visible.sync="dialogVisible"
-		width="90%"
+		width="96%"
+		top="5vh"
+		center
 		:before-close="handleClose">
-		<div style="height: 550px; overflow-y: auto;">
-			<div :key="item.id" v-for="item in infoList" style="display: flex; justify-content: space-between;">
+		<div style="height: 550px; overflow-y: auto;background: #DFE3E6;padding: 7px;">
+			<div :key="item.id" v-for="item in infoList" style="display: flex; justify-content: space-between;border-top: 1px solid #fff;padding: 3px">
 				<div>
-					<el-select v-model="item.sectionCode" filterable placeholder="请选择" size="small">
+					<el-select v-model="item.sectionCode" filterable placeholder="请选择" size="mini" style="width: 120px;">
 						<el-option
 							v-for="elem in sectionList"
 							:key="elem.code"
@@ -20,7 +22,7 @@
 				<div>客</div>
 				<div>列车未接近</div>
 				<div>
-					<el-select v-model="item.sectionStatus" filterable placeholder="请选择" size="small">
+					<el-select v-model="item.sectionStatus" filterable placeholder="请选择" size="mini" style="width: 120px;">
 						<el-option
 							v-for="elem in sectionStatusList"
 							:key="elem.value"
@@ -42,16 +44,16 @@
 				<div>{{ item.sectionName }}</div>
 			</div>
 		</div>
-		<div style="display: flex;">
-			<div style="width: 50%">
-				<div style="display: flex;">
-					<div>进路序列模式：/<可修改/></div>
-					<el-button size="small">修改申请</el-button>
-					<el-button size="small">只读申请</el-button>
-					<el-button size="small">查找列车</el-button>
-					<el-input style="width: 70px;" size="small" v-model="searchTrain" />
+		<div style="display: flex;margin-top: 10px;justify-content: space-around;background: #DEE2E5;">
+			<div style="width: 49%;margin-top: 10px;">
+				<div style="display: flex;align-items: center;">
+					<div style="background: #0f0;">{{ '进路序列模式：&lt;可修改&gt;' }}</div>
+					<el-button size="mini">修改申请</el-button>
+					<el-button size="mini">只读申请</el-button>
+					<el-button size="mini">查找列车</el-button>
+					<el-input style="width: 70px;" size="mini" v-model="searchTrain" />
 					<div>上下行</div>
-					<el-select size="small" v-model="andDown">
+					<el-select size="mini" v-model="andDown" style="width: 70px;">
 						<el-option
 							v-for="item in andDownList"
 							:key="item.value"
@@ -60,7 +62,7 @@
 						/>
 					</el-select>
 					<div>接车口</div>
-					<el-select size="small" v-model="andDown">
+					<el-select size="mini" v-model="andDown" style="width: 100px;">
 						<el-option
 							v-for="item in andDownList"
 							:key="item.value"
@@ -69,7 +71,7 @@
 						/>
 					</el-select>
 					<div>发车口</div>
-					<el-select size="small" v-model="andDown">
+					<el-select size="mini" v-model="andDown" style="width: 100px;">
 						<el-option
 							v-for="item in andDownList"
 							:key="item.value"
@@ -80,8 +82,9 @@
 				</div>
 				<el-table
 					:data="tableData"
-					style="width: 100%"
+					style="width: 100%;margin-top: 10px;"
 					highlight-current-row
+					:row-style="{ background: '#ff0' }"
 					border
 				>
 					<el-table-column type="index" width="50" label="序号" />
@@ -97,9 +100,9 @@
 					<el-table-column property="description" label="序列描述" />
 				</el-table>
 			</div>
-			<div style="width: 50%">
-				<div style="display: flex;">
-					<el-select size="small" v-model="unknow">
+			<div style="width: 49%;margin-top: 10px;">
+				<div style="display: flex;align-items: center;">
+					<el-select size="mini" v-model="unknow">
 						<el-option
 							v-for="item in unknowList"
 							:key="item.value"
@@ -108,8 +111,8 @@
 						/>
 					</el-select>
 					<div>调机-J101</div>
-					<el-button size="small">进路预览</el-button>
-					<el-select size="small" v-model="unknow1">
+					<el-button size="mini">进路预览</el-button>
+					<el-select size="mini" v-model="unknow1">
 						<el-option
 							v-for="item in unknowList1"
 							:key="item.value"
@@ -117,12 +120,12 @@
 							:value="item.value"
 						/>
 					</el-select>
-					<el-button size="small">办理进路</el-button>
-					<el-button size="small">发送机车</el-button>
+					<el-button size="mini">办理进路</el-button>
+					<el-button size="mini">发送机车</el-button>
 				</div>
 				<el-table
 					:data="tableData"
-					style="width: 100%"
+					style="width: 100%;margin-top: 10px;"
 					highlight-current-row
 					border
 				>
@@ -135,7 +138,7 @@
 					<el-table-column property="status" label="状态"/>
 					<el-table-column property="leadRoute" label="牵出进路"/>
 					<el-table-column property="pushRoute" label="推入进路"/>
-					<el-table-column property="note" label="note"/>
+					<el-table-column property="note" label="记事"/>
 				</el-table>
 			</div>
 		</div>
@@ -153,14 +156,25 @@
 				andDown: 'all',
 				unknow: '',
 				unknow1: '',
-				tableData: [],
+				tableData: [{},{}],
 				unknowList1: [{label: '全部机车', value: 'all'}],
 				unknowList: [{label: 'J101-执行中', value: 'J101'}],
 				andDownList: [{ label: '全部', value: 'all' }, { label: '上行', value: 'up' }, { label: '下行', value: 'down' }],
 				sectionStatusList: [
 					{label: '办理发车进路', value: ''}
 				],
-				infoList : [{ id: 1 }]
+				infoList : [
+					{ id: 1 },
+					{ id: 2 },
+					{ id: 3 },
+					{ id: 4 },
+					{ id: 5 },
+					{ id: 6 },
+					{ id: 7 },
+					{ id: 8 },
+					{ id: 9 },
+					{ id: 10 }
+					]
 			}
 		},
 		computed: {
@@ -180,5 +194,11 @@
 </script>
 
 <style scoped>
-
+	/deep/ .el-dialog__header{
+		background: #B4B6B9;
+	}
+	/deep/ .el-dialog__body{
+		background: #8D939D;
+		padding: 10px;
+	}
 </style>
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index c6a2e40ec..8626f4597 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -115,7 +115,8 @@ export default {
                 'routeDefaultCheckConflict',
                 'tripNumberIsUnique',
                 'standTbStrategyIsInvalid',
-                'updateTripPlanByServiceNumber'
+                'updateTripPlanByServiceNumber',
+				'hasCTC'
             ],
             selectList: ['runMode', 'singleApproachLockCancelRoute'],
             generalConfig: [
@@ -164,7 +165,8 @@ export default {
                 'routeDefaultCheckConflict',
                 'tripNumberIsUnique',
                 'standTbStrategyIsInvalid',
-                'updateTripPlanByServiceNumber'
+                'updateTripPlanByServiceNumber',
+				'hasCTC'
             ],
             rangeList: ['noParkingSM', 'parkingSM'],
             speedList: ['rmAtpSpeed', 'urmAtpSpeed'],
@@ -219,7 +221,8 @@ export default {
                 routeDefaultCheckConflict: '进路默认开启冲突检测',
                 tripNumberIsUnique: '运行图中车次号是否唯一',
                 standTbStrategyIsInvalid: '站台折返策略不生效',
-                updateTripPlanByServiceNumber: '根据服务号更新车次计划'
+                updateTripPlanByServiceNumber: '根据服务号更新车次计划',
+				hasCTC: '有CTC系统（大铁）'
             }
         };
     },