Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

src/main.js

@@ -7,6 +7,7 @@
  * @FilePath: \founder_vue\src\main.js
  */
 import Vue from 'vue'
+import './utils/CrashHandle'
 import './plugins/axios'
 import fHttp from './request/http.js'
 import NetUtil from './netmgr/NetUtil'

src/utils/CrashHandle.js

+import Vue from 'vue'
+//系统错误捕获
+const errorHandler = (error, vm) => {
+  logger.error('异常组件', vm)
+  logger.error('异常原因', error)
+}
+
+Vue.config.errorHandler = errorHandler
+Vue.prototype.$throw = (error) => errorHandler(error, this)
+

src/utils/UserUtil.js

@@ -3,7 +3,24 @@
  * @author: li_hongchao
  * @date: 2021/12/20 9:46
  */
-
+/**
+ *  相关字段
+ *  <p>
+ *    id: 1
+ *   idCard: "xxxxxxxx"
+ *   name: "管理员"
+ *   password: ""
+ *   permissionNames: "(用户组、角色赋予权限)"
+ *   phoneNumber: "15"
+ *   policeNumber: "001"
+ *   roleNames: "超级管理员"
+ *   status: 1
+ *   unitCode: "0000000000"
+ *   unitName: "xxx省公安厅"
+ *   userGroupNames: "xxx省xxx市派出所"
+ *   username: "admin"
+ *  </p>
+ */
 const _USER_INFO_KEY = 'userInfo'
 
 export default {
@@ -17,17 +34,6 @@ export default {
     localStorage.setItem(_USER_INFO_KEY, JSON.stringify(userInfo))
   },
 
-  // isStRole() {// 是否省厅角色
-  //   let userInfo = this.getUser()
-  //   // console.log('用户信息：', userInfo)
-  //   let username = userInfo.username
-  //   // console.log('用户名称：', username)
-  //   if (username === '123123') {// 省级 123123，市级 321321
-  //     return true
-  //   } else {
-  //     return false
-  //   }
-  // },
 
 }
 

src/views/bzxxgl/BzxxsfOpt.vue

@@ -210,7 +210,7 @@ export default {
             break
         }
       }
-     // logger.info('操作选项初始化', _that.curOpt)
+      // logger.info('操作选项初始化', _that.curOpt)
     },
 
     /**
@@ -340,7 +340,6 @@ export default {
       _that.isShowing = val
     },
     doSh(fhzt, shzt, desc = '') {
-      let TITLE = '审核'
       let _that = this
       logger.info('item:', JSON.stringify(_that.shInfo))
       var ruleForm = {}
@@ -350,6 +349,7 @@ export default {
       ruleForm.shzt = shzt
       ruleForm.des = desc
       ruleForm.level = _that.getLevel()
+      ruleForm.userId = user.getUser().id
 
       NetUtil.bzxxsh
         .sh(ruleForm)
@@ -358,11 +358,11 @@ export default {
             _that.$emit('refresh', _that.shInfo)
             _that.initShItem()
           }
-        })
+        }).catch(err => {
+      })
     },
 
     doZg(zgzt, desc = '') {
-      let TITLE = '审核'
       let _that = this
       var ruleForm = {}
       ruleForm.querytype = _that.shInfo.querytype
@@ -378,11 +378,11 @@ export default {
             _that.$emit('refresh', _that.shInfo)
             _that.initShItem()
           }
-        })
+        }).catch(err => {
+      })
     },
 
     doPlSb() {
-      let TITLE = '上报'
       let _that = this
       let ruleForm = {}
       var ids = []
@@ -393,13 +393,14 @@ export default {
       ruleForm.level = _that.getLevel()
 
       NetUtil.bzxxsh
-        .bzxxPlSb(ruleForm)
+        .plsb(ruleForm)
         .then(res => {
           if (res.code === 0) {
             _that.$emit('refresh', _that.shInfo)
             _that.initShItem()
           }
-        })
+        }).catch(err => {
+      })
     },
   },
 }

src/views/bzxxgl/bzxxsh.vue

@@ -762,7 +762,8 @@ export default {
           if (res.code === 0) {
             _that.getData()
           }
-        })
+        }).catch(err => {
+      })
     },
 
     onFztmSuccess(e) {

src/views/bzxxgl/fhxxLL.vue

@@ -558,6 +558,7 @@ export default {
       ruleForm.shzt = shzt
       ruleForm.des = _that.fhyj
       ruleForm.level = _that.curLevel
+      ruleForm.userId = user.getUser().id
 
       NetUtil.bzxxsh
         .sh(ruleForm)
@@ -571,7 +572,8 @@ export default {
               }
             })
           }
-        })
+        }).catch(err => {
+      })
     },
 
   },

src/views/bzxxgl/fhxxLT.vue

@@ -603,6 +603,7 @@ export default {
       ruleForm.shzt = shzt
       ruleForm.des = _that.fhyj
       ruleForm.level = _that.curLevel
+      ruleForm.userId = user.getUser().id
 
       NetUtil.bzxxsh
         .sh(ruleForm)
@@ -616,7 +617,8 @@ export default {
               }
             })
           }
-        })
+        }).catch(err => {
+      })
     },
   },
   destroyed() {

src/views/bzxxgl/fhxxTT.vue

@@ -1206,7 +1206,7 @@ export default {
       ruleForm.shzt = shzt
       ruleForm.des = _that.fhyj
       ruleForm.level = _that.curLevel
-
+      ruleForm.userId = user.getUser().id
 
       NetUtil.bzxxsh
         .sh(ruleForm)
@@ -1220,7 +1220,8 @@ export default {
               }
             })
           }
-        })
+        }).catch(err => {
+      })
     },
 
     // 滚动平面选择切换

vue.config.js

@@ -98,8 +98,8 @@ module.exports = {
         // target: "http://127.0.0.1:8099",
         // target: "http://47.92.225.109:5602",
         // target: "http://www.meetfood.cn:2390", // 湖南-线上
-        // target:"http://zwpt.xzclub.top:9333/",
-        target: "http://192.168.128.102:8099",  // 江
+        target:"http://zwpt.xzclub.top:9333/",
+        // target: "http://192.168.128.102:8099",  // 江
         ws: true,
         changeOrigin: true,
         pathRewrite: {