ctc界面调整1

src/jmapNew/theme/datie_02/menus/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="menus" :style="{width: width + 'px'}">
-    <!--<menu-bar v-show="isShowBar" ref="menuBar" :selected="selected" />-->
+    <menu-bar v-show="isCtc" ref="menuBar" :selected="selected" />
 	  <!--<div v-if="$store.state.training.prdType == '01'" class="alarm-window">-->
 		  <!--<div v-for="elem in alarmMessages" :key="elem.id" style="font-size: 14px;">-->
 			  <!--{{ elem.message }}-->
@@ -23,7 +23,8 @@
 		  <div style="width: 60%;height: 30px;line-height: 30px;text-align: center;">提示信息窗</div>
 		  <div style="width: 40%;height: 30px;line-height: 30px;text-align: center;border-left: 2px #ccc solid;">{{ '操控A:主机' + '  ' + dateString + '  ' + time }}</div>
 	  </div>
-    <menu-button ref="menuButton" :selected="selected" />
+    <menu-button v-if="!isCtc" ref="menuButton" :selected="selected" />
+	<menu-button-ctc v-if="isCtc" ref="menuButtonCtc" :selected="selected" />
     <menu-station-stand ref="menuStationStand" :selected="selected" />
     <menu-switch ref="menuSwitch" :selected="selected" />
     <menu-signal ref="menuSignal" :selected="selected" />
@@ -46,6 +47,7 @@ import MenuSection from './menuSection';
 import MenuTrain from './menuTrain';
 import MenuStation from './menuStation';
 import MenuBar from './menuBar';
+import MenuButtonCtc from './menuButtonCtc';
 import PassiveAlarm from './passiveDialog/alarm';
 import PassiveContorl from '@/jmapNew/theme/components/menus/passiveDialog/control';
 import PassiveTimeout from './passiveDialog/timeout';
