From 6fa98a65853d74c0e99d3c4e6c73d533d1a599f8 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 24 Oct 2019 18:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Entry.vue           |   2 +-
 src/views/components/drapUp/index.vue     | 104 ----------------------
 src/views/components/filterCity/index.vue |  31 +++----
 src/views/trainingPlatform/demonList.vue  |   2 -
 4 files changed, 15 insertions(+), 124 deletions(-)
 delete mode 100644 src/views/components/drapUp/index.vue

diff --git a/src/layout/components/Entry.vue b/src/layout/components/Entry.vue
index 5cb832b3a..f9483f21c 100644
--- a/src/layout/components/Entry.vue
+++ b/src/layout/components/Entry.vue
@@ -41,7 +41,7 @@ export default {
 				{
 					name: 'global.scan',
 					handle: this.qcodeEntry,
-					hidden: process.env.NODE_ENV != 'development'
+					hidden: process.env.NODE_ENV != 'development' || getSessionStorage('design')
 				},
 				{
 					name: 'global.quickEntry',
diff --git a/src/views/components/drapUp/index.vue b/src/views/components/drapUp/index.vue
deleted file mode 100644
index 7fb219cc9..000000000
--- a/src/views/components/drapUp/index.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div
-    ref="drapBox"
-    class="drapHeight"
-    :style="{width: width + 'px', height: height + 'px', top: heightUp +'px'}"
-    @mousedown="mousedown"
-  />
-</template>
-
-<script>
-import localStore from 'storejs';
-
-export default {
-	name: 'DrapUp',
-	props: {
-        heightUp: {
-			type: Number,
-			required: true
-		},
-		isSave: {
-			type: Boolean,
-			default: true
-		},
-		max: {
-			type: Number,
-			default: 0
-		},
-		min: {
-			type: Number,
-			default: 0
-		},
-		width: {
-			type: Number,
-			default: 0
-		},
-        height: {
-            type: Number,
-            default: 36
-        }
-	},
-	data() {
-		return {
-            heightUps: 0
-		};
-	},
-    computed: {
-        heightTotol() {
-            return this.$store.state.app.height - 50;
-        },
-    },
-	mounted() {
-		const oDiv = this.$refs.drapBox;
-		oDiv.onmousedown = () => {
-			return false;
-		};
-	},
-	methods: {
-		mousedown(e) {
-			const oDiv = this.$refs.drapBox;
-			const maxNum = this.max || this.heightTotol-200;
-			const minNum = this.min || 150;
-			oDiv.onmousedown = function() {
-				return false;
-			};
-			e.stopPropagation();
-			window.event.cancelBubble = true;
-			const odiv = e.target;
-			const disY = e.clientY - odiv.offsetTop ;
-			document.onmousemove = (e) => {
-				let top = e.clientY - disY;
-				if (top > maxNum) {
-					top = maxNum;
-				} else if (top < minNum) {
-					top = minNum;
-				}
-				odiv.style.top = top + 'px';
-				this.$emit('drapHeight', top);
-				this.heightUps = top;
-			};
-			document.onmouseup = (e) => {
-				if (this.isSave) {
-					if (this.heightUps > minNum) {
-						localStore('upHeight', JSON.stringify(this.heightUps));
-					}
-				}
-				document.onmousemove = null;
-				document.onmouseup = null;
-			};
-		}
-	}
-};
-</script>
-<style>
-    .drapHeight {
-        float: left;
-        width: 16px;
-        background: red;
-        opacity: 0;
-        cursor: n-resize;
-        position: absolute;
-        top: 0;
-        z-index: 9999;
-    }
-</style>
diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue
index c9c9b7162..be897f2f2 100644
--- a/src/views/components/filterCity/index.vue
+++ b/src/views/components/filterCity/index.vue
@@ -9,10 +9,7 @@
 </template>
 
 <script>
-import { setUserConfigInfo } from '@/api/management/user';
-import { listPublishMap } from '@/api/jmap/map';
-import {getUserMapTree,publisMapCityList} from '@/api/designPlatform';
-import { getPublishMapTree } from '@/api/management/mapprd';
+import { publisMapCityList} from '@/api/designPlatform';
 
 import localStore from 'storejs';
 
@@ -34,11 +31,11 @@ export default {
 		queryFunction: {
 			type: Function,
 			required: true
-        },
-        localParamName:{
-            type:String,
-            required: true
-        }
+		},
+		localParamName: {
+			type: String,
+			required: true
+		}
 	},
 	data() {
 		return {
@@ -54,22 +51,22 @@ export default {
 			// 获取城市列表
 			this.filterOptions=[];
 
-            let resp = this.$route.fullPath.includes('design/userlist')?await this.$Dictionary.cityType():await publisMapCityList('city_type');
-            resp=this.$route.fullPath.includes('design/userlist')?resp:resp.data;
+			let resp = this.$route.fullPath.includes('design/userlist')?await this.$Dictionary.cityType():await publisMapCityList('city_type');
+			resp=this.$route.fullPath.includes('design/userlist')?resp:resp.data;
 			const cityList = resp.sort((a, b) => {
 				return a.code.localeCompare(b.code);
 			});
 
-            this.filterOptions=cityList;
-            this.filterSelect = localStore.get(this.localParamName) || cityList[0].code;
+			this.filterOptions=cityList;
+			this.filterSelect = localStore.get(this.localParamName) || cityList[0].code;
 
-            this.$emit('filterSelectChange', this.filterSelect);
+			this.$emit('filterSelectChange', this.filterSelect);
 		},
 		filterSelectChange(filterSelect) {
 			// 设置一级选择组件
-            // localStore.set('_cityCode', filterSelect);
-            localStore.set(this.localParamName, filterSelect);
-            this.$emit('filterSelectChange', filterSelect);
+			// localStore.set('_cityCode', filterSelect);
+			localStore.set(this.localParamName, filterSelect);
+			this.$emit('filterSelectChange', filterSelect);
 		}
 	}
 };
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index db19fd8e1..daad22fe0 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -3,9 +3,7 @@
     <div slot="header" class="clearfix">
       <span>{{ $t('global.mapList') }}</span>
     </div>
-    <!-- v-if="project!=='xty' "  -->
     <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
-    <!-- v-if="project!=='xty' "  -->
     <el-input v-model="filterText" :placeholder="this.$t('global.filteringKeywords')" clearable />
     <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: (height-125) +'px' }">
       <el-tree