diff --git a/src/views/approval/script/index.vue b/src/views/approval/script/index.vue index 5240d311e..b4920e46c 100644 --- a/src/views/approval/script/index.vue +++ b/src/views/approval/script/index.vue @@ -151,7 +151,7 @@ this.$refs.applyReject.doShow(row); }, scriptPreview(index,row){ - let mapInfo=this.allMapList.find(elem=>{return elem.id=row.mapId}); + let mapInfo=this.allMapList.find(elem=>{return elem.id==row.mapId}); scriptRecordNotify(row.id).then(resp => { const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:mapInfo.skinCode,try:0}; this.$router.push({ path: `${UrlConfig.design.display}/demon`, query }); diff --git a/src/views/login/loginDesign.vue b/src/views/login/loginDesign.vue index a49a0e0b8..d27c21f7c 100644 --- a/src/views/login/loginDesign.vue +++ b/src/views/login/loginDesign.vue @@ -85,6 +85,7 @@ import { getLoginWmurl, checkLoginStatus } from '@/api/login'; import { LoginParams } from '@/utils/login'; import bgImg from '@/assets/bg1.jpg'; import { setDesignToken } from '@/utils/auth'; +import QCode from '@/assets/erCode.jpg'; export default { name: 'LoginDesign', @@ -115,7 +116,8 @@ export default { password: [{ required: true, trigger: 'blur', validator: validatePass }] }, loading: false, - pwdType: 'password', + pwdType: 'password', + QCode: QCode, tipsMsg: '', qrcodeClassName: 'login-qrcode', sessionId: '', diff --git a/src/views/map/mapdraft/mapmanage/operateMenu.vue b/src/views/map/mapdraft/mapmanage/operateMenu.vue index 5d56709ac..3d90068be 100644 --- a/src/views/map/mapdraft/mapmanage/operateMenu.vue +++ b/src/views/map/mapdraft/mapmanage/operateMenu.vue @@ -2,9 +2,9 @@
- - - + + +
@@ -14,8 +14,8 @@ import { DeviceMenu } from '@/scripts/ConstDic'; import { UrlConfig } from '@/router/index'; import PopMenu from '@/components/PopMenu'; import MapEdit from './edit'; -import MapSaveAs from './saveAs'; -import MapPublish from './publish'; +// import MapSaveAs from './saveAs'; +// import MapPublish from './publish'; import { mapGetters } from 'vuex'; export default { @@ -23,8 +23,8 @@ export default { components: { PopMenu, MapEdit, - MapSaveAs, - MapPublish + // MapSaveAs, + // MapPublish }, props: { point: {