Merge remote-tracking branch 'origin/main'

god-ui/src/views/qcfgjManage/role/index.vue

@@ -341,7 +341,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        distinctionNum: 94021,
+        distinctionNum:  window.location.port?window.location.port:0,
         roleName: undefined,
         roleKey: undefined,
         status: undefined
@@ -579,7 +579,7 @@ export default {
     /** 提交按钮 */
     submitForm: function() {
       this.$refs['form'].validate(valid => {
-        this.form.distinctionNum = 94021
+        this.form.distinctionNum =  window.location.port?window.location.port:0
         if (valid) {
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys()

god-ui/src/views/qcfgjManage/role/selectUser.vue

@@ -80,7 +80,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        distinctionNum: 94021,
+        distinctionNum:  window.location.port?window.location.port:0,
         roleId: undefined,
         userName: undefined,
         phonenumber: undefined

god-ui/src/views/qcfgjManage/user/authRole.vue

@@ -72,7 +72,7 @@ export default {
     const userId = this.$route.params && this.$route.params.userId
     if (userId) {
       this.loading = true
-      getAuthRoleA(userId, 94021).then((response) => {
+      getAuthRoleA(userId,  window.location.port?window.location.port:0).then((response) => {
         this.form = response.user
         this.roles = response.roles
         this.total = this.roles.length
@@ -104,7 +104,7 @@ export default {
     submitForm() {
       const userId = this.form.userId
       const roleIds = this.roleIds.join(',')
-      updateAuthRoleA({ userId: userId, roleIds: roleIds, distinctionNum: 94021}).then((response) => {
+      updateAuthRoleA({ userId: userId, roleIds: roleIds, distinctionNum:  window.location.port?window.location.port:0}).then((response) => {
         this.$modal.msgSuccess('授权成功')
         this.close()
       })

god-ui/src/views/qcfgjManage/user/index.vue

@@ -419,7 +419,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        distinctionNum: 94021,
+        distinctionNum: window.location.port?window.location.port:0,
         userName: undefined,
         phonenumber: undefined,
         status: undefined,
@@ -576,7 +576,7 @@ export default {
       this.reset();
       const user = {
         userId : parseStrEmpty(""),
-        distinctionNum: window.location.port,
+        distinctionNum: window.location.port?window.location.port:0,
       }
       getUser(user).then(response => {
         this.postOptions = response.posts;
@@ -591,7 +591,7 @@ export default {
       this.reset();
       const user = {
         userId : row.userId || this.ids[0],
-        distinctionNum:  window.location.port,
+        distinctionNum:  window.location.port?window.location.port:0,
       }
       getUser(user).then(response => {
         this.form = response.data;
@@ -613,7 +613,7 @@ export default {
         inputPattern: /^.{5,20}$/,
         inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
       }).then(({ value }) => {
-          resetUserPwdA(row.userId, value,  window.location.port).then(response => {
+          resetUserPwdA(row.userId, value,  window.location.port?window.location.port:0).then(response => {
             this.$modal.msgSuccess("修改成功，新密码是：" + value);
           });
         }).catch(() => {});
@@ -627,7 +627,7 @@ export default {
     submitForm: function() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.distinctionNum =  window.location.port
+          this.form.distinctionNum =  window.location.port?window.location.port:0
           if (this.form.userId != undefined) {
             updateUser(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
@@ -648,7 +648,7 @@ export default {
     handleDelete(row) {
       const userIds = [row.userId] || this.ids;
       this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        const distinctionNum =  window.location.port;
+        const distinctionNum =  window.location.port?window.location.port:0;
         // JSON.stringify(user)
         return delUserA(userIds, distinctionNum);
       }).then(() => {