1、逻辑分库名称只能输入汉字和字母校验异常，可以输入数字

   2、逻辑分库编辑时，偶尔有提交无响应问题
   3、http.js新增设置网络请求id，取消请求新增取消指定网络请求,相应网络工具说明.md已更新

src/main.js

@@ -19,6 +19,7 @@ import './plugins/element.js'
 import Util from './utils/util'
 import LoggerUtil from './utils/logger/LoggerUtil'
 import UserUtil from './utils/UserUtil'
+import LjkUtil from './utils/LjkUtil'
 import VueWechatTitle from 'vue-wechat-title'
 import Watermark from './utils/watermark.js'
 import Driver from 'driver.js'
@@ -79,6 +80,7 @@ Vue.prototype.$util = Util
 window.util = Util
 window.logger = LoggerUtil
 window.user = UserUtil
+window.ljkUtil = LjkUtil
 window.fHttp = fHttp
 window.fRegExp = RegExpUtil
 window.NetUtil = NetUtil

src/netmgr/bzxxgl/bzxxsh.js

@@ -5,6 +5,11 @@ const _path = {
 }
 export default {
   shList(_parameter) {
+    _parameter.userId = user.getUser().id
+    _parameter.userGroupIds = user.getUserGroupId()
+    _parameter = ljkUtil.getAjLjkIds(_parameter)
+    _parameter = ljkUtil.getRyLjkIds(_parameter)
+
     return fHttp.postJson(_path.bzxxsh + 'queryAllSh', _parameter)
   },
 

src/netmgr/xtfkgl/xtfkgl.js

@@ -19,6 +19,9 @@ export default {
    * @date: 2022/1/5 11:32
    */
   ryList(_parameter) {// 获取人员逻辑库
+    _parameter.userId = user.getUser().id
+    _parameter.userGroupIds = user.getUserGroupId()
+    _parameter = ljkUtil.getRyLjkIds(_parameter)
     return fHttp.postJson(_path.ryfkgl + 'queryAll', _parameter)
   },
   /**
@@ -27,6 +30,9 @@ export default {
    * @date: 2022/1/5 11:32
    */
   ajList(_parameter) {// 获取案件逻辑库
+    _parameter.userId = user.getUser().id
+    _parameter.userGroupIds = user.getUserGroupId()
+    _parameter = ljkUtil.getAjLjkIds(_parameter)
     return fHttp.postJson(_path.ajfkgl + 'queryAll', _parameter)
   },
   /**

src/request/http.js

@@ -316,13 +316,15 @@ export default {
       for (var i = 0; i < window._axiosPromiseArr.length; i++) {
         ele = window._axiosPromiseArr[i]
         if (id !== _HTTP_TYPE.CANCLE_DEFAULT) {
-          if (id === ele.key) {
+          if (ele && id === ele.key && ele.cancle) {
             ele.cancle()
             delete window._axiosPromiseArr[i]
           }
         } else {
-          ele.cancle()
-          delete window._axiosPromiseArr[i]
+          if (ele && id === ele.key && ele.cancle) {
+            ele.cancle()
+            delete window._axiosPromiseArr[i]
+          }
         }
       }
     }

src/utils/LjkUtil.js

+import store from '@/store'
+
+export default {
+  getRyLjkIds(params = {}) { // 获取人员逻辑库ids
+    let personLogicIds = []
+    let arr = store.state.ljk.targetOptions_ry
+    arr.forEach(item => {
+      personLogicIds.push(item.id)
+    })
+    params.personLogicIds = personLogicIds.join(',')
+    return params
+  },
+  getAjLjkIds(params = {}) { // 获取案件逻辑库ids
+    let caseLogicIds = []
+    let arr = store.state.ljk.targetOptions_aj
+    arr.forEach(item => {
+      caseLogicIds.push(item.id)
+    })
+    params.caseLogicIds = caseLogicIds.join(',')
+    return params
+  },
+}

src/views/bzxxgl/bzxxsh.vue

@@ -712,10 +712,6 @@ export default {
 
       _that.ruleForm.level = _that.getLevel()
 
-      _that.ruleForm.userId = user.getUser().id
-      _that.ruleForm.userGroupIds = user.getUserGroupId()
-
-
       NetUtil.bzxxsh.shList(_that.ruleForm)
         .then(res => {
           if (res.code === 0) {

src/views/xtfkgl/AjXtljfkView.vue

@@ -346,9 +346,6 @@ export default {
       ruleForm.page = page
       ruleForm.limit = limit
 
-      ruleForm.userId = user.getUser().id
-      ruleForm.userGroupIds = user.getUserGroupId()
-
       NetUtil.xtfkgl
         .ajList(ruleForm)
         .then(res => {

src/views/xtfkgl/RyXtljfkView.vue

@@ -353,9 +353,6 @@ export default {
       ruleForm.page = page
       ruleForm.limit = limit
 
-      ruleForm.userId = user.getUser().id
-      ruleForm.userGroupIds = user.getUserGroupId()
-
       NetUtil.xtfkgl
         .ryList(ruleForm)
         .then(res => {