vue2-client 1.2.43 → 1.2.46

package/src/services/api/common.js

@@ -1,47 +1,47 @@
-import { METHOD, request } from '@vue2-client/utils/request'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-const commonApi = {
-  // 获取表格列配置
-  getColumnsJson: '/webmeterapi/getColumns',
-  // 通用查询
-  query: '/webmeterapi/commonQuery',
-  // 通用新增/修改
-  addOrModify: '/webmeterapi/commonAddOrModify',
-  // 通用删除
-  delete: '/webmeterapi/commonDelete',
-  // 获取字典键列表
-  getDictionaryParam: '/webmeterapi/getDictionaryParam'
-}
-
-/**
- * 带缓存查询的表格配置文件查询
- * @param queryParamsName 配置名称
- * @param callback 回调函数
- */
-export function getColumnsJson (queryParamsName, callback) {
-  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
-}
-
-/**
- * 通用表单查询
- */
-export function query (parameter) {
-  return request(commonApi.query, METHOD.POST, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify (parameter) {
-  return request(commonApi.addOrModify, METHOD.POST, parameter)
-}
-
-/**
- * 通用删除
- */
-export function remove (parameter) {
-  return request(commonApi.delete, METHOD.POST, parameter)
-}
-
-export { commonApi }
+import { METHOD, request } from '@vue2-client/utils/request'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+const commonApi = {
+  // 获取表格列配置
+  getColumnsJson: '/webmeterapi/getColumns',
+  // 通用查询
+  query: '/webmeterapi/commonQuery',
+  // 通用新增/修改
+  addOrModify: '/webmeterapi/commonAddOrModify',
+  // 通用删除
+  delete: '/webmeterapi/commonDelete',
+  // 获取字典键列表
+  getDictionaryParam: '/webmeterapi/getDictionaryParam'
+}
+
+/**
+ * 带缓存查询的表格配置文件查询
+ * @param queryParamsName 配置名称
+ * @param callback 回调函数
+ */
+export function getColumnsJson (queryParamsName, callback) {
+  indexedDB.getByWeb(queryParamsName, commonApi.getColumnsJson, { str: queryParamsName }, callback)
+}
+
+/**
+ * 通用表单查询
+ */
+export function query (parameter) {
+  return request(commonApi.query, METHOD.POST, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify (parameter) {
+  return request(commonApi.addOrModify, METHOD.POST, parameter)
+}
+
+/**
+ * 通用删除
+ */
+export function remove (parameter) {
+  return request(commonApi.delete, METHOD.POST, parameter)
+}
+
+export { commonApi }

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/user.js

@@ -1,34 +1,34 @@
-import { LOGIN, ROUTES } from '@vue2-client/services/apiService'
-import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
-
-/**
- * 登录服务
- * @param name 账户名
- * @param password 账户密码
- * @returns {Promise<AxiosResponse<T>>}
- */
-export async function login (name, password) {
-  return request(LOGIN, METHOD.POST, {
-    name: name,
-    password: password
-  })
-}
-
-export async function getRoutesConfig (value) {
-  return request(ROUTES, METHOD.POST, value)
-}
-
-/**
- * 退出登录
- */
-export function logout () {
-  localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
-  localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
-  localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
-  removeAuthorization()
-}
-export default {
-  login,
-  logout,
-  getRoutesConfig
-}
+import { LOGIN, ROUTES } from '@vue2-client/services/apiService'
+import { request, METHOD, removeAuthorization } from '@vue2-client/utils/request'
+
+/**
+ * 登录服务
+ * @param name 账户名
+ * @param password 账户密码
+ * @returns {Promise<AxiosResponse<T>>}
+ */
+export async function login (name, password) {
+  return request(LOGIN, METHOD.POST, {
+    name: name,
+    password: password
+  })
+}
+
+export async function getRoutesConfig (value) {
+  return request(ROUTES, METHOD.POST, value)
+}
+
+/**
+ * 退出登录
+ */
+export function logout () {
+  localStorage.removeItem(process.env.VUE_APP_ROUTES_KEY)
+  localStorage.removeItem(process.env.VUE_APP_PERMISSIONS_KEY)
+  localStorage.removeItem(process.env.VUE_APP_ROLES_KEY)
+  removeAuthorization()
+}
+export default {
+  login,
+  logout,
+  getRoutesConfig
+}

package/src/store/modules/account.js

@@ -76,8 +76,8 @@ export default {
     },
     setSingle (state, page) {
       if (page.path && page.delete) {
-        // 删除  暂时不做删除操作
-        // state.single = state.single.filter(item => item.path !== page.path)
+        // 删除
+        state.single = state.single.filter(item => item.fullPath !== page.path)
       } else if (state.single.filter(item => item.meta.singlePage === page.meta.singlePage).length === 0) {
         // 添加
         state.single.push(page)

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;
+}

package/src/utils/indexedDB.js

@@ -1,146 +1,146 @@
-// indexDB 存储
-import { post } from '@vue2-client/services/api'
-
-export const indexedDB = {
-  db: undefined,
-  indexedDB: window.indexedDB || window.webkitindexedDB,
-  IDBKeyRange: window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
-  openDB: function (callback) {
-    // 建立或打开数据库，建立对象存储空间(ObjectStore)
-    const self = this
-    if (self.db) {
-      callback(self.db)
-    } else {
-      const version = 1
-      const request = self.indexedDB.open('view', version)
-
-      request.onerror = function (e) {
-        console.error('打开数据库失败:' + e.currentTarget.error.message)
-      }
-      request.onsuccess = function (e) {
-        self.db = e.target.result
-        callback(self.db)
-      }
-      request.onupgradeneeded = function (e) {
-        const db = e.target.result
-        if (!db.objectStoreNames.contains('metaCache')) {
-          // 没有该对象空间时创建该对象空间
-          db.createObjectStore('metaCache', {
-            keyPath: 'key'
-          })
-        }
-      }
-    }
-  },
-  deleteDB: function (dbname) {
-    // 删除数据库
-    const self = this
-    self.indexedDB.deleteDatabase(dbname)
-    console.log(dbname + '数据库已删除')
-  },
-  closeDB: function () {
-    const self = this
-    if (!self.db) {
-      self.db.close()
-    }
-    console.log('数据库已关闭')
-  },
-  add: function (key, data) {
-    const self = this
-    self.openDB((res) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
-        key: key,
-        data: data
-      })
-      request.onerror = function () {
-        self.update(data)
-      }
-      request.onsuccess = function () {
-        console.log('数据已存入到数据库')
-      }
-    })
-  },
-  update: function (key, data) {
-    const self = this
-    self.openDB((res) => {
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
-        key: key,
-        data: data
-      })
-      request.onerror = function () {
-        console.error('数据更新失败')
-      }
-      request.onsuccess = function () {
-        console.log('数据已更新到数据库')
-      }
-    })
-  },
-  get: function (key, callback) {
-    const self = this
-    self.openDB((res) => {
-      // 根据存储空间的键找到对应数据
-      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-      const request = store.get(key)
-      request.onerror = function () {
-        console.log('读取数据失败，键：' + key)
-      }
-      request.onsuccess = function (e) {
-        const result = e.target.result
-        if (typeof (callback) === 'function') {
-          callback(result.data)
-        }
-      }
-    })
-  },
-  getByWeb: function (key, url, params, callback) {
-    const self = this
-    self.openDB((res) => {
-      // 根据存储空间的键找到对应数据
-      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
-      const request = store.get(key)
-      request.onerror = function () {
-        console.log('读取数据失败，键：' + key)
-      }
-      request.onsuccess = function (e) {
-        const result = e.target.result
-        if (!result && url) {
-          post(url, params).then((res) => {
-            self.add(key, res)
-            callback(res)
-          })
-        } else {
-          callback(result.data)
-        }
-      }
-    })
-  },
-  delete: function (key) {
-    const self = this
-    self.openDB((res) => {
-      // 删除某一条记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function (event) {
-        console.log('已删除存储空间' + 'metaCache' + '中' + key + '记录')
-      }
-    })
-  },
-  clear: function (callback) {
-    const self = this
-    self.openDB((res) => {
-      // 删除存储空间全部记录
-      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
-
-      request.onerror = function () {
-        console.error('数据删除失败')
-      }
-      request.onsuccess = function (event) {
-        console.log('已删除存储空间' + 'metaCache' + '中所有记录')
-        callback()
-      }
-    })
-  }
-}
+// indexDB 存储
+import { post } from '@vue2-client/services/api'
+
+export const indexedDB = {
+  db: undefined,
+  indexedDB: window.indexedDB || window.webkitindexedDB,
+  IDBKeyRange: window.IDBKeyRange || window.webkitIDBKeyRange, // 键范围
+  openDB: function (callback) {
+    // 建立或打开数据库，建立对象存储空间(ObjectStore)
+    const self = this
+    if (self.db) {
+      callback(self.db)
+    } else {
+      const version = 1
+      const request = self.indexedDB.open('view', version)
+
+      request.onerror = function (e) {
+        console.error('打开数据库失败:' + e.currentTarget.error.message)
+      }
+      request.onsuccess = function (e) {
+        self.db = e.target.result
+        callback(self.db)
+      }
+      request.onupgradeneeded = function (e) {
+        const db = e.target.result
+        if (!db.objectStoreNames.contains('metaCache')) {
+          // 没有该对象空间时创建该对象空间
+          db.createObjectStore('metaCache', {
+            keyPath: 'key'
+          })
+        }
+      }
+    }
+  },
+  deleteDB: function (dbname) {
+    // 删除数据库
+    const self = this
+    self.indexedDB.deleteDatabase(dbname)
+    console.log(dbname + '数据库已删除')
+  },
+  closeDB: function () {
+    const self = this
+    if (!self.db) {
+      self.db.close()
+    }
+    console.log('数据库已关闭')
+  },
+  add: function (key, data) {
+    const self = this
+    self.openDB((res) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').add({
+        key: key,
+        data: data
+      })
+      request.onerror = function () {
+        self.update(data)
+      }
+      request.onsuccess = function () {
+        console.log('数据已存入到数据库')
+      }
+    })
+  },
+  update: function (key, data) {
+    const self = this
+    self.openDB((res) => {
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').put({
+        key: key,
+        data: data
+      })
+      request.onerror = function () {
+        console.error('数据更新失败')
+      }
+      request.onsuccess = function () {
+        console.log('数据已更新到数据库')
+      }
+    })
+  },
+  get: function (key, callback) {
+    const self = this
+    self.openDB((res) => {
+      // 根据存储空间的键找到对应数据
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.get(key)
+      request.onerror = function () {
+        console.log('读取数据失败，键：' + key)
+      }
+      request.onsuccess = function (e) {
+        const result = e.target.result
+        if (typeof (callback) === 'function') {
+          callback(result.data)
+        }
+      }
+    })
+  },
+  getByWeb: function (key, url, params, callback) {
+    const self = this
+    self.openDB((res) => {
+      // 根据存储空间的键找到对应数据
+      const store = res.transaction('metaCache', 'readwrite').objectStore('metaCache')
+      const request = store.get(key)
+      request.onerror = function () {
+        console.log('读取数据失败，键：' + key)
+      }
+      request.onsuccess = function (e) {
+        const result = e.target.result
+        if (!result && url) {
+          post(url, params).then((res) => {
+            self.add(key, res)
+            callback(res)
+          })
+        } else {
+          callback(result.data)
+        }
+      }
+    })
+  },
+  delete: function (key) {
+    const self = this
+    self.openDB((res) => {
+      // 删除某一条记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').delete(key)
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function (event) {
+        console.log('已删除存储空间' + 'metaCache' + '中' + key + '记录')
+      }
+    })
+  },
+  clear: function (callback) {
+    const self = this
+    self.openDB((res) => {
+      // 删除存储空间全部记录
+      const request = res.transaction('metaCache', 'readwrite').objectStore('metaCache').clear()
+
+      request.onerror = function () {
+        console.error('数据删除失败')
+      }
+      request.onsuccess = function (event) {
+        console.log('已删除存储空间' + 'metaCache' + '中所有记录')
+        callback()
+      }
+    })
+  }
+}