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 @@