From f9bab3da35d831693066e94c9eae9cea85b463e5 Mon Sep 17 00:00:00 2001
From: lVAL <wx_5f6b45a71ecc4675bb5307decf1326c7@git.code.tencent.com>
Date: Tue, 27 Oct 2020 18:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AUSline=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |   2 +-
 src/router/index_Common.js                    |  12 +-
 src/utils/baseUrl.js                          |   4 +-
 .../editToolAUS/{ => components}/drawer.vue   |   4 +-
 .../{export.vue => dialog/planExport.vue}     |   4 +-
 .../planMonitor/editToolAUS/line/index.vue    | 135 ++++++++++++++++++
 .../editToolAUS/{ => tool}/index.vue          |  24 ++--
 .../editToolAUS/{ => tool}/menus.vue          |   0
 .../editToolAUS/{ => tool}/monitor.js         |  11 +-
 .../editToolAUS/{ => tool}/schedule.vue       |   2 +-
 src/views/planMonitor/editToolAUS/utils.js    |   1 -
 11 files changed, 170 insertions(+), 29 deletions(-)
 rename src/views/planMonitor/editToolAUS/{ => components}/drawer.vue (96%)
 rename src/views/planMonitor/editToolAUS/{export.vue => dialog/planExport.vue} (99%)
 create mode 100644 src/views/planMonitor/editToolAUS/line/index.vue
 rename src/views/planMonitor/editToolAUS/{ => tool}/index.vue (96%)
 rename src/views/planMonitor/editToolAUS/{ => tool}/menus.vue (100%)
 rename src/views/planMonitor/editToolAUS/{ => tool}/monitor.js (98%)
 rename src/views/planMonitor/editToolAUS/{ => tool}/schedule.vue (99%)

diff --git a/src/permission.js b/src/permission.js
index e57d4f663..c99508435 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -14,7 +14,7 @@ import localStore from 'storejs';
 //     return roles.some(role => permissionRoles.indexOf(role) >= 0);
 // }
 
-const whiteList = ['/login', '/design/login', '/gzzbxy/relay', '/authorization', '/AUStool']; // 不重定向白名单
+const whiteList = ['/login', '/design/login', '/gzzbxy/relay', '/authorization', '/AUSline', '/AUStool']; // 不重定向白名单
 
 // const designPageRegex = [/^\/design/, /^\/scriptDisplay/, /^\/publish/, /^\/orderauthor/, /^\/system/, /^\/iscs/, /^\/display\/record/, /^\/display\/manage/, /^\/apply/, /^\/plan/, /^\/display\/plan/, /^\/displayNew\/record/, /^\/displayNew\/manage/, /^\/displayNew\/plan/, /^\/practiceDisplayNew/, /^\/bigSplitScreen/];
 
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index a15745950..3ec99e1e0 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -80,7 +80,8 @@ const ExamCourseDetail = () => import('@/views/exam/detail/courseDetail');
 const DemonstrationDetail = () => import('@/views/demonstration/detail/index');
 
 const PlanMonitorEditTool = () => import('@/views/planMonitor/editTool/index');
-const PlanMonitorEditAUSTool = () => import('@/views/planMonitor/editToolAUS/index');
+const PlanMonitorEditAUSTool = () => import('@/views/planMonitor/editToolAUS/tool/index');
+const PlanMonitorEditAUSLine = () => import('@/views/planMonitor/editToolAUS/line/index');
 const PlanMonitorDetail = () => import('@/views/planMonitor/detail');
 
 const DesignPlatformHome = () => import('@/views/designPlatform/home');
