joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

剧本列表预览调整

Browse Source
This commit is contained in:
joylink_cuiweidong 2019-10-18 11:26:11 +08:00
parent b96ca27907
commit c80c9d467c
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/approval/script/index.vue
View File

@ -151,7 +151,7 @@
this.$refs.applyReject.doShow(row); this.$refs.applyReject.doShow(row);
}, },
scriptPreview(index,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 => { scriptRecordNotify(row.id).then(resp => {
const query = { mapId: row.mapId, group: resp.data, scriptId: row.id,skinCode:mapInfo.skinCode,try:0}; 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 }); this.$router.push({ path: `${UrlConfig.design.display}/demon`, query });

4
src/views/login/loginDesign.vue
View File

@ -85,6 +85,7 @@ import { getLoginWmurl, checkLoginStatus } from '@/api/login';
import { LoginParams } from '@/utils/login'; import { LoginParams } from '@/utils/login';
import bgImg from '@/assets/bg1.jpg'; import bgImg from '@/assets/bg1.jpg';
import { setDesignToken } from '@/utils/auth'; import { setDesignToken } from '@/utils/auth';
import QCode from '@/assets/erCode.jpg';
export default { export default {
name: 'LoginDesign', name: 'LoginDesign',
@ -115,7 +116,8 @@ export default {
password: [{ required: true, trigger: 'blur', validator: validatePass }] password: [{ required: true, trigger: 'blur', validator: validatePass }]
}, },
loading: false, loading: false,
pwdType: 'password', pwdType: 'password',
QCode: QCode,
tipsMsg: '', tipsMsg: '',
qrcodeClassName: 'login-qrcode', qrcodeClassName: 'login-qrcode',
sessionId: '', sessionId: '',

14
src/views/map/mapdraft/mapmanage/operateMenu.vue
View File

@ -2,9 +2,9 @@
<div> <div>
<pop-menu ref="popMenu" :menu="menu" /> <pop-menu ref="popMenu" :menu="menu" />
<map-edit ref="edit" :basic-info="true" :map="editModel" :skin-code="skinCode" @refresh="refresh" /> <map-edit ref="edit" :basic-info="true" :map="editModel" :skin-code="skinCode" @refresh="refresh" />
<map-edit ref="axisEdit" :basic-info="false" :map="editModel" :skin-code="skinCode" @refresh="refresh" /> <!-- <map-edit ref="axisEdit" :basic-info="false" :map="editModel" :skin-code="skinCode" @refresh="refresh" /> -->
<map-save-as ref="saveAs" :map="editModel" @refresh="refresh" /> <!-- <map-save-as ref="saveAs" :map="editModel" @refresh="refresh" /> -->
<map-publish ref="publish" :map="editModel" /> <!-- <map-publish ref="publish" :map="editModel" /> -->
</div> </div>
</template> </template>
@ -14,8 +14,8 @@ import { DeviceMenu } from '@/scripts/ConstDic';
import { UrlConfig } from '@/router/index'; import { UrlConfig } from '@/router/index';
import PopMenu from '@/components/PopMenu'; import PopMenu from '@/components/PopMenu';
import MapEdit from './edit'; import MapEdit from './edit';
import MapSaveAs from './saveAs'; // import MapSaveAs from './saveAs';
import MapPublish from './publish'; // import MapPublish from './publish';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
export default { export default {
@ -23,8 +23,8 @@ export default {
components: { components: {
PopMenu, PopMenu,
MapEdit, MapEdit,
MapSaveAs, // MapSaveAs,
MapPublish // MapPublish
}, },
props: { props: {
point: { point: {