@@ -64,7 +66,8 @@ export default {
         MenuTrain,
         PassiveAlarm,
         PassiveContorl,
-        PassiveTimeout
+        PassiveTimeout,
+		MenuButtonCtc
     },
     props: {
         selected: {
@@ -104,7 +107,10 @@ export default {
         ]),
         isShowBar() {
             return this.$store.state.training.prdType && this.$store.state.training.prdType !== '07';
-        }
+        },
+		isCtc() {
+        	return this.$route.query.ctc
+		}
     },
     watch: {
         isShowBar(val) {

src/jmapNew/theme/datie_02/menus/menuBar.vue

@@ -1,6 +1,26 @@
 <template>
   <div id="menuBarChengdu3">
     <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+	  <!--<div style="display: flex;">-->
+	  <!--<img :src="ctcBarIcon1" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon2" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon3" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon4" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon5" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon6" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon7" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon8" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon9" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon10" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon11" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon12" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon13" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon14" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon15" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon16" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon17" class="img-box" />-->
+	  <!--<img :src="ctcBarIcon18" class="img-box" />-->
+	  <!--</div>-->
     <station-control-convert ref="stationControlConvert" />
     <password-box ref="passwordBox" @setLoginResult="getLoginResult" />
     <view-name ref="viewName" />
@@ -25,6 +45,24 @@ import ViewName from './menuDialog/viewName';
 import ManageUser from './menuDialog/manageUser';
 import HelpAbout from './menuDialog/helpAbout';
 import SetLimitSpeed from './menuDialog/setLimitSpeed';
+import CtcBarIcon1 from '@/assets/ctc_icon/pic1.png';
+import CtcBarIcon2 from '@/assets/ctc_icon/pic2.png';
+import CtcBarIcon3 from '@/assets/ctc_icon/pic3.png';
+import CtcBarIcon4 from '@/assets/ctc_icon/pic4.png';
+import CtcBarIcon5 from '@/assets/ctc_icon/pic5.png';
+import CtcBarIcon6 from '@/assets/ctc_icon/pic6.png';
+import CtcBarIcon7 from '@/assets/ctc_icon/pic7.png';
+import CtcBarIcon8 from '@/assets/ctc_icon/pic8.png';
+import CtcBarIcon9 from '@/assets/ctc_icon/pic9.png';
+import CtcBarIcon10 from '@/assets/ctc_icon/pic10.png';
+import CtcBarIcon11 from '@/assets/ctc_icon/pic11.png';
+import CtcBarIcon12 from '@/assets/ctc_icon/pic12.png';
+import CtcBarIcon13 from '@/assets/ctc_icon/pic13.png';
+import CtcBarIcon14 from '@/assets/ctc_icon/pic14.png';
+import CtcBarIcon15 from '@/assets/ctc_icon/pic15.png';
+import CtcBarIcon16 from '@/assets/ctc_icon/pic16.png';
+import CtcBarIcon17 from '@/assets/ctc_icon/pic17.png';
+import CtcBarIcon18 from '@/assets/ctc_icon/pic18.png';
 
 export default {
     name: 'MenuBarChengdu03',
@@ -42,6 +80,24 @@ export default {
     },
     data() {
         return {
+        	ctcBarIcon1: CtcBarIcon1,
+			ctcBarIcon2: CtcBarIcon2,
+			ctcBarIcon3: CtcBarIcon3,
+			ctcBarIcon4: CtcBarIcon4,
+			ctcBarIcon5: CtcBarIcon5,
+			ctcBarIcon6: CtcBarIcon6,
+			ctcBarIcon7: CtcBarIcon7,
+			ctcBarIcon8: CtcBarIcon8,
+			ctcBarIcon9: CtcBarIcon9,
+			ctcBarIcon10: CtcBarIcon10,
+			ctcBarIcon11: CtcBarIcon11,
+			ctcBarIcon12: CtcBarIcon12,
+			ctcBarIcon13: CtcBarIcon13,
+			ctcBarIcon14: CtcBarIcon14,
+			ctcBarIcon15: CtcBarIcon15,
+			ctcBarIcon16: CtcBarIcon16,
+			ctcBarIcon17: CtcBarIcon17,
+			ctcBarIcon18: CtcBarIcon18,
             menuNormal: {
                 Local: [
                     {
@@ -682,4 +738,9 @@ export default {
     #menuBarChengdu3 #menuBar .menu-li-block .label{
         padding: 0px 30px 0px 5px !important;
     }
+	.img-box{
+		width: 20px;
+		height: 20px;
+		margin-top: 30px;
+	}
 </style>

src/jmapNew/theme/datie_02/menus/menuButtonCtc.vue

@@ -66,13 +66,13 @@
 				<center><b>按</b><b>钮</b></center>
 			</span>
 		</button>
-		<button :id="" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown()">
+		<button :id="111" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown()">
 			<span style="color: black;">
 				<center><b>坡</b><b>道</b></center>
 				<center><b>解</b><b>锁</b></center>
 			</span>
 		</button>
-		<button :disabled="true" :id="" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown()">
+		<button :disabled="true" :id="222" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown()">
 			<span style="color: black;">
 				<center><b>分</b><b>路</b></center>
 				<center><b>不</b><b>良</b></center>
@@ -84,19 +84,19 @@
 				<center><b>清</b><b>除</b></center>
 			</span>
 		</button>
-		<button :id="" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown()">
+		<button :id="333" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown()">
 			<span style="color: black;">
 				<center><b>命</b><b>令</b></center>
 				<center><b>下</b><b>达</b></center>
 			</span>
 		</button>
-		<button :id="" class="button_box" :style="{width: width+'px', backgroundColor: buttonUpColor}" @click="buttonDown()">
+		<button :id="444" class="button_box" :style="{width: width+'px', backgroundColor: buttonUpColor}" @click="buttonDown()">
 			<span style="color: black;">
 				<center><b>状</b><b>态</b></center>
 				<center><b>选</b><b>择</b></center>
 			</span>
 		</button>
-		<button :id="" class="button_box" :style="{width: width+'px', backgroundColor: buttonUpColor}" @click="buttonDown()">
+		<button :id="555" class="button_box" :style="{width: width+'px', backgroundColor: buttonUpColor}" @click="buttonDown()">
 			<span style="color: black;">
 				<center><b>模</b><b>式</b></center>
 				<center><b>转</b><b>换</b></center>
@@ -117,7 +117,6 @@
 	import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 	import { MouseEvent } from '@/scripts/ConstDic';
 	import CenterConfig from '../../../../views/newMap/newMapdraft/mapoperate/displayConfig/centerConfig';
-	// import { OperateMode } from '@/scripts/ConstDic';48
 
 	export default {
 		name: 'MapButtonMenu',
@@ -138,7 +137,7 @@
 			return {
 				point: {
 				    x: 0,
-				    y: 0
+				    y: 30
 				},
 				operation: '0',
 				buttonName: '',
@@ -146,7 +145,7 @@
 				guideColorUp: '#DCDCDC',
 				buttonDownColor: '#FEEE1A',
 				buttonUpColor: '#DCDCDC',
-				width: 78,
+				width: 60,
 				tempData: null,
 				offset: {},
 				commandTypeList: [],

src/views/newMap/displayNew/menuSchema.vue

@@ -224,6 +224,8 @@ export default {
 					mapId:this.$route.query.mapId,
 					project: this.project,
 					newApi: this.$route.query.newApi,
+					ctc: true,
+					try: this.$route.query.try,
 					token:getToken(),
 					noPreLogout: true
 				}