@@ -210,12 +211,17 @@ export const constantRoutes = [
         path: '/design/jlmap3d/assetmanager',
         component: Jlmap3dAssetManager,
         hidden: true
-    },
+	},
+	{ // 线信息
+		path: '/AUSline',
+		component: PlanMonitorEditAUSLine,
+		hidden: true
+	},
     { // 运行图编辑
         path: '/AUStool',
         component: PlanMonitorEditAUSTool,
         hidden: true
-    },
+	},
     {
         path: '/jlmap3d/sandbox',
         component: Jlmap3dSandbox,
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 7bb629cc4..49f270cfe 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -2,8 +2,8 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
-        // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
+        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'http://192.168.8.107:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.169:9000'; // 旭强
         // BASE_API = 'http://192.168.3.175:9000'; // 张赛
diff --git a/src/views/planMonitor/editToolAUS/drawer.vue b/src/views/planMonitor/editToolAUS/components/drawer.vue
similarity index 96%
rename from src/views/planMonitor/editToolAUS/drawer.vue
rename to src/views/planMonitor/editToolAUS/components/drawer.vue
index d162ebf4a..3cb64f3e1 100644
--- a/src/views/planMonitor/editToolAUS/drawer.vue
+++ b/src/views/planMonitor/editToolAUS/components/drawer.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="drawer" :class="{visible}" tabindex="-1">
-		<div class="drawer__wrapper"  tabindex="-1">
+		<div class="drawer__wrapper"  tabindex="-1" @click="doClose">
 			<div class="layer" :class="[direction]" :style="{width: width+'px'}" tabindex="-1">
 				<div class="title">
 					<span>
@@ -28,7 +28,7 @@ export default {
 		},
 		width: {
 			type: Number,
-			default: 600
+			default: 360
 		},
 		visible: {
 			type: Boolean,
diff --git a/src/views/planMonitor/editToolAUS/export.vue b/src/views/planMonitor/editToolAUS/dialog/planExport.vue
similarity index 99%
rename from src/views/planMonitor/editToolAUS/export.vue
rename to src/views/planMonitor/editToolAUS/dialog/planExport.vue
index aae2bba44..6ffa11d3f 100644
--- a/src/views/planMonitor/editToolAUS/export.vue
+++ b/src/views/planMonitor/editToolAUS/dialog/planExport.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import * as utils from './utils'
+import * as utils from '../utils'
 import echarts from 'echarts';
 import { timeFormat } from '@/utils/date';
 
@@ -247,7 +247,7 @@ export default {
 		doExport() {
 			const urlObject = window.URL || window.webkitURL || window;
 			const export_blob = utils.dataURItoBlob(this.myChart.getDataURL({
-				pixelRatio: 1,
+				pixelRatio: 2,
 				backgroundColor: '#fff'
 			}), 'png');
 			const save_link = document.createElementNS("http://www.w3.org/1999/xhtml", "a");
diff --git a/src/views/planMonitor/editToolAUS/line/index.vue b/src/views/planMonitor/editToolAUS/line/index.vue
new file mode 100644
index 000000000..6148ce0c2
--- /dev/null
+++ b/src/views/planMonitor/editToolAUS/line/index.vue
@@ -0,0 +1,135 @@
+<template>
+	<div class="line">
+		<el-menu class="menus" default-active="2-1" :collapse="true">
+			<el-submenu index="2">
+				<template slot="title">
+					<i class="el-icon-document" />
+				</template>
+				<el-menu-item-group>
+					<span slot="title">Line List</span>
+					<el-tree :data="lineList" :props="defaultProps" @node-click="onSelectLine">
+						<template slot-scope="{data}">
+							<span class="flex" >
+								<span><i class="el-icon-document"/>&ensp;{{data.name}}</span>
+								<el-button
+									type="text"
+									style="color:red"
+									size="mini"
+									@click="doDeletePlan(data)">
+									Delete
+								</el-button>
+							</span>
+						</template>
+					</el-tree>
+				</el-menu-item-group>
+			</el-submenu>
+		</el-menu>
+		<div class="container">
+			<div class="title">
+				<span>title</span>
+			</div>
+			<div class="form">
+				11111111111
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+import Drawer from '../components/drawer.vue';
+
+export default {
+	components: {
+		Drawer
+	},
+	data() {
+		return {
+			defaultProps: {
+				children: 'children',
+				label: 'name'
+			},
+			lineList: [
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+				{name: '1', id: 1},
+				{name: '2', id: 2},
+			]
+		}
+	},
+	methods: {
+		onSelectLine(el) {
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.line {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: space-between;
+
+		.menus {
+			height: 100%;
+		}
+
+		.container {
+			flex: 1;
+			.title {
+				width: 100%;
+				height: 32px;
+				font-size: 26px;
+				padding: 7px;
+				background: rgba(240,240,240,0.3);
+				display: flex;
+				justify-content: center;
+				align-items: center;
+			}
+
+			.form {
+				padding: 30px;
+				width: 50%;
+				margin: auto;
+			}
+		}
+	}
+</style>
diff --git a/src/views/planMonitor/editToolAUS/index.vue b/src/views/planMonitor/editToolAUS/tool/index.vue
similarity index 96%
rename from src/views/planMonitor/editToolAUS/index.vue
rename to src/views/planMonitor/editToolAUS/tool/index.vue
index ec9089b26..b033d5d8e 100644
--- a/src/views/planMonitor/editToolAUS/index.vue
+++ b/src/views/planMonitor/editToolAUS/tool/index.vue
@@ -62,26 +62,27 @@
 		<plan-just-turnback :config="config" :selected="selected"  @justTurnBack="doJustTurnback"/>
 		<plan-set-params :config="config" @setParams="doSetPlanParams" />
 		<plan-create ref="create" @createPlan="doCreatePlan" />
+		<plan-export ref="export" :planUtil="planUtil" :title="title" :width="3600*2+2050" :height="height-160" />
+
 		<div class="fixed" v-show="show">
 			<textarea :auto-focus="true" v-if="textareaModel.show" v-focus v-model="textareaModel.text" class="fixed-textarea"
 				:style="{ left: rect.x+'px', top: rect.y+'px',  width: rect.width+'px', height: rect.height+'px', }"/>
 		</div>
 
-		<export ref="export" :planUtil="planUtil" :title="title" :width="3600*2+2050" :height="height-160" />
   </div>
 </template>
 
 <script>
+import PlanJustRunning from '../dialog/planJustRunning.vue';
+import PlanJustStop from '../dialog/planJustStop.vue';
+import PlanJustTurnback from '../dialog/planJustTurnback.vue';
+import PlanSetParams from '../dialog/planSetParams.vue';
+import PlanCreate from '../dialog/planCreate.vue';
+import PlanExport from '../dialog/planExport.vue';
 import Schedule from './schedule.vue';
-import PlanJustRunning from './dialog/planJustRunning.vue';
-import PlanJustStop from './dialog/planJustStop.vue';
-import PlanJustTurnback from './dialog/planJustTurnback.vue';
-import PlanSetParams from './dialog/planSetParams.vue';
-import PlanCreate from './dialog/planCreate.vue';
-import Drawer from './drawer.vue';
 import Menus from './menus.vue';
-import Export from './export.vue';
-import { MenuEnum } from './utils.js';
+import Drawer from '../components/drawer.vue';
+import * as utils from '../utils.js';
 import { timeFormat } from '@/utils/date';
 import { mapGetters } from 'vuex';
 import { getStationList } from '@/api/runplan';
@@ -102,9 +103,9 @@ export default {
 		PlanJustTurnback,
 		PlanSetParams,
 		PlanCreate,
+		PlanExport,
         Menus,
 		Drawer,
-		Export
     },
     data() {
         return {
@@ -170,7 +171,7 @@ export default {
 			return '00';
 		},
 		MenuEnum() {
-			return MenuEnum;
+			return utils.MenuEnum;
 		}
     },
 	watch: {
@@ -332,6 +333,7 @@ export default {
 		},
 		onSelectPlan(el) {
 			this.$router.replace({ path: 'AUStool', query: { planId: el.id, title: el.name }});
+			this.drawer = false;
 		},
 		doExport() {
 			this.$refs.export.doShow(this.stations, this.planData);
diff --git a/src/views/planMonitor/editToolAUS/menus.vue b/src/views/planMonitor/editToolAUS/tool/menus.vue
similarity index 100%
rename from src/views/planMonitor/editToolAUS/menus.vue
rename to src/views/planMonitor/editToolAUS/tool/menus.vue
diff --git a/src/views/planMonitor/editToolAUS/monitor.js b/src/views/planMonitor/editToolAUS/tool/monitor.js
similarity index 98%
rename from src/views/planMonitor/editToolAUS/monitor.js
rename to src/views/planMonitor/editToolAUS/tool/monitor.js
index 7f7efe578..aaeac448f 100644
--- a/src/views/planMonitor/editToolAUS/monitor.js
+++ b/src/views/planMonitor/editToolAUS/tool/monitor.js
@@ -1,6 +1,5 @@
 import echarts from 'echarts';
-import * as utils from './utils'
-import { MenuEnum } from './utils';
+import * as utils from '../utils'
 
 export default {
 	data() {
@@ -435,15 +434,15 @@ export default {
 				this.doSetSelected({e, pointInGrid});
 
 				if (e.dataIndex < length - 1 && e.value[1] == near[1]) {
-					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: MenuEnum.planJustStop });
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planJustStop });
 				} else if (e.dataIndex < length - 1 && e.value[1] != near[1] && e.value[1] == next[1]) {
-					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: MenuEnum.planJustTurnBack });
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planJustTurnBack });
 				} else if (e.dataIndex == 0 ||  e.dataIndex > 0 && e.value[1] == prev[1]) {
-					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: MenuEnum.planJustRunning });
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planJustRunning });
 				}
 			} else if (e.target && e.target.subType == 'area') {
 				if (this.model.action == 'Note') {
-					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: MenuEnum.planSetAreaNote });
+					this.$store.dispatch('menuOperation/setPopMenu', { position: point, menu: utils.MenuEnum.planSetAreaNote });
 				}
 			}
 		},
