Merge remote-tracking branch 'origin/master' into master

ebc-middle-platform/src/components/loginer.vue

@@ -13,11 +13,11 @@
    </h2>
    <t-form ref="loginForm" :model="loginForm" :rules="loginFormRules">
      <t-form-item prop="userName">
        <t-input v-model="loginForm.userName" :placeholder="`${$t('aidp.account.username')}: zhangsan`" icon="user-outline" size="lg">
        <t-input v-model="loginForm.userName" :placeholder="`${$t('aidp.account.username')}: admin`" icon="user-outline" size="lg">
        </t-input>
      </t-form-item>
      <t-form-item prop="password">
        <t-input v-model="loginForm.password" :placeholder="`${$t('aidp.account.password')}: 123456`" type="password" icon="lock-outline" size="lg">
        <t-input v-model="loginForm.password" :placeholder="`${$t('aidp.account.password')}: Abc@1234`" type="password" icon="lock-outline" size="lg">
        </t-input>
      </t-form-item>
      <t-form-item prop="verifyCode">
@@ -63,6 +63,12 @@ import { mapActions, mapState, mapMutations } from 'vuex'
import Services from '@/conf/services'
import { KEY_USER_NAME } from '@/constants'
import routers from '@/routes'
import services from "../conf/services";
import {
  GENERATE_ROUTES
} from '@/modules/ootb/permission/store/constants'
import store from '../store';
import {SET_ROUTERS} from "../modules/ootb/permission/store/constants";
export default {
  name: 'Loginer',
@@ -139,17 +145,49 @@ export default {
      this.loging = true
      this.$refs.loginForm.validate((valid) => {
        if (valid) {
          this.doLogin(this.loginForm).then((data) => {
          this.doLogin({userCode: this.loginForm.userName, passWord: this.loginForm.password}).then((data) => {
            this.$store.commit('setLogged', true)
            if (this.rememberMe) {
              localStorage.setItem(KEY_USER_NAME, data.userName)
            } else {
              localStorage.removeItem(KEY_USER_NAME)
            }
            const roles = {
              permissionList: ['exception']
            }
            this.$test
              .post(services.login.FIND_MENUS, {userCode: data.RESULT.CODE})
              .then((data) => {
                localStorage.setItem('menus',  JSON.stringify(data))
                store.dispatch(`permission/${GENERATE_ROUTES}`, roles)
              })
            this.$router.push({ name: this.homeName })
          }).catch((e) => {
            this.loging = false
            this.$Message.danger(e)
          })
          // this.$test
          //   .post(services.login.LOGIN, )
          //   .then((data) => {
          //     if (data.FLAG === 'SUCCESS') {
          //       if (this.rememberMe) {
          //         localStorage.setItem(KEY_USER_NAME, data.RESULT.CODE)
          //       } else {
          //         localStorage.removeItem(KEY_USER_NAME)
          //       }
          //
          //
          //       this.$router.push({ name: this.homeName })
          //     } else {
          //       this.$Message.danger(data.MESSAGE)
          //     }
          //     this.loging = false
          //   })
        } else {
          this.loging = false
          this.$Message.danger(this.$t('aidp.common.input_incorrect', { field: this.$t('aidp.account.username') + this.$t('aidp.common.or') + this.$t('aidp.account.password') }))

ebc-middle-platform/src/conf/services.js

@@ -60,6 +60,10 @@ export default {
    QUERYALLMENU: '/menu/queryAllMenu',
    QUERYMENUBYMENUNAME: '/menu/menuName/:menuName'
  },
  login: {
    LOGIN: '/login/login',
    FIND_MENUS: '/login/findMenus'
  },
  organization: {
    PERSON_LOCATION: '/device/queryCurrentDeviceLocationInfo',
    GETTREEALLDATA: '/org/queryOrg', // 获取所有组织数据

ebc-middle-platform/src/main.js

@@ -3,6 +3,10 @@
 * @author PRD UX R&D Dept.
 */
// 允许携带cookie
import axios from 'axios'
axios.defaults.withCredentials = true
// 引入第三方库
import 'babel-polyfill'
import Vue from 'vue'

ebc-middle-platform/src/modules/ootb/user/store/actions.js

@@ -7,6 +7,7 @@ import {
} from './constants'
import { KEY_USER_CODE, KEY_TOKEN } from '@/constants'
import services from "../../../../conf/services";
/**
 * 用户登录
@@ -17,11 +18,11 @@ import { KEY_USER_CODE, KEY_TOKEN } from '@/constants'
 */
export function doLogin({ commit, state }, data) {
  return new Promise((resolve, reject) => {
    http.$http
      .post(Services.aidp.LOGIN, data)
    http.$test
      .post(Services.login.LOGIN, data)
      .then(ret => {
        if (ret.data.code === '0') {
          let payload = ret.data.data
        if (ret.FLAG === 'SUCCESS') {
          let payload = ret
          commit(LOGIN, payload)
          window.localStorage.setItem(KEY_USER_CODE, state.userCode)
          window.localStorage.setItem(KEY_TOKEN, state.token)

ebc-middle-platform/src/modules/orientation/orientation.vue

@@ -25,11 +25,7 @@
        <t-button
          color="success"
          icon="map-marker-outline"
          @click="
            () => {
              trackModal = true;
            }
          "
          @click="trackClick"
        >轨迹</t-button
        >
        <div style="min-width:100px">悬浮窗<t-switch v-model="switch1" rounded @change="switchChange"></t-switch></div>
@@ -100,22 +96,10 @@
              <t-option v-for="(item, index) in personList" :key="index" :value="item">{{ item.workEmployeeName }}</t-option>
            </t-select>
            <span class="track-span">时间</span>
            <t-button-group>
              <t-button
                v-for="(item, index) in trackTimeList"
                :class="
                  index == trackQueryCondition.currentIndex ? 'active' : ''
                "
                :key="index"
                @click="changeTrackTime(index)"
              >{{ item }}</t-button
              >
            </t-button-group>
            <t-date-picker
              :class="trackQueryCondition.currentIndex === 3?'':'hidden'"
              v-model="rangeDate"
              align-right
              style="width:300px"
              style="width:320px"
              type="dateTimeRange"
              placeholder="请选择时间"
              @date-change="onChangeDate">
@@ -1129,6 +1113,43 @@ export default {
        this.trackMap.removeLayer(this.trackPath)
      }
    },
    trackClick() {
      this.trackModal = true
      var now = new Date()
      var year = now.getFullYear()
      var month = now.getMonth() + 1
      month >= 10 ? month : '0' + month
      var day = now.getDate() >= 10 ? now.getDate() : '0' + now.getDate()
      var hours =
          now.getHours() >= 10 ? now.getHours() : '0' + now.getHours()
      var minutes =
          now.getMinutes() >= 10
              ? now.getMinutes()
              : '0' + now.getMinutes()
      var seconds =
          now.getSeconds() >= 10
              ? now.getSeconds()
              : '0' + now.getSeconds()
      var statr = year +
          '-' +
          month +
          '-' +
          day +
          ' ' +
          '00:00:00'
      var end = year +
          '-' +
          month +
          '-' +
          day +
          ' ' +
          hours +
          ':' +
          minutes +
          ':' +
          seconds
      this.rangeDate = [statr, end]
    },
    playback() {
      var entityIds
      if (this.trackTypeCondition.currentIndex == 0) {
@@ -1149,27 +1170,18 @@ export default {
        entityIds = entityIds.substring(0, entityIds.length - 1)
      }
      var params = {}
      if (this.trackQueryCondition.currentIndex === 3) {
        if (!this.rangeDate) {
          this.$Message.warning('请选择时间！')
          return
        } else {
          params = {
            entityId: entityIds,
            timeType: (this.trackQueryCondition.currentIndex + 1),
            playbackRate: this.playbackRate,
            startTime: this.rangeDate[0],
            endTime: this.rangeDate[1]
          }
        }
      if (!this.rangeDate) {
        this.$Message.warning('请选择时间！')
        return
      } else {
        params = {
          entityId: entityIds,
          timeType: 4,
          playbackRate: this.playbackRate,
          timeType: (this.trackQueryCondition.currentIndex + 1)
          startTime: this.rangeDate[0],
          endTime: this.rangeDate[1]
        }
      }
      if (this.trackTypeCondition.currentIndex == 0) {
        this.$test
          .post(services.trackAnalysis.GET_SINGLE_TRACE, params)
@@ -1309,7 +1321,8 @@ export default {
          iconSize: [40, 55],
          // 设置点对象和图标的相对偏移量
          iconAnchor: [20, 25]
        })
        }),
        draggable:true
      })
      var popup = Ai.Popup({
        maxWidth: 60,

ebc-middle-platform/src/modules/page/GlobalHeader.vue

@@ -21,20 +21,20 @@
            @on-keyup="onSelectKeyUp"
            @on-blur="onSelectBlur">
            <t-option-group label="菜单">
              <t-option value="1" label="战区综评" style="height: auto">
              <t-option value="1" label="--" style="height: auto">
                <div class="d-flex align-items-start">
                  <t-icon icon="chart-areaspline" size="16" class="mr-2 text-muted"></t-icon>
                  <div>
                    <p class="mb-0">战区综评</p>
                    <p class="mb-0">--</p>
                    <small class="text-muted">综合业务分析</small>
                  </div>
                </div>
              </t-option>
              <t-option value="2" label="战区综评">
              <t-option value="2" label="--">
                <div class="d-flex align-items-center">
                  <t-icon icon="chart-areaspline" size="16" class="mr-2 text-muted"></t-icon>
                  <div>
                    <p class="mb-0">战区综评</p>
                    <p class="mb-0">--</p>
                  </div>
                </div>
              </t-option>

ebc-middle-platform/src/router.js

@@ -23,6 +23,7 @@ const router = new VueRouter({
})
router.beforeEach((to, from, next) => {
  console.log(to, from, next)
  GLoading.$create().start()
  /*
   * 在每次视图切换时检查当前用户是否处于登
@@ -36,7 +37,8 @@ router.beforeEach((to, from, next) => {
   * 单客户端判断。
   * 参见src/frame.vue和src/store.js文件中的逻辑。
   */
  let isLogged = router.app.$options.store.getters['user/isLogged']
  let isLogged = router.app.$options.store.getters.getLogged
  // let isLogged = router.app.$options.store.getters['user/isLogged']
  // router.app.$store.commit('setTitle', to.meta.title)
  if (to.meta.ignoreAuth === true) {
    if (isLogged === true && to.path === '/login') {

ebc-middle-platform/src/store.js

@@ -62,7 +62,9 @@ const store = new Vuex.Store({
    map_param: {
      center: [33.597844, 123.647472],
      zoom: 11
    }
    },
    reLoad: false,
    isLogged: false
  },
  mutations: {
    // 改变语言
@@ -87,6 +89,12 @@ const store = new Vuex.Store({
    },
    setMapParam(state, token) {
      state.map_param = token
    },
    setReLoad(state, token) {
      state.reLoad = token
    },
    setLogged(state, token) {
      state.isLogged = token
    }
  },
  getters: {
@@ -118,6 +126,12 @@ const store = new Vuex.Store({
    },
    getMapParam(state) {
      return state.map_param
    },
    getReLoad(state) {
      return state.reLoad
    },
    getLogged(state) {
      return state.isLogged
    }
  },
  modules: {

location-rescue-service/src/main/java/com/ai/bss/location/rescue/controller/LoginController.java

@@ -60,6 +60,7 @@ public class LoginController {
                response.addCookie(userCookie3);
            }
        }
        login.put("success", true);
        return login;
    }
@@ -75,10 +76,11 @@ public class LoginController {
    public Map<String, Object> findMenus(@RequestBody User user, HttpServletRequest request){
        Map<String, Object> menus = loginService.findMenus(user,request);
        menus.put("success", true);
        return menus;
    }
}
}