Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

2020-11-27 15:04:15 +08:00 · 2020-11-27 15:04:15 +08:00 · b3f538fa09
commit b3f538fa09
parent 93e936a766 056570c096
5 changed files with 71 additions and 52 deletions
--- a/src/jmapNew/theme/race_01/menus/menuSection.vue
+++ b/src/jmapNew/theme/race_01/menus/menuSection.vue
@ -100,12 +100,12 @@ export default {
                        label: '设置临时限速',
                        handler: this.setSpeed,
                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
-                    },
-                    {
-                        label: '取消临时限速',
-                        handler: this.cancelSpeed,
-                        cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
                    }
+                    // {
+                    //     label: '取消临时限速',
+                    //     handler: this.cancelSpeed,
+                    //     cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED
+                    // }
                ]
            },
            menuForce: [
@ -293,17 +293,17 @@ export default {
                }
            });
        },
-        cancelSpeed() {
-            let sectionCode = this.selected.code;
-            if (this.selected.type == '02' || this.selected.type == '03') {
-                sectionCode = this.selected.parentCode;
-            }
-            commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{
-                if (valid) {
-                    this.$refs.speedLimitControl.doShow(operate, this.selected);
-                }
-            });
-        },
+        // cancelSpeed() {
+        //     let sectionCode = this.selected.code;
+        //     if (this.selected.type == '02' || this.selected.type == '03') {
+        //         sectionCode = this.selected.parentCode;
+        //     }
+        //     commitOperate(menuOperate.Section.cancelSpeed, {sectionCode:sectionCode}).then(({valid, operate})=>{
+        //         if (valid) {
+        //             this.$refs.speedLimitControl.doShow(operate, this.selected);
+        //         }
+        //     });
+        // },
        // 设置故障
        setStoppage() {
            commitOperate(menuOperate.Common.setFault, { code: this.selected.code }, 0).then(({valid, operate})=>{
--- a/src/jmapNew/theme/race_01/operationConfig.js
+++ b/src/jmapNew/theme/race_01/operationConfig.js
@ -297,7 +297,7 @@ export default {
                { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
                { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
                { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '5' },
                { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
            ]
        },
@ -316,7 +316,7 @@ export default {
                { deviceType: '03', orderNum: 3, operateCode: '4071', tip: '鼠标左键点击【下达】按钮' },
                { deviceType: '03', orderNum: 4, operateCode: '4072', tip: '鼠标左键点击【确认】按钮' },
                { deviceType: '03', orderNum: 5, operateCode: '4073', tip: '鼠标左键点击【确认1】按钮' },
-                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
+                { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '0' },
                { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
            ]
        },
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@ -133,6 +133,7 @@ const CompanyManage = () => import('@/views/system/companyManage/index');
 const QuestionsRuleManage = () => import('@/views/system/questionsRuleManage/index');
 const PreTheoryImport = () => import('@/views/competitionManage/bankList/preImport');
 const PlanScheduleWicket = () => import('@/views/newMap/displayNew/demon/planSchedule');
+const MessageBoard = () => import('@/views/messageBoard/index');

 // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig';
 // import { getSessionStorage } from '@/utils/auth';
@ -404,6 +405,11 @@ export const publicAsyncRoute = [
        path: '/practiceDisplay',
        component: PracticeDisplay,
        hidden: true
+    },
+    {
+        path: '/messageBoard',
+        component: MessageBoard,
+        hidden: true
    }
 ];
 // 城市轨道项目
--- a/src/views/newMap/displayNew/demon/messageBoard.vue
+++ b/src/views/newMap/displayNew/demon/messageBoard.vue
@ -1,13 +1,15 @@
 <template>
-  <el-dialog
-    id="elDialog"
-    title="留言板"
-    :visible.sync="dialogVisible"
-    fullscreen
-    :show-close="false"
-    center
-    :before-close="handleClose"
-  >
+  <!--<el-dialog-->
+  <!--id="elDialog"-->
+  <!--title="留言板"-->
+  <!--:visible.sync="dialogVisible"-->
+  <!--fullscreen-->
+  <!--:show-close="false"-->
+  <!--center-->
+  <!--:before-close="handleClose"-->
+  <!--&gt;-->
+  <div id="elDialog" class="message-board-box">
+    <div class="message-board-title">留言板</div>
    <div style="width: 80%;margin-left: 10%;padding: 20px;margin-bottom: 20px;background-color: rgba(255,255,255,0);border: 1px solid #ebeef5;border-radius: 4px;box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);">
      <div v-if="postCommentList.length">
        <template v-for="(item,i) in postCommentList">
@ -90,11 +92,13 @@
      <el-button type="danger" @click="commitComment">留言</el-button>
    </span>
    <el-button size="mini" type="danger" style="position: fixed; right: 100px;top: 80px;width: 90px;" @click="goSlide">我要留言</el-button>
-    <el-button size="mini" style="position: fixed; right: 100px;top: 120px;width: 90px;" @click="dialogVisible = false">退出留言板</el-button>
+    <!--<el-button size="mini" style="position: fixed; right: 100px;top: 120px;width: 90px;" @click="dialogVisible = false">退出留言板</el-button>-->
    <div v-show="imgShow" style="position: fixed;width: 100%;height: 100%;left: 0;top: 0;background: rgba(0,0,0,0.5);cursor: zoom-out;" @click="handelCloseImg">
      <img id="targetImg" src="" style="position: fixed;top: 50%;left: 50%;transform: translate(-50%,-50%);min-width: 500px;max-height: 80%;height: auto;">
    </div>
-  </el-dialog>
+  </div>
+
+  <!--</el-dialog>-->
 </template>

 <script>
@ -105,13 +109,12 @@ import unlike_icon from '@/assets/unlike.png';
 import reply_icon from '@/assets/reply.png';
 import delete_icon from '@/assets/delete.png';
 import { superAdmin } from '@/router/index_APP_TARGET';
-import { getSessionStorage } from '@/utils/auth';
 import { ProjectCode } from '@/scripts/ProjectConfig';
 export default {
    name: 'MessageBoard',
    data() {
        return {
-            dialogVisible: false,
+            // dialogVisible: false,
            content: '',
            postCommentList: [],
            pageSize: 10,
@ -140,7 +143,7 @@ export default {
            return this.$store.state.user.roles.includes(superAdmin);
        },
        projectCode() {
-            const project = getSessionStorage('project');
+            const project = this.$route.query.project;
            return ProjectCode[project];
        }
    },
@ -152,20 +155,18 @@ export default {
        };
    },
    mounted() {
-        if (this.projectCode === 'DRTS' || this.projectCode === 'BJD') {
-            getPostByProjectCode(this.projectCode).then(resp => {
-                this.postId = resp.data.id;
-            });
-        }
+        getPostByProjectCode(this.projectCode).then(resp => {
+            this.postId = resp.data.id;
+        });
+        this.handleCurrentChange();
    },
    methods: {
-        handleClose() {
-            this.dialogVisible = false;
-        },
-        doShow() {
-            this.handleCurrentChange();
-            this.dialogVisible = true;
-        },
+        // handleClose() {
+        //     this.dialogVisible = false;
+        // },
+        // doShow() {
+        //     this.dialogVisible = true;
+        // },
        commitComment() {
            const images = this.content.match(/<img/g);
            const answerContent = this.handleEmojiContent(this.content);
@ -370,6 +371,7 @@ export default {
 <style scoped>
 	.dialog-footer{
 		margin: 0 auto;
+		padding: 10px 0 30px;
 		display: flex;
 		justify-content: center;
 	}
@ -389,16 +391,22 @@ export default {
 		width: 100px;
 		height: auto;
 	}
-	/deep/ .el-dialog.is-fullscreen{
-		background-image:url('../../../../assets/bg_board.jpg');
+	.message-board-box{
+		width: 100%;
+		background-image:url('../../assets/bg_board.jpg');
+		background-size: 100% 100%;
 	}
 	/deep/.ql-container{
 		height: 80%;
 	}
-	/deep/.el-dialog__title{
+	.message-board-title{
 		font-size: 30px;
 		color: #F00;
 		font-family: 'fangsong';
 		font-weight: bolder;
+		width: 100%;
+		text-align: center;
+		height: 80px;
+		line-height: 80px;
 	}
 </style>
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@ -46,7 +46,6 @@
    <scheduling v-if="scheduleLoadShow" ref="scheduling" :group="group" />
    <scheduling-view v-if="schedulePreviewShow" ref="schedulingView" :group="group" />
    <qr-code ref="qrCode" />
-    <message-board ref="messageBoard" />
    <contect-us ref="contectUs" />
  </div>
 </template>
@ -60,7 +59,6 @@ import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView';
 import { EventBus } from '@/scripts/event-bus';
 import DistributeDraft from '@/views/components/limits/distribute';
 import QrCode from '@/components/QrCode';
-import MessageBoard from './demon/messageBoard';
 import ContectUs from '@/views/newMap/displayNew/dispatherContest/contectUs';
 import { PermissionType } from '@/scripts/ConstDic';
 export default {
@ -72,8 +70,7 @@ export default {
        SchedulingView,
        DistributeDraft,
        QrCode,
-        ContectUs,
-        MessageBoard
+        ContectUs
    },
    props:{
        isAllShow:{
@ -321,7 +318,15 @@ export default {
            }
        },
        messageBoardShow() {
-            this.$refs.messageBoard.doShow();
+            // this.$refs.messageBoard.doShow();
+            const routeData = this.$router.resolve({
+                path:'/messageBoard',
+                query:{
+                    project: this.$route.query.project,
+                    noPreLogout: true
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
        },
        contectUs() {
            this.$refs.contectUs.doShow();