diff --git a/src/views/planMonitor/editToolAUS/schedule.vue b/src/views/planMonitor/editToolAUS/tool/schedule.vue
similarity index 99%
rename from src/views/planMonitor/editToolAUS/schedule.vue
rename to src/views/planMonitor/editToolAUS/tool/schedule.vue
index ddb14782d..5bdcbef18 100644
--- a/src/views/planMonitor/editToolAUS/schedule.vue
+++ b/src/views/planMonitor/editToolAUS/tool/schedule.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import * as utils from './utils'
+import * as utils from '../utils'
 import echarts from 'echarts';
 import Monitor from './monitor.js';
 import { timeFormat } from '@/utils/date';
diff --git a/src/views/planMonitor/editToolAUS/utils.js b/src/views/planMonitor/editToolAUS/utils.js
index a470a81f9..97426f1c0 100644
--- a/src/views/planMonitor/editToolAUS/utils.js
+++ b/src/views/planMonitor/editToolAUS/utils.js
@@ -106,7 +106,6 @@ export function findPrev(list, idx, cb) {
 	return null;
 }
 
-
 export function dataURItoBlob(dataURI, dataTYPE) {
 var binary = atob(dataURI.split(',')[1]), array = [];
 for(var i = 0; i < binary.length; i++) array.push(binary.charCodeAt(i));