vue2-client 1.2.84 → 1.2.85

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

@@ -33,8 +33,6 @@ const GetAppDataService = {
       // 追加参数
       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) => {

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

@@ -116,11 +116,11 @@ export default {
       const password = this.form.getFieldValue('password')
       this.logging = false
       const loginRes = res
-      const V4Token = { token: res.data.access_token, expire: res.data.expires_in }
+      const V4Token = { token: res.access_token, expire: res.expires_in }
       this.setV4AccessToken(V4Token)
       // 向本地缓存中临时存储compatible
       localStorage.setItem('compatible', this.compatible)
-      if (loginRes.code === 200) {
+      if (loginRes.access_token) {
         const encrypt = new JSEncrypt()
         encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB')
         const data = encrypt.encrypt(JSON.stringify({ username: name, password: password }))

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 }

package/src/services/api/index.js

@@ -1,39 +1,39 @@
-import { commonApi, getColumnsJson, query, addOrModify, remove } from '@vue2-client/services/api/common'
-import { CustomerDetailsViewApi } from '@vue2-client/services/api/CustomerDetailsViewApi'
-import { DeviceBrandDetailsViewApi } from '@vue2-client/services/api/DeviceBrandDetailsViewApi'
-import { DeviceDetailsViewApi } from '@vue2-client/services/api/DeviceDetailsViewApi'
-import { DeviceTypeDetailsViewApi } from '@vue2-client/services/api/DeviceTypeDetailsViewApi'
-import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
-import { EmployeeDetailsViewApi } from '@vue2-client/services/api/EmployeeDetailsViewApi'
-import { FormGroupEditApi } from '@vue2-client/services/api/FormGroupEditApi'
-import { InstructDetailsViewApi } from '@vue2-client/services/api/InstructDetailsViewApi'
-import { iotApi } from '@vue2-client/services/api/iot'
-import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
-import { manageApi } from '@vue2-client/services/api/manage'
-import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
-import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
-import { get, post } from '@vue2-client/services/api/restTools'
-import { serviceApi } from '@vue2-client/services/api/service'
-import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
-import { WebmeterAnalysisViewApi } from '@vue2-client/services/api/WebmeterAnalysisViewApi'
-
-export {
-  commonApi, getColumnsJson, query, addOrModify, remove,
-  CustomerDetailsViewApi,
-  DeviceBrandDetailsViewApi,
-  DeviceDetailsViewApi,
-  DeviceTypeDetailsViewApi,
-  DictionaryDetailsViewApi,
-  EmployeeDetailsViewApi,
-  FormGroupEditApi,
-  InstructDetailsViewApi,
-  iotApi,
-  LogDetailsViewApi,
-  manageApi,
-  MeterDetailsViewApi,
-  QueryParamsDetailsViewApi,
-  get, post,
-  serviceApi,
-  TicketDetailsViewApi,
-  WebmeterAnalysisViewApi
-}
+import { commonApi, getColumnsJson, query, addOrModify, remove } from '@vue2-client/services/api/common'
+import { CustomerDetailsViewApi } from '@vue2-client/services/api/CustomerDetailsViewApi'
+import { DeviceBrandDetailsViewApi } from '@vue2-client/services/api/DeviceBrandDetailsViewApi'
+import { DeviceDetailsViewApi } from '@vue2-client/services/api/DeviceDetailsViewApi'
+import { DeviceTypeDetailsViewApi } from '@vue2-client/services/api/DeviceTypeDetailsViewApi'
+import { DictionaryDetailsViewApi } from '@vue2-client/services/api/DictionaryDetailsViewApi'
+import { EmployeeDetailsViewApi } from '@vue2-client/services/api/EmployeeDetailsViewApi'
+import { FormGroupEditApi } from '@vue2-client/services/api/FormGroupEditApi'
+import { InstructDetailsViewApi } from '@vue2-client/services/api/InstructDetailsViewApi'
+import { iotApi } from '@vue2-client/services/api/iot'
+import { LogDetailsViewApi } from '@vue2-client/services/api/LogDetailsViewApi'
+import { manageApi } from '@vue2-client/services/api/manage'
+import { MeterDetailsViewApi } from '@vue2-client/services/api/MeterDetailsViewApi'
+import { QueryParamsDetailsViewApi } from '@vue2-client/services/api/QueryParamsDetailsViewApi'
+import { get, post } from '@vue2-client/services/api/restTools'
+import { serviceApi } from '@vue2-client/services/api/service'
+import { TicketDetailsViewApi } from '@vue2-client/services/api/TicketDetailsViewApi'
+import { WebmeterAnalysisViewApi } from '@vue2-client/services/api/WebmeterAnalysisViewApi'
+
+export {
+  commonApi, getColumnsJson, query, addOrModify, remove,
+  CustomerDetailsViewApi,
+  DeviceBrandDetailsViewApi,
+  DeviceDetailsViewApi,
+  DeviceTypeDetailsViewApi,
+  DictionaryDetailsViewApi,
+  EmployeeDetailsViewApi,
+  FormGroupEditApi,
+  InstructDetailsViewApi,
+  iotApi,
+  LogDetailsViewApi,
+  manageApi,
+  MeterDetailsViewApi,
+  QueryParamsDetailsViewApi,
+  get, post,
+  serviceApi,
+  TicketDetailsViewApi,
+  WebmeterAnalysisViewApi
+}

package/src/services/api/iot/DeviceDetailsView/DeviceDetailsCountApi.js

@@ -1,18 +1,18 @@
-const DeviceDetailsCountApi = {
-  // 获取设备使用天数
-  getDeviceUsedDaySum: '/webmeterapi/getDeviceUsedDaySum',
-  // 获取设备累计上报次数和近七天上报情况
-  getDeviceUploadTimesCount: '/webmeterapi/getDeviceUploadTimesCount',
-  // 获取设备累计失联次数和近三个月失联情况
-  getDeviceLostContactCount: '/webmeterapi/getDeviceLostContactCount',
-  // 获取设备指令下发成功率
-  getInstructRateOfSuccess: '/webmeterapi/getInstructRateOfSuccess',
-  // 获取设备上报情况
-  getDeviceUploadCountData: '/webmeterapi/getDeviceUploadCountData',
-  // 获取设备失联情况
-  getDeviceLostContactCountData: '/webmeterapi/getDeviceLostContactCountData',
-  // 获取设备失联排行榜
-  getDeviceLostContactRankData: '/webmeterapi/getDeviceLostContactRankData'
-}
-
-export { DeviceDetailsCountApi }
+const DeviceDetailsCountApi = {
+  // 获取设备使用天数
+  getDeviceUsedDaySum: '/webmeterapi/getDeviceUsedDaySum',
+  // 获取设备累计上报次数和近七天上报情况
+  getDeviceUploadTimesCount: '/webmeterapi/getDeviceUploadTimesCount',
+  // 获取设备累计失联次数和近三个月失联情况
+  getDeviceLostContactCount: '/webmeterapi/getDeviceLostContactCount',
+  // 获取设备指令下发成功率
+  getInstructRateOfSuccess: '/webmeterapi/getInstructRateOfSuccess',
+  // 获取设备上报情况
+  getDeviceUploadCountData: '/webmeterapi/getDeviceUploadCountData',
+  // 获取设备失联情况
+  getDeviceLostContactCountData: '/webmeterapi/getDeviceLostContactCountData',
+  // 获取设备失联排行榜
+  getDeviceLostContactRankData: '/webmeterapi/getDeviceLostContactRankData'
+}
+
+export { DeviceDetailsCountApi }

package/src/theme/default/style.less

@@ -1,47 +1,47 @@
-.week-mode{
-  overflow: hidden;
-  filter: invert(80%);
-}
-.beauty-scroll{
-  scrollbar-color: @primary-color @primary-2;
-  scrollbar-width: thin;
-  -ms-overflow-style:none;
-  position: relative;
-  &::-webkit-scrollbar{
-    width: 3px;
-    height: 1px;
-  }
-  &::-webkit-scrollbar-thumb {
-    border-radius: 3px;
-    background: @primary-color;
-  }
-  &::-webkit-scrollbar-track {
-    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-    border-radius: 3px;
-    background: @primary-3;
-  }
-}
-.split-right{
-  &:not(:last-child) {
-    border-right: 1px solid rgba(98, 98, 98, 0.2);
-  }
-}
-.disabled{
-  cursor: not-allowed;
-  color: @disabled-color;
-  pointer-events: none;
-}
-
-::-webkit-scrollbar{
-  width: 5px;
-  height: 5px;
-}
-::-webkit-scrollbar-thumb {
-  border-radius: 3px;
-  background: @primary-3;
-}
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
-  border-radius: 3px;
-  background: @primary-1;
-}
+.week-mode{
+  overflow: hidden;
+  filter: invert(80%);
+}
+.beauty-scroll{
+  scrollbar-color: @primary-color @primary-2;
+  scrollbar-width: thin;
+  -ms-overflow-style:none;
+  position: relative;
+  &::-webkit-scrollbar{
+    width: 3px;
+    height: 1px;
+  }
+  &::-webkit-scrollbar-thumb {
+    border-radius: 3px;
+    background: @primary-color;
+  }
+  &::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+    border-radius: 3px;
+    background: @primary-3;
+  }
+}
+.split-right{
+  &:not(:last-child) {
+    border-right: 1px solid rgba(98, 98, 98, 0.2);
+  }
+}
+.disabled{
+  cursor: not-allowed;
+  color: @disabled-color;
+  pointer-events: none;
+}
+
+::-webkit-scrollbar{
+  width: 5px;
+  height: 5px;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: @primary-3;
+}
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 1px rgba(0,0,0,0);
+  border-radius: 3px;
+  background: @primary-1;
+}