vue2-client 1.2.48 → 1.2.50

package/src/base-client/plugins/AppData.js

@@ -1,57 +1,57 @@
-import { manageApi, post } from '@vue2-client/services/api'
-
-const GetAppDataService = {
-  install (Vue) {
-    // 给vue增添对话框显示方法
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-  async load () {
-    const params = {
-      orgList: []
-    }
-    await post(manageApi.getDictionaryValue, {}).then((res) => {
-      Object.assign(params, res)
-      const badgeItemArray = {}
-      for (const key of Object.keys(params)) {
-        badgeItemArray[key] = {}
-        for (const item of params[key]) {
-          if (item.status) {
-            badgeItemArray[key][item.value] = {
-              status: item.status,
-              text: item.text
-            }
-          }
-        }
-      }
-      // 追加参数
-      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
-      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
-    })
-  },
-  getDictionaryList (key) {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object[key]
-  },
-  getParam (key, value) {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    const result = object[key]
-    if (result && result.hasOwnProperty(value)) {
-      return result[value]
-    } else {
-      return null
-    }
-  },
-  getParams () {
-    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
-    const object = JSON.parse(str)
-    return object
-  },
-  getSingleValues () {
-    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
-    const object = JSON.parse(str)
-    return object
-  }
-}
-export default GetAppDataService
+import { manageApi, post } from '@vue2-client/services/api'
+
+const GetAppDataService = {
+  install (Vue) {
+    // 给vue增添对话框显示方法
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+  async load () {
+    const params = {
+      orgList: []
+    }
+    await post(manageApi.getDictionaryValue, {}).then((res) => {
+      Object.assign(params, res)
+      const badgeItemArray = {}
+      for (const key of Object.keys(params)) {
+        badgeItemArray[key] = {}
+        for (const item of params[key]) {
+          if (item.status) {
+            badgeItemArray[key][item.value] = {
+              status: item.status,
+              text: item.text
+            }
+          }
+        }
+      }
+      // 追加参数
+      localStorage.setItem(process.env.VUE_APP_DICTIONARY_KEY, JSON.stringify(params))
+      localStorage.setItem(process.env.VUE_APP_BADGE_KEY, JSON.stringify(badgeItemArray))
+    })
+  },
+  getDictionaryList (key) {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object[key]
+  },
+  getParam (key, value) {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    const result = object[key]
+    if (result && result.hasOwnProperty(value)) {
+      return result[value]
+    } else {
+      return null
+    }
+  },
+  getParams () {
+    const str = localStorage.getItem(process.env.VUE_APP_DICTIONARY_KEY)
+    const object = JSON.parse(str)
+    return object
+  },
+  getSingleValues () {
+    const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
+    const object = JSON.parse(str)
+    return object
+  }
+}
+export default GetAppDataService

package/src/base-client/plugins/compatible/LoginServiceOA.js

@@ -0,0 +1,19 @@
+import { get } from '@vue2-client/services/api'
+import Vue from 'vue'
+
+async function loginStart (name, password) {
+  const resource = await get(`/rs/user/${name}/${password}/newoa`, {})
+  console.log('登陆获取', resource)
+  Vue.$login.f = resource
+  const login = {
+    f: Vue.$login.f,
+    jwt: Vue.$login.f.id,
+    r: Vue.$login.r
+  }
+  Vue.$store.commit('account/setLogin', login)
+  return resource
+}
+
+export {
+  loginStart
+}

package/src/config/default/setting.config.js

@@ -34,6 +34,6 @@ module.exports = {
   ],
   // 旧系统路径
   iframeSrc: '../singlepage/page.html',
-  // 兼容V2版本系统 true:启用, false:禁用
-  compatibleV2: false
+  // 兼容旧版本 V3(最新V3产品)  OA(公司OA)
+  compatible: 'V3'
 }

package/src/layouts/header/HeaderNotice.vue

@@ -1,96 +1,96 @@
-<template>
-  <a-dropdown :trigger="['click']" v-model="show">
-    <div slot="overlay">
-      <a-spin :spinning="loading">
-        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
-          <a-tab-pane tab="通知" key="1">
-            <a-list>
-              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
-                <a-list-item-meta :title="'设备号'+ item.e_f_device_id" :description="item.e_f_error_msg" @click="read(item)">
-                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
-                </a-list-item-meta>
-              </a-list-item>
-            </a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="消息" key="2">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-          <a-tab-pane tab="待办" key="3">
-            <a-list class="tab-pane"></a-list>
-          </a-tab-pane>
-        </a-tabs>
-      </a-spin>
-    </div>
-    <span @click="fetchNotice" class="header-notice">
-      <a-badge class="notice-badge" :count=" exception.length">
-        <a-icon :class="['header-notice-icon']" type="bell" />
-      </a-badge>
-    </span>
-  </a-dropdown>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-export default {
-  name: 'HeaderNotice',
-  data () {
-    return {
-      loading: false,
-      show: false,
-      exception: []
-    }
-  },
-  computed: {
-  },
-  created () {
-  },
-  methods: {
-    read (item) {
-      post('/webmeterapi/saveSingleTable', { data: { tablename: 't_iot_device_exception', param: { id: item.e_id, f_is_read: 1 } } }).then(res => {
-        this.refresh()
-      })
-    },
-    refresh () {
-      post('/webmeterapi/commonQuery', { queryParamsName: 'deviceExceptionQueryParams', conditionParams: { e_f_is_read: 0 }, pageNo: 1, pageSize: 999999 }).then(res => {
-        this.exception = res.data
-      })
-    },
-    fetchNotice () {
-      if (this.loading) {
-        this.loading = false
-        return
-      }
-      this.loadding = true
-      setTimeout(() => {
-        this.loadding = false
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="less">
-  .header-notice{
-    display: inline-block;
-    transition: all 0.3s;
-    span {
-      vertical-align: initial;
-    }
-    .notice-badge{
-      color: inherit;
-      .header-notice-icon{
-        font-size: 16px;
-        padding: 4px;
-      }
-    }
-  }
-  .dropdown-tabs{
-    background-color: @base-bg-color;
-    box-shadow: 0 2px 8px @shadow-color;
-    border-radius: 4px;
-    .tab-pane{
-      padding: 0 24px 12px;
-      min-height: 250px;
-    }
-  }
-</style>
+<template>
+  <a-dropdown :trigger="['click']" v-model="show">
+    <div slot="overlay">
+      <a-spin :spinning="loading">
+        <a-tabs class="dropdown-tabs" :tabBarStyle="{textAlign: 'center'}" :style="{width: '297px'}">
+          <a-tab-pane tab="通知" key="1">
+            <a-list>
+              <a-list-item :key="item.id" class="tab-pane" v-for=" item in exception">
+                <a-list-item-meta :title="'设备号'+ item.e_f_device_id" :description="item.e_f_error_msg" @click="read(item)">
+                  <a-avatar style="background-color: white" slot="avatar" src="https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png"/>
+                </a-list-item-meta>
+              </a-list-item>
+            </a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="消息" key="2">
+            <a-list class="tab-pane"></a-list>
+          </a-tab-pane>
+          <a-tab-pane tab="待办" key="3">
+            <a-list class="tab-pane"></a-list>
+          </a-tab-pane>
+        </a-tabs>
+      </a-spin>
+    </div>
+    <span @click="fetchNotice" class="header-notice">
+      <a-badge class="notice-badge" :count=" exception.length">
+        <a-icon :class="['header-notice-icon']" type="bell" />
+      </a-badge>
+    </span>
+  </a-dropdown>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+export default {
+  name: 'HeaderNotice',
+  data () {
+    return {
+      loading: false,
+      show: false,
+      exception: []
+    }
+  },
+  computed: {
+  },
+  created () {
+  },
+  methods: {
+    read (item) {
+      post('/webmeterapi/saveSingleTable', { data: { tablename: 't_iot_device_exception', param: { id: item.e_id, f_is_read: 1 } } }).then(res => {
+        this.refresh()
+      })
+    },
+    refresh () {
+      post('/webmeterapi/commonQuery', { queryParamsName: 'deviceExceptionQueryParams', conditionParams: { e_f_is_read: 0 }, pageNo: 1, pageSize: 999999 }).then(res => {
+        this.exception = res.data
+      })
+    },
+    fetchNotice () {
+      if (this.loading) {
+        this.loading = false
+        return
+      }
+      this.loadding = true
+      setTimeout(() => {
+        this.loadding = false
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .header-notice{
+    display: inline-block;
+    transition: all 0.3s;
+    span {
+      vertical-align: initial;
+    }
+    .notice-badge{
+      color: inherit;
+      .header-notice-icon{
+        font-size: 16px;
+        padding: 4px;
+      }
+    }
+  }
+  .dropdown-tabs{
+    background-color: @base-bg-color;
+    box-shadow: 0 2px 8px @shadow-color;
+    border-radius: 4px;
+    .tab-pane{
+      padding: 0 24px 12px;
+      min-height: 250px;
+    }
+  }
+</style>

package/src/layouts/tabs/TabsView.vue

@@ -367,9 +367,6 @@ export default {
         width: 1400px;
         margin: 0 auto;
       }
-      .ant-card:only-of-type {
-        min-height: calc(100vh - 64px - 56px - 16px);
-      }
     }
   }
 </style>

package/src/pages/login/Login.vue

@@ -60,9 +60,9 @@ import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations, mapState } from 'vuex'
 import JSEncrypt from 'jsencrypt'
 import { ACCESS_TOKEN } from '@vue2-client/store/mutation-types'
-import Vue from 'vue'
 import { positions } from '@vue2-client/mock/common'
 import { timeFix } from '@vue2-client/utils/util'
+import { loginStart } from '@vue2-client/base-client/plugins/compatible/LoginServiceOA'
 
 export default {
   name: 'Login',
@@ -75,7 +75,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage'])
+    ...mapState('setting', ['systemName', 'systemDesc', 'homePage', 'ticketPage', 'compatible'])
   },
   methods: {
     ...mapMutations('account', ['setUser', 'setPermissions', 'setRoles']),
@@ -86,10 +86,27 @@ export default {
           this.logging = true
           const name = this.form.getFieldValue('name')
           const password = this.form.getFieldValue('password')
-          login(name, password).then(this.afterLogin)
+          switch (this.compatible) {
+            case 'V3': {
+              login(name, password).then(this.afterLogin)
+              break
+            }
+            case 'OA' : {
+              loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
+             break
+            }
+          }
         }
       })
     },
+    afterLoginOA (result) {
+      // 默认第一个是旧OA地址
+      result.functions[0].navigate = result.functions[0].link
+      result.functions[0].link = null
+      this.afterGeneral(result)
+      this.setACCESSTOKEN(result.password)
+      this.$router.push(this.homePage).catch(() => {})
+    },
     afterLogin (res) {
       const name = this.form.getFieldValue('name')
       const password = this.form.getFieldValue('password')
@@ -99,37 +116,51 @@ export default {
         const encrypt = new JSEncrypt()
         encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
         const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
-        localStorage.setItem(ACCESS_TOKEN, data)
         // 获取路由配置
         getRoutesConfig(data).then(result => {
-          Vue.$login.login(result).then(() => {
-            const user = Object.assign({
-              username: result.ename,
-              name: result.name,
-              avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
-              address: '西安市',
-              position: positions[0]
-            }, result)
-            this.setUser(user)
-            this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
-            this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
-            let timestamp = new Date().getTime()// 当前的时间戳
-            timestamp = timestamp + 60 * 60 * 1000
-            // 格式化时间获取年月日, 登陆过期时间
-            const dateAfter = new Date(timestamp)
-            setAuthorization({ token: data, expireAt: dateAfter })
-            loadRoutes(funcToRouter(user.functions))
+          this.$login.login(result).then(() => {
+            // V3任何情况首位加入资源管理
+            const resourceManageMain = {
+              name: '资源管理',
+              icon: 'api',
+              position: 1,
+              link: 'resourceManageMain'
+            }
+            result.functions.unshift(resourceManageMain)
+            this.afterGeneral(result)
+            this.setACCESSTOKEN(data)
             if (result.deps === '用户工单登记') {
               this.$router.push(this.ticketPage).catch(() => {})
             } else {
               this.$router.push(this.homePage).catch(() => {})
             }
-            this.$message.success(timeFix().CN + '，欢迎回来', 3)
           })
         })
       } else {
         this.error = loginRes
       }
+    },
+    afterGeneral (result) {
+      const user = Object.assign({
+        username: result.ename,
+        name: result.name,
+        avatar: 'https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png',
+        address: '西安市',
+        position: positions[0]
+      }, result)
+      this.setUser(user)
+      this.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+      this.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
+      loadRoutes(funcToRouter(user.functions))
+      this.$message.success(timeFix().CN + `，${result.name} 欢迎回来`, 3)
+    },
+    setACCESSTOKEN (data) {
+      localStorage.setItem(ACCESS_TOKEN, data)
+      let timestamp = new Date().getTime()// 当前的时间戳
+      timestamp = timestamp + 60 * 60 * 1000
+      // 格式化时间获取年月日, 登陆过期时间
+      const dateAfter = new Date(timestamp)
+      setAuthorization({ token: data, expireAt: dateAfter })
     }
   }
 }

package/src/pages/system/ticket/submitTicketSuccess.vue

@@ -84,6 +84,7 @@ export default {
       // 控制加急按钮显示
       UrgentAvailable: true,
       // 刷新页面的定时器
+      time: undefined,
       timer: undefined,
       // 取消工单确认框可见性
       closeVisible: false,
@@ -98,7 +99,8 @@ export default {
     this.countDown = 0
   },
   beforeDestroy () {
-    clearInterval(this.timer)
+    this.stopTimer()
+    this.stopTimer2()
   },
   methods: {
     format (date, format) {
@@ -115,7 +117,7 @@ export default {
           this.title = '工单已关闭'
           this.description = ''
           this.icon = false
-          clearInterval(this.timer)
+          this.stopTimer()
         }, err => {
           console.error(err)
         })
@@ -130,9 +132,11 @@ export default {
     },
     // 过10s刷新一下页面数据
     refresh () {
-      this.timer = setInterval(() => {
-        this.getTicketDetail()
-      }, 10 * 1000)
+      if (this.timer === undefined) {
+        this.timer = setInterval(() => {
+          this.getTicketDetail()
+        }, 10 * 1000)
+      }
     },
     // 对工单进行加急处理
     urgent () {
@@ -173,14 +177,16 @@ export default {
     // 设置用于控制加急按钮倒计时定时器，加急按钮5分钟后才可点击
     setTimer () {
       this.countDown = 5
-      const time = setInterval(() => {
-        this.countDown--
-        if (this.countDown <= 0) {
-          this.urgentAccess = false
-          clearInterval(time)
-          this.countDown = -1
-        }
-      }, 1000)
+      if (this.time === undefined) {
+        this.time = setInterval(() => {
+          this.countDown--
+          if (this.countDown <= 0) {
+            this.urgentAccess = false
+            this.stopTimer2()
+            this.countDown = -1
+          }
+        }, 1000)
+      }
     },
     // 获取工单详情
     getTicketDetail () {
@@ -218,6 +224,20 @@ export default {
         }, err => {
           console.log(err)
         })
+    },
+    // 停止定时器
+    stopTimer () {
+      if (this.timer) {
+        clearInterval(this.timer)
+        this.timer = undefined
+      }
+    },
+    // 停止定时器2
+    stopTimer2 () {
+      if (this.time) {
+        clearInterval(this.time)
+        this.time = undefined
+      }
     }
   },
   computed: {

package/src/router/async/config.async.js

@@ -1,26 +1,26 @@
-import routerMap from './router.map'
-import { parseRoutes } from '@vue2-client/utils/routerUtil'
-
-// 异步路由配置
-const routesConfig = [
-  'login',
-  'submitTicket',
-  'root',
-  {
-    router: 'exp404',
-    path: '*',
-    name: '404'
-  },
-  {
-    router: 'exp403',
-    path: '/403',
-    name: '403'
-  }
-]
-
-const options = {
-  mode: 'history',
-  routes: parseRoutes(routesConfig, routerMap)
-}
-
-export default options
+import routerMap from './router.map'
+import { parseRoutes } from '@vue2-client/utils/routerUtil'
+
+// 异步路由配置
+const routesConfig = [
+  'login',
+  'submitTicket',
+  'root',
+  {
+    router: 'exp404',
+    path: '*',
+    name: '404'
+  },
+  {
+    router: 'exp403',
+    path: '/403',
+    name: '403'
+  }
+]
+
+const options = {
+  mode: 'history',
+  routes: parseRoutes(routesConfig, routerMap)
+}
+
+export default options

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/submitTicket'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }