vue2-client 1.2.81 → 1.2.84

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

@@ -1,70 +1,81 @@
-import { manageApi, post } from '@vue2-client/services/api'
-import { handleTree } from '@vue2-client/utils/util'
-const GetAppDataService = {
-  install (Vue) {
-    // 给vue增添对话框显示方法
-    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
-  },
-  async load () {
-    const params = {}
-    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))
-    })
-    // 获取省市区数据
-    await post(manageApi.getDivisionsOhChina, {}).then((res) => {
-      // 追加参数
-      localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
-    })
-  },
-  // 返回树形省市区
-  getDivisionsOhChinaForTree () {
-    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
-    return handleTree(JSON.parse(str), 'code', 'parentcode')
-  },
-  // 返回列表省市区
-  getDivisionsOhChinaForList () {
-    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
-    return JSON.parse(str)
-  },
-  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'
+import { handleTree } from '@vue2-client/utils/util'
+
+const GetAppDataService = {
+  install (Vue) {
+    // 给vue增添对话框显示方法
+    Vue.$appdata = Vue.prototype.$appdata = GetAppDataService
+  },
+  async load () {
+    const params = {}
+    await post(manageApi.getDictionaryValue, {}).then((res) => {
+      // 从本地缓存中读取compatible
+      const setting = localStorage.getItem('compatible')
+      // 判断是否是V4环境
+      if (setting === 'V4') {
+        // 如果是V4，从返回值中，data取值
+        Object.assign(params, res.data)
+      } else {
+        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))
+      // 清除compatible
+      localStorage.removeItem('compatible')
+    })
+    // 获取省市区数据
+    await post(manageApi.getDivisionsOhChina, {}).then((res) => {
+      // 追加参数
+      localStorage.setItem(process.env.VUE_APP_DIVISIONSOHCHINA, JSON.stringify(res))
+    })
+  },
+  // 返回树形省市区
+  getDivisionsOhChinaForTree () {
+    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
+    return handleTree(JSON.parse(str), 'code', 'parentcode')
+  },
+  // 返回列表省市区
+  getDivisionsOhChinaForList () {
+    const str = localStorage.getItem(process.env.VUE_APP_DIVISIONSOHCHINA)
+    return JSON.parse(str)
+  },
+  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

@@ -1,20 +1,20 @@
-import { get } from '@vue2-client/services/api'
-import Vue from 'vue'
-
-async function loginStart (name, password) {
-  const resource = await get(`/rs/user/${name}/${password}/智慧OA`, {})
-  console.log('登陆获取', resource)
-  Vue.$login.f = resource
-  await Promise.all([Vue.$appdata.load()])
-  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
-}
+import { get } from '@vue2-client/services/api'
+import Vue from 'vue'
+
+async function loginStart (name, password) {
+  const resource = await get(`/rs/user/${name}/${password}/智慧OA`, {})
+  console.log('登陆获取', resource)
+  Vue.$login.f = resource
+  await Promise.all([Vue.$appdata.load()])
+  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/pages/login/Login.vue

@@ -54,7 +54,7 @@
 
 <script>
 import CommonLayout from '@vue2-client/layouts/CommonLayout'
-import { getRoutesConfig, login } from '@vue2-client/services/user'
+import { getRoutesConfig, login, V4Login } from '@vue2-client/services/user'
 import { setAuthorization } from '@vue2-client/utils/request'
 import { loadRoutes, funcToRouter } from '@vue2-client/utils/routerUtil'
 import { mapMutations, mapState } from 'vuex'
@@ -95,6 +95,10 @@ export default {
               loginStart(name, password).then(this.afterLoginOA).finally(() => { this.logging = false })
              break
             }
+            case 'V4' : {
+              V4Login(name, password).then(this.afterLoginV4)
+              break
+            }
           }
         }
       })
@@ -107,6 +111,35 @@ export default {
       this.setACCESSTOKEN(result.password)
       this.$router.push(this.homePage).catch(() => {})
     },
+    afterLoginV4 (res) {
+      const name = this.form.getFieldValue('name')
+      const password = this.form.getFieldValue('password')
+      this.logging = false
+      const loginRes = res
+      const V4Token = { token: res.data.access_token, expire: res.data.expires_in }
+      this.setV4AccessToken(V4Token)
+      // 向本地缓存中临时存储compatible
+      localStorage.setItem('compatible', this.compatible)
+      if (loginRes.code === 200) {
+        const encrypt = new JSEncrypt()
+        encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
+        const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))
+        // 获取路由配置
+        console.log('开始请求智慧燃气')
+        getRoutesConfig(data).then(result => {
+          this.$login.login(result).then(() => {
+            this.afterGeneral(result)
+            if (result.deps === '用户工单登记') {
+              this.$router.push(this.ticketPage).catch(() => {})
+            } else {
+              this.$router.push(this.homePage).catch(() => {})
+            }
+          })
+        })
+      } else {
+        this.error = loginRes.msg
+      }
+    },
     afterLogin (res) {
       const name = this.form.getFieldValue('name')
       const password = this.form.getFieldValue('password')
@@ -161,6 +194,11 @@ export default {
       // 格式化时间获取年月日, 登陆过期时间
       const dateAfter = new Date(timestamp)
       setAuthorization({ token: data, expireAt: dateAfter })
+    },
+    setV4AccessToken (data) {
+      localStorage.setItem('ACCESS_TOKEN', data.token)
+      localStorage.setItem('ACCESS_TOKEN_EXPIRES', data.expire)
+      setAuthorization({ token: data.token, expire: data.expire })
     }
   }
 }

package/src/pages/resourceManage/orgListManage.vue

@@ -1,98 +1,98 @@
-<template>
-  <div id="orgListManage">
-    <a-card :bordered="false">
-      <!--<a-row :gutter="48">-->
-      <!--<a-col>-->
-      <!--<a-space>-->
-      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
-      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
-      <!--</a-button>-->
-      <!--<a-button-->
-      <!--v-if="!buttonState || buttonState.edit"-->
-      <!--:loading="editDataLoading"-->
-      <!--:disabled="!isModify"-->
-      <!--class="btn-success"-->
-      <!--type="dashed"-->
-      <!--@click="editItem">-->
-      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
-      <!--</a-button>-->
-      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
-      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
-      <!--</a-button>-->
-      <!--</a-space>-->
-      <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
-      <!--<a-button-group>-->
-      <!--<a-button @click="toggleIsFormShow">-->
-      <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
-      <!--</a-button>-->
-      <!--<a-button @click="refresh(true)">-->
-      <!--<a-icon :style="iconStyle" type="reload" />-->
-      <!--</a-button>-->
-      <!--<a-button @click="showDrawer">-->
-      <!--<a-icon :style="iconStyle" type="table" />-->
-      <!--</a-button>-->
-      <!--<a-button @click="exports">-->
-      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
-      <!--</a-button>-->
-      <!--</a-button-group>-->
-      <!--</span>-->
-      <!--</a-col>-->
-      <!--</a-row>-->
-      <a-table
-        :columns="columns"
-        :data-source="funTree"
-        :pagination="false"
-        bordered
-        rowKey="id"
-        size="middle">
-      </a-table>
-    </a-card>
-  </div>
-</template>
-
-<script>
-  import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
-  import { getColumnsJson } from '@vue2-client/services/api'
-  export default {
-    // 组织管理
-    name: 'orgListManage',
-    data () {
-      return {
-        columnsJson: [],
-        funTree: [],
-        columns: [
-          {
-            title: '组织名称',
-            dataIndex: 'name'
-          },
-          {
-            title: '排序',
-            dataIndex: 'position'
-          },
-          {
-            title: '组件目录',
-            dataIndex: 'f_dir'
-          },
-          {
-            title: '描述',
-            dataIndex: 'f_description'
-          }
-        ]
-      }
-    },
-    created () {
-    },
-    async mounted () {
-      getColumnsJson('orgListManage', (res) => {
-        this.columnsJson = res
-      })
-      const fun = await getOrganization()
-      this.funTree = searchFun(fun, '组织机构')
-    },
-    methods: {
-    }
-  }
-</script>
-
-<style lang="less">
-</style>
+<template>
+  <div id="orgListManage">
+    <a-card :bordered="false">
+      <!--<a-row :gutter="48">-->
+      <!--<a-col>-->
+      <!--<a-space>-->
+      <!--<a-button type="primary" @click="addItem" v-if="!buttonState || buttonState.add">-->
+      <!--<a-icon :style="iconStyle" type="plus"/>新增-->
+      <!--</a-button>-->
+      <!--<a-button-->
+      <!--v-if="!buttonState || buttonState.edit"-->
+      <!--:loading="editDataLoading"-->
+      <!--:disabled="!isModify"-->
+      <!--class="btn-success"-->
+      <!--type="dashed"-->
+      <!--@click="editItem">-->
+      <!--<a-icon :style="iconStyle" type="edit"/>修改-->
+      <!--</a-button>-->
+      <!--<a-button :disabled="!isDelete" type="danger" @click="deleteItem" v-if="!buttonState || buttonState.delete">-->
+      <!--<a-icon :style="iconStyle" type="delete"/>删除-->
+      <!--</a-button>-->
+      <!--</a-space>-->
+      <!--<span :style="{ float: 'right', overflow: 'hidden', marginBottom: '8px' }">-->
+      <!--<a-button-group>-->
+      <!--<a-button @click="toggleIsFormShow">-->
+      <!--<a-icon :style="iconStyle" type="vertical-align-top"/>-->
+      <!--</a-button>-->
+      <!--<a-button @click="refresh(true)">-->
+      <!--<a-icon :style="iconStyle" type="reload" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="showDrawer">-->
+      <!--<a-icon :style="iconStyle" type="table" />-->
+      <!--</a-button>-->
+      <!--<a-button @click="exports">-->
+      <!--<a-icon :style="iconStyle" type="cloud-download"/>-->
+      <!--</a-button>-->
+      <!--</a-button-group>-->
+      <!--</span>-->
+      <!--</a-col>-->
+      <!--</a-row>-->
+      <a-table
+        :columns="columns"
+        :data-source="funTree"
+        :pagination="false"
+        bordered
+        rowKey="id"
+        size="middle">
+      </a-table>
+    </a-card>
+  </div>
+</template>
+
+<script>
+  import { getOrganization, searchFun } from '@vue2-client/base-client/plugins/GetLoginInfoService'
+  import { getColumnsJson } from '@vue2-client/services/api'
+  export default {
+    // 组织管理
+    name: 'orgListManage',
+    data () {
+      return {
+        columnsJson: [],
+        funTree: [],
+        columns: [
+          {
+            title: '组织名称',
+            dataIndex: 'name'
+          },
+          {
+            title: '排序',
+            dataIndex: 'position'
+          },
+          {
+            title: '组件目录',
+            dataIndex: 'f_dir'
+          },
+          {
+            title: '描述',
+            dataIndex: 'f_description'
+          }
+        ]
+      }
+    },
+    created () {
+    },
+    async mounted () {
+      getColumnsJson('orgListManage', (res) => {
+        this.columnsJson = res
+      })
+      const fun = await getOrganization()
+      this.funTree = searchFun(fun, '组织机构')
+    },
+    methods: {
+    }
+  }
+</script>
+
+<style lang="less">
+</style>

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 }

package/src/services/api/WebmeterAnalysisViewApi.js

@@ -1,20 +1,20 @@
-const WebmeterAnalysisViewApi = {
-  // 查询：指令数统计
-  instructSumCount: '/webmeterapi/foreignaidInstructSumCountData',
-  // 查询：抄表数统计
-  meteReadSumCount: '/webmeterapi/foreignaidMetereadSumCountData',
-  // 查询：近一周抄表量数据
-  meteReadDataByWeek: '/webmeterapi/foreignaidMetereadDataByWeekData',
-  // 查询：在用表具数
-  usingMeterSumCount: '/webmeterapi/foreignaidUsingMeterSumCountData',
-  // 查询：近一周在用表具数数据
-  usingMeterDataByWeek: '/webmeterapi/foreignaidUsingMeterDataByWeekData',
-  // 查询：指令成功率统计
-  instructRateOfSuccess: '/webmeterapi/foreignaidInstructRateOfSuccessData',
-  // 查询：按表厂抄表量统计
-  handMeterSumCountData: '/webmeterapi/foreignaidHandMeterSumCountData',
-  // 查询：统计用气量数据
-  useGasSumCount: '/webmeterapi/foreignaidUseGasSumCountData'
-}
-
-export { WebmeterAnalysisViewApi }
+const WebmeterAnalysisViewApi = {
+  // 查询：指令数统计
+  instructSumCount: '/webmeterapi/foreignaidInstructSumCountData',
+  // 查询：抄表数统计
+  meteReadSumCount: '/webmeterapi/foreignaidMetereadSumCountData',
+  // 查询：近一周抄表量数据
+  meteReadDataByWeek: '/webmeterapi/foreignaidMetereadDataByWeekData',
+  // 查询：在用表具数
+  usingMeterSumCount: '/webmeterapi/foreignaidUsingMeterSumCountData',
+  // 查询：近一周在用表具数数据
+  usingMeterDataByWeek: '/webmeterapi/foreignaidUsingMeterDataByWeekData',
+  // 查询：指令成功率统计
+  instructRateOfSuccess: '/webmeterapi/foreignaidInstructRateOfSuccessData',
+  // 查询：按表厂抄表量统计
+  handMeterSumCountData: '/webmeterapi/foreignaidHandMeterSumCountData',
+  // 查询：统计用气量数据
+  useGasSumCount: '/webmeterapi/foreignaidUseGasSumCountData'
+}
+
+export { WebmeterAnalysisViewApi }