From 622885d3d544fef636d07e4b2d12edba69a8423f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Tue, 18 May 2021 10:48:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9A=82=E6=97=B6=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E7=94=A8=E7=9A=84npm=20=E6=A8=A1=E5=9D=97=EF=BC=88lod?=
 =?UTF-8?q?ash,mock=EF=BC=89=20=E5=8F=91=E5=B8=83=E5=9C=B0=E5=9B=BE=20?=
 =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=88=86=E7=BB=84=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             |  2 --
 src/iscs/shape/stateTable.js             |  1 -
 src/views/publish/mapGroup/editGroup.vue |  6 ++++++
 src/views/publish/mapGroup/index.vue     |  1 -
 src/views/publish/publishMap/draft.vue   | 16 +++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index e1bd92899..3f772ab25 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "file-saver": "^1.3.3",
     "js-cookie": "2.2.0",
     "js-md5": "^0.7.3",
-    "lodash": "^4.17.11",
     "normalize.css": "7.0.0",
     "nprogress": "^0.2.0",
     "path-to-regexp": "2.4.0",
@@ -71,7 +70,6 @@
     "eslint-plugin-vue": "5.2.2",
     "file-loader": "^3.0.1",
     "html-webpack-plugin": "3.2.0",
-    "mockjs": "1.0.1-beta3",
     "node-sass": "^4.9.0",
     "runjs": "^4.3.2",
     "sass-loader": "^7.1.0",
diff --git a/src/iscs/shape/stateTable.js b/src/iscs/shape/stateTable.js
index b39521213..2fb246741 100644
--- a/src/iscs/shape/stateTable.js
+++ b/src/iscs/shape/stateTable.js
@@ -3,7 +3,6 @@ import Rect from 'zrender/src/graphic/shape/Rect';
 // import Line from 'zrender/src/graphic/shape/Line';
 import Text from 'zrender/src/graphic/Text';
 import Circle from 'zrender/src/graphic/shape/Circle';
-// import { merge } from 'lodash';
 const stateMap = {
     slidingDoorEmergencyDoorOpenMalfunction : '滑动门&应急门开门故障',
     slidingDoorEmergencyDoorCloseMalfunction: '滑动门&应急门关门故障',
diff --git a/src/views/publish/mapGroup/editGroup.vue b/src/views/publish/mapGroup/editGroup.vue
index 6f089b36c..eeab583c4 100644
--- a/src/views/publish/mapGroup/editGroup.vue
+++ b/src/views/publish/mapGroup/editGroup.vue
@@ -105,6 +105,12 @@ export default {
         },
         doClose() {
             this.dialogVisible = false;
+            this.formModel = {
+                groupId: '',
+                name: '',
+                type: '',
+                mapIds: []
+            };
         }
     }
 
diff --git a/src/views/publish/mapGroup/index.vue b/src/views/publish/mapGroup/index.vue
index f9e76d23d..0ed946fe9 100644
--- a/src/views/publish/mapGroup/index.vue
+++ b/src/views/publish/mapGroup/index.vue
@@ -111,7 +111,6 @@ export default {
     methods: {
         loadInitData() {
             getPublishMapListOnline().then(resp => {
-                // this.mapList = resp.data;
                 this.mapList = [];
                 resp.data.forEach(item => {
                     this.mapList.push({ id: parseInt(item.id), name: item.name });
diff --git a/src/views/publish/publishMap/draft.vue b/src/views/publish/publishMap/draft.vue
index 2bbdd8f91..331b6e20c 100644
--- a/src/views/publish/publishMap/draft.vue
+++ b/src/views/publish/publishMap/draft.vue
@@ -1,13 +1,11 @@
 <template>
-  <div>
-    <el-dialog title="编辑地图" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
-      <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
-        <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
-      </span>
-    </el-dialog>
-  </div>
+  <el-dialog title="编辑地图" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
+      <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+    </span>
+  </el-dialog>
 </template>
 
 <script>