vue2-client 1.2.72 → 1.2.75

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

@@ -1,70 +1,70 @@
-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) => {
+      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

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/components/Charts/ChartCard.vue

@@ -15,6 +15,9 @@
         <slot name="total">
           <span>{{ typeof total === 'function' && total() || total }}</span>
         </slot>
+        <slot name="unit">
+          <span class="unit">{{ typeof unit === 'function' && unit() || unit }}</span>
+        </slot>
       </div>
     </div>
     <div class="chart-card-content">
@@ -43,6 +46,11 @@ export default {
       required: false,
       default: null
     },
+    unit: {
+      type: [Function, Number, String],
+      required: false,
+      default: null
+    },
     loading: {
       type: Boolean,
       default: false
@@ -117,4 +125,10 @@ export default {
     line-height: 38px;
     height: 38px;
   }
+  .unit {
+    position: relative;
+    left: 1px;
+    bottom: 1px;
+    font-size: 26px;
+  }
 </style>