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

2022-12-13 15:50:44 +08:00 · 2022-12-13 15:50:44 +08:00 · 684199abd1
commit 684199abd1
parent 83d1342110 81152cb252
5 changed files with 468 additions and 20 deletions
--- a/src/jmapNew/theme/foshan_01/menus/dispatchWorkMenu.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dispatchWorkMenu.vue
@ -2,7 +2,7 @@
  <div class="menus" :style="{width: width + 'px'}">
    <menu-bar ref="menuBar" :selected="selected" />
    <menu-station-stand ref="menuStationStand" :selected="selected" :work="'dispatchWork'" />
-    <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" />
+    <!-- <menu-switch ref="menuSwitch" :selected="selected" :work="'dispatchWork'" /> -->
    <menu-signal ref="menuSignal" :selected="selected" :work="'dispatchWork'" />
    <menu-section ref="menuSection" :selected="selected" :work="'dispatchWork'" />
    <menu-train ref="menuTrain" :selected="selected" />
--- a/src/jmapNew/theme/foshan_01/menus/localWorkMenu.vue
+++ b/src/jmapNew/theme/foshan_01/menus/localWorkMenu.vue
@ -70,3 +70,300 @@ export default {
    }
 };
 </script>
+<style>
+    .menus .pop-menu {
+        background: #F0F0F0;
+    }
+
+    .menus .pop-menu span {
+        color: #000;
+    }
+
+    .menus .pop-menu .is-disabled span {
+        color: #B4B3B8;
+    }
+
+    .foshan-01__systerm {
+        overflow: hidden !important;
+    }
+
+    .foshan-01__systerm .el-dialog {
+        background: linear-gradient(to bottom, #9BB6D3, #B8D0EA);
+        border: 1px solid rgba(118, 162, 198, 1);
+        border-radius: 6px;
+        color: #000;
+        font-size: 14px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__header {
+        padding: 10px;
+        height: 26px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__footer {
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__body {
+        padding: 10px;
+        margin: 2px;
+        box-shadow: 1px hsla(240, 0%, 100%, 0.5) inset;
+        background: #F0F0F0;
+        opacity: 1;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__title {
+        position: absolute;
+        top: 6px;
+        color: #000;
+        border-radius: 4px;
+        padding: 0px 2px;
+        height: 20px;
+        line-height: 15px;
+        font-size: 15px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__title::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        filter: blur(7px);
+        height: 20px;
+        width: -webkit-fill-available;
+        background: rgba(190, 190, 190, 0.8);
+        z-index: -1;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__headerbtn {
+        background: linear-gradient(#CD98A0, #C27D6E, #B63022, #C68770);
+        border: 1px solid #fff;
+        border-radius: 4px;
+        top: 5px;
+        right: 5px;
+        line-height: 18px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__headerbtn .el-icon-close:before {
+        font-size: 16px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-dialog__headerbtn .el-dialog__close {
+        color: #fff;
+    }
+
+    .foshan-01__systerm .el-dialog .el-button {
+        height: 32px;
+        line-height: 32px;
+        padding: 0px;
+        width: 80px;
+        border: 2px outset #E2E2E2;
+        border-radius: 0px !important;
+        color: #000;
+        background: #F0F0F0;
+    }
+
+    .foshan-01__systerm .el-dialog .expand {
+        width: 120px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-button:focus span {
+        border: 1px dashed gray;
+    }
+
+    .foshan-01__systerm .el-dialog .el-button:active {
+        border: 2px inset #E2E2E2;
+    }
+
+    .foshan-01__systerm .el-dialog .el-button:disabled {
+        border: 2px inset #E2E2E2;
+    }
+
+    .foshan-01__systerm .el-dialog .el-button:disabled span {
+        border: 0px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-input {
+        border: 2px inset #E9E9E9;
+    }
+
+    .foshan-01__systerm .el-dialog .el-input .el-input__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .foshan-01__systerm .el-dialog .el-input.is-disabled .el-input__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-textarea {
+        border: 2px inset #E9E9E9;
+        border-radius: 0px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-textarea .el-textarea__inner {
+        color: #000;
+        background: #fff !important;
+        border: 0px;
+        border-radius: 0px !important;
+        box-sizing: border-box;
+    }
+
+    .foshan-01__systerm .el-dialog .el-textarea.is-disabled .el-textarea__inner {
+        background: #F0F0F0 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-table--border th.gutter {
+        background: #EBEADB !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-table {
+        border: 2px inset #E9E9E9;
+        color: #000 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-table .cell {
+        line-height: unset !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-table th.is-leaf {
+        background: #F0F0F0 !important;
+        border-right: 1px solid #BDBDBD !important;
+        border-bottom: 1px solid #BDBDBD !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .foshan-01__systerm.stand-detain-train .el-dialog .el-table th.is-leaf {
+        background: #fff !important;
+        border-right: 1px solid #fff !important;
+        border-bottom: 1px solid #EBEEF5 !important;
+        color: #000 !important;
+        height: 20px !important;
+        padding: 0px;
+    }
+    .foshan-01__systerm.stand-detain-train .el-dialog .el-table th.el-table-column--selection{
+        border-right: 1px solid #e2e2e2 !important;
+    }
+    .foshan-01__systerm.stand-detain-train .el-dialog .el-table .el-table__body-wrapper .el-table__row .el-table-column--selection {
+        border-right: 1px solid #e2e2e2 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-table tr td {
+        height: 20px !important;
+        padding: 0px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-table .el-table__empty-text {
+        top: 15px !important;
+        line-height: normal;
+        max-width:60%;
+    }
+
+    .foshan-01__systerm .el-dialog .current-row>td {
+        background: #3399FF !important;
+        color: #fff !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-checkbox__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-checkbox__label {
+        color: #000 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-checkbox.is-disabled .el-checkbox__label {
+        color: #C5C9CC !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-checkbox__input.is-checked .el-checkbox__inner::after {
+        position: absolute;
+        -webkit-box-sizing: content-box;
+        box-sizing: content-box;
+        content: "";
+        border: 1px solid #000;
+        border-left: 0;
+        border-top: 0;
+        height: 7px;
+        left: 4px;
+        top: 1px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-radio__inner {
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-radio__label {
+        color: #000 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner {
+        background: #fff !important;
+        border: 1px inset #dcdfe6 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-radio__input.is-checked .el-radio__inner::after {
+        width: 4px;
+        height: 4px;
+        border-radius: 100%;
+        background-color: #000 !important;
+        position: absolute;
+        left: 50%;
+        top: 50%;
+    }
+
+    .foshan-01__systerm .el-dialog .el-radio.is-disabled .el-radio__inner {
+        background: #E6E6E6 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .el-radio.is-disabled .el-radio__label {
+        color: #C5C9CC !important;
+    }
+
+    .foshan-01__systerm .el-dialog .base-label {
+        background: #F0F0F0;
+        padding: 0 5px;
+        position: relative;
+        left: -15px;
+        top: -18px;
+    }
+
+    .foshan-01__systerm .el-dialog .el-form-item label {
+        font-weight: normal !important;
+        color: #000 !important;
+    }
+
+    .foshan-01__systerm .el-dialog .context {
+        height: 100px;
+        border: 2px inset #E2E2E2;
+        overflow-y: scroll;
+    }
+
+    .foshan-01__systerm .el-dialog .table {
+        margin-top: 10px;
+    }
+
+    .foshan-01__systerm .el-dialog .notice {
+        margin-left: 62px;
+        line-height: 30px;
+    }
+
+    .foshan-01__systerm .el-dialog .button-group {
+        margin-top: 10px;
+    }
+</style>
--- a/src/jmapNew/theme/foshan_01/menus/localWorkMenuBar.vue
+++ b/src/jmapNew/theme/foshan_01/menus/localWorkMenuBar.vue
@ -1,16 +1,25 @@
 <template>
  <div id="menuBarFoShan">
    <menu-bar ref="menuBar" :menu-normal="menuNormal" style="width:100%" />
+    <station-control ref="stationControl" :work="'dispatchWork'" />
+    <view-train-id ref="viewTrainId" />
+    <help-about ref="helpAbout" />
  </div>
 </template>
 <script>
 import MenuBar from '@/jmapNew/theme/components/menus/menuBarNew';
+import StationControl from './menuDialog/stationControl';
+import ViewTrainId from './menuDialog/viewTrainId';
+import HelpAbout from './menuDialog/helpAbout';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mapGetters } from 'vuex';
 export default {
    name: 'LocalWorkMenuBar',
    components: {
-        MenuBar
+        MenuBar,
+        StationControl,
+        HelpAbout,
+        ViewTrainId
    },
    data() {
        return {
@ -287,6 +296,20 @@ export default {
                callback: action => {
                }
            });
+        },
+        // 关于
+        about(order) {
+            const operate = {
+                type: 'bar',
+                operation: order.operation
+            };
+            this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$refs.menuBar.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.helpAbout.doShow(operate);
+                }
+            });
        }
    }
 };
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@ -225,9 +225,9 @@ export default {
        '$store.state.menuOperation.leftClickCount': function (val) {
            // const control = MenuContextHandler.getStationControl(this.selected);
            // const centralStation = this.$store.getters['map/getDeviceByCode'](this.selected.stationCode);
+            if (this.selected._type === 'Signal') {
                const status = judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work);
-            if (this.selected._type === 'Signal' && status) {
-                this.arrangementRoute();
+                status && this.arrangementRoute();
            }
        }
    },
--- a/src/views/login/registerUser.vue
+++ b/src/views/login/registerUser.vue
@ -2,36 +2,70 @@
  <el-dialog
    :title="title"
    :visible.sync="dialogShow"
+    class="rigisterDialog"
    width="500px"
    :before-close="doClose"
    :z-index="9000"
    :show-close="false"
    :close-on-click-modal="false"
-    top="25vh"
+    top="18vh"
  >
-    <el-form ref="ruleForm" :model="form" :rules="rules" label-width="110px" class="demo-ruleForm" style="margin-left: 60px;width:330px">
+    <el-form ref="ruleForm" :model="form" :rules="rules" label-width="110px" class="rigister-ruleForm" style="margin-left:30px;width:380px">
+      <el-form-item prop="type">
+        <template slot="label">
+          <span>注册途径：</span>
+        </template>
+        <el-radio-group v-model="form.type" size="small" @change="changeType">
+          <el-radio label="phone" border>手机号注册</el-radio>
+          <el-radio label="email" border>邮箱注册</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="form.type === 'email'" prop="email">
+        <template slot="label">
+          <span>邮箱(账号)：</span>
+        </template>
+        <el-input v-model="form.email" size="small" style="width:260px" />
+      </el-form-item>
+      <el-form-item v-if="form.type === 'phone'" prop="phone">
+        <template slot="label">
+          <span>手机号：</span>
+        </template>
+        <el-input v-model="form.phone" size="small" style="width: 260px;" />
+      </el-form-item>
      <el-form-item prop="nickname">
        <template slot="label">
          <span>昵&emsp;&emsp;称：</span>
        </template>
-        <el-input v-model="form.nickname" autocomplete="new-password" size="small" style="width:200px" />
-      </el-form-item>
-      <el-form-item prop="email">
-        <template slot="label">
-          <span>邮箱(账号)：</span>
-        </template>
-        <el-input v-model="form.email" size="small" style="width:200px" />
+        <el-input v-model="form.nickname" autocomplete="new-password" size="small" style="width:260px" />
      </el-form-item>
      <el-form-item label="密码：" prop="password">
        <template slot="label">
          <span>密&emsp;&emsp;码：</span>
        </template>
-        <el-input v-model="form.password" autocomplete="new-password" show-password size="small" style="width:200px" />
+        <el-input v-model="form.password" autocomplete="new-password" show-password size="small" style="width:260px" />
      </el-form-item>
      <el-form-item label="密码确认：" prop="repeatPassword">
-        <el-input v-model="form.repeatPassword" autocomplete="new-password" show-password size="small" style="width:200px" />
+        <el-input v-model="form.repeatPassword" autocomplete="new-password" show-password size="small" style="width:260px" />
      </el-form-item>
-      <div style="display: flex;justify-content: space-around;">
+      <el-form-item prop="vfCode">
+        <template slot="label">
+          <span>验证码：</span>
+        </template>
+        <el-input v-model="form.vfCode" size="small" style="display: inline-block;width:140px" />
+        <el-button
+          size="small"
+          type="primary"
+          style="margin-top: 10px; margin-right: 10px;"
+          :disabled="passWordCodeTime != 0"
+          @click="sendVfcode"
+        >
+          {{ $t('global.sendCode') }}
+          <span
+            v-if="passWordCodeTime"
+          >{{ passWordCodeTime }}</span>
+        </el-button>
+      </el-form-item>
+      <div style="display: flex;justify-content: space-around;margin-top:40px;">
        <el-button type="primary" size="small" @click="submitForm()">立即创建</el-button>
        <el-button size="small" @click="doClose()">返回登录</el-button>
      </div>
@ -54,6 +88,15 @@ export default {
                callback();
            }
        };
+        var validatePhone = (rule, value, callback) => {
+            const regu = /^1(3[0-9]|4[5,7]|5[0,1,2,3,5,6,7,8,9]|6[2,5,6,7]|7[0,1,7,8]|8[0-9]|9[1,8,9])\d{8}$/;
+            const re = new RegExp(regu);
+            if (!re.test(value)) {
+                callback(new Error('手机号格式不正确'));
+            } else {
+                callback();
+            }
+        };
        var validatePassword = (rule, value, callback) => {
            if (this.form.repeatPassword) {
                this.$refs.ruleForm.validateField('repeatPassword');
@ -67,18 +110,34 @@ export default {
                callback();
            }
        };
+        var validateVfCode = (rule, value, callback) => {
+            if (this.form.vfCode.length !== 4) {
+                callback(new Error('验证码长度错误'));
+            } else {
+                callback();
+            }
+        };
        return {
            dialogShow: false,
+            passWordCodeTime: 0,
+            passWordTime: null,
            message: '',
            operation: '',
            title: '账号注册',
            form: {
+                type: 'phone',
+                phone: '',
                email: '',
                nickname: '',
                password: '',
-                repeatPassword: ''
+                repeatPassword: '',
+                vfCode:''
            },
            rules: {
+                phone: [
+                    { required: true, message: '请输入手机号', trigger: 'blur' },
+                    { validator: validatePhone, trigger: 'blur' }
+                ],
                email: [
                    { required: true, message: '请输入邮箱', trigger: 'blur' },
                    { validator: validateEmail, trigger: 'blur' }
@ -96,6 +155,10 @@ export default {
                    { required: true, message: '请重复输入密码', trigger: 'blur' },
                    { validator: validateRepeatPassword, trigger: 'blur' },
                    { min: 5, max: 20, message: '长度在 5 到 20 个字符', trigger: 'blur' }
+                ],
+                vfCode: [
+                    { required: true, message: '请输入验证码', trigger: 'blur' },
+                    { validator: validateVfCode, trigger: 'blur' }
                ]
            }
        };
@ -108,23 +171,83 @@ export default {
    methods: {
        doShow() {
            this.form = {
+                type: 'phone',
+                phone: '',
                email: '',
                nickname: '',
                password: '',
-                repeatPassword: ''
+                repeatPassword: '',
+                vfCode: ''
            };
            this.dialogShow = true;
        },
        doClose() {
            this.dialogShow = false;
            this.form = {
+                type: 'phone',
+                phone: '',
                email: '',
                nickname: '',
                password: '',
-                repeatPassword: ''
+                repeatPassword: '',
+                vfCode: ''
            };
            this.$refs.ruleForm.clearValidate();
        },
+        changeType() {
+            this.$refs.ruleForm.clearValidate();
+        },
+        async sendVfcode() {
+            const reguEmail = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+            const reguPhone = /^1(3[0-9]|4[5,7]|5[0,1,2,3,5,6,7,8,9]|6[2,5,6,7]|7[0,1,7,8]|8[0-9]|9[1,8,9])\d{8}$/;
+            const rePhone = new RegExp(reguPhone);
+            const reEmail = new RegExp(reguEmail);
+            if (this.form.type === 'phone' && this.form.phone && rePhone.test(this.form.phone)) {
+                const random = Math.floor(Math.random() * 10000 + 1);
+                const timeCount = Date.parse(new Date()) / 1000;
+                const pass = `${timeCount}86${this.form.phone}${random}`;
+                const param = {
+                    mobile: this.form.phone,
+                    nationCode: '86',
+                    rd: random + '',
+                    time: timeCount + '',
+                    token: md5(pass)
+                };
+                try {
+                    this.passWordCodeTime = 60;
+                    this.passWordTime = setInterval(() => {
+                        this.passWordCodeTime--;
+                        if (this.passWordCodeTime <= 0) {
+                            this.passWordCodeTime = 0;
+                            clearInterval(this.mobileTime);
+                            this.passWordTime = null;
+                        }
+                    }, 1000);
+                    // await sendPhoneVfcode(param);
+                } catch (error) {
+                    this.$message.info(this.$t('global.codeFaile'));
+                }
+            } else if (this.form.type === 'email' && this.form.email && reEmail.test(this.form.email)) {
+                const param = { email: this.form.email };
+                try {
+                    this.passWordCodeTime = 60;
+                    this.passWordTime = setInterval(() => {
+                        this.passWordCodeTime--;
+                        if (this.passWordCodeTime <= 0) {
+                            this.passWordCodeTime = 0;
+                            clearInterval(this.mobileTime);
+                            this.passWordTime = null;
+                        }
+                    }, 1000);
+                    // await sendEmailVfcode(param);
+                } catch (error) {
+                    this.$message.info(this.$t('global.codeFaile'));
+                }
+            } else {
+                this.$refs.ruleForm.validateField('email');
+                this.$refs.ruleForm.validateField('phone');
+            }
+        },
        submitForm() {
            this.$refs.ruleForm.validate((valid) => {
                if (valid) {
@ -143,3 +266,8 @@ export default {
    }
 };
 </script>
+<style lang="scss">
+.rigisterDialog .el-dialog__body{
+    padding-top:15px;
+}
+</style>