Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/App.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 17:17:53
- * @LastEditTime: 2022-03-28 17:08:38
+ * @LastEditTime: 2022-03-29 10:02:24
  * @LastEditors: your name
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\App.vue
@@ -105,7 +105,7 @@ export default {
     systemSet: {
       handler (val) {
         if (val) {
-          const { LoginError } = typeof this.systemSet === "string" ? JSON.parse(this.systemSet) : this.systemSet;
+          const { LoginError } = typeof val === "string" ? JSON.parse(val) : val;
           this.LoginError = LoginError;
         }
       },

src/views/authorityManagement/components/authorityAppAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 09:18:04
- * @LastEditTime: 2022-03-28 15:47:49
+ * @LastEditTime: 2022-03-29 14:25:08
  * @LastEditors: your name
  * @Description: 新增/编辑应用
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\addApp.vue
@@ -202,15 +202,16 @@
                     placeholder="入参位置"
                   >
                     <el-option
+                      v-if="form.type === 2"
                       label="header"
                       value="header"
                     />
                     <el-option
+                      v-if="form.type === 2"
                       label="url"
                       value="url"
                     />
                     <el-option
-                      v-if="form.type === 2"
                       label="body"
                       value="body"
                     />
@@ -417,7 +418,7 @@ export default {
           AppInputName: '',
           InputComment: '',
           AppInputType: '',
-          AppInputSite: 'url',
+          AppInputSite: 'body',
           InputValue: ''
         })
       } else if (type === 2) {

src/views/authorityManagement/components/authorityAppEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 09:18:04
- * @LastEditTime: 2022-03-28 15:58:08
+ * @LastEditTime: 2022-03-29 14:24:34
  * @LastEditors: your name
  * @Description: 新增/编辑应用
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\addApp.vue
@@ -212,15 +212,16 @@
                     placeholder="入参位置"
                   >
                     <el-option
+                      v-if="form.type === 2"
                       label="header"
                       value="header"
                     />
                     <el-option
+                      v-if="form.type === 2"
                       label="url"
                       value="url"
                     />
                     <el-option
-                      v-if="form.type === 2"
                       label="body"
                       value="body"
                     />
@@ -491,7 +492,7 @@ export default {
           AppInputName: '',
           InputComment: '',
           AppInputType: '',
-          AppInputSite: 'url',
+          AppInputSite: 'body',
           InputValue: '',
           AppId: this.AppId
         })

src/views/dashboard/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 17:17:53
- * @LastEditTime: 2022-03-28 17:42:13
+ * @LastEditTime: 2022-03-29 14:18:40
  * @LastEditors: your name
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\views\dashboard\index.vue
@@ -386,28 +386,43 @@ export default {
         })
         if (parseInt(item.requestType) === 1) {
           method = 'get'
+          const form = document.createElement('form')
+          form.action = item.appUrl + (url.length ? '?' + url.join('&') : '')
+          form.target = '_blank'
+          form.method = method
+          form.style.display = 'none'
+          for (let key in params) {
+            const input = document.createElement('input')
+            input.name = key
+            input.value = params[key]
+            form.appendChild(input)
+          }
+          document.body.appendChild(form)
+          form.submit()
+          document.body.removeChild(form)
         } else {
           method = 'post'
           headers['Content-Type'] =
             item.bodyType === 'application/json'
               ? 'application/json;charset=UTF-8'
               : 'application/x-www-form-urlencoded'
-        }
-        axios({
-          url: item.appUrl + (url.length ? '?' + url.join('&') : ''),
-          method,
-          headers,
-          data: item.bodyType === 'application/json' ? params : qs.stringify(params)
-        })
-          .then(res => {
-            const data = res.data.data
-            data && window.open(data)
-          })
-          .catch(err => {
-            this.$message.error(err)
+          axios({
+            baseURL: item.appUrl,
+            url: url.length ? '?' + url.join('&') : '',
+            method,
+            headers,
+            data: item.bodyType === 'application/json' ? params : qs.stringify(params)
           })
+            .then(res => {
+              const data = res.data.data
+              data && window.open(data)
+            })
+            .catch(err => {
+              this.$message.error(err)
+            })
+        }
       } else {
-            this.$message.warning('应用地址为空')
+        this.$message.warning('应用地址为空')
       }
       // if (item.appUrl) {
       //   window.open(item.appUrl)