style:请求加载

@@ -13,8 +13,7 @@ export function getQlxxDictList (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/sys/dict/getQlxxDictList',
     method: 'post',
-    data,
-    showLoading: true
+    data
   })
 }
 /* 
@@ -36,8 +35,6 @@ export function editDictNode (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/sys/dict/editDictNode',
     method: 'post',
-    data,
-    showLoading: true,
-    loadingTarget: '正在提交中...'
+    data
   })
 }
\ No newline at end of file

 import request from '@/utils/request'
 import SERVER from './config'
 // 根据条件进行列表查询
-export function getJtfcPage (data, headers) {
+export function getJtfcPage (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/getJtfcPage',
     method: 'post',
-    data,
-    headers
+    data
   })
 }
 // 新增申请查询家庭房产信息
-export function addJtfcCxjgXx (data, headers) {
+export function addJtfcCxjgXx (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/sqcx/jtfc/addJtfcCxjgXx',
     method: 'post',
-    data,
-    headers
+    data
   })
 }
\ No newline at end of file

@@ -4,12 +4,11 @@ import SERVER from './config'
 /* 
 业务办理-选择单元-查询宗地基本信息
 */
-export function selectZdjbxx(data) {
+export function selectZdjbxx (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZdjbxx',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 
@@ -17,36 +16,33 @@ export function selectZdjbxx(data) {
 /* 
 业务办理-选择单元-查询建设用地、宅基地信息
 */
-export function selectJsydQlxx(data) {
+export function selectJsydQlxx (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectJsydQlxx',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 
 /* 
 业务办理-选择单元-查询自然幢信息
 */
-export function selectZrz(data) {
+export function selectZrz (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectZrz',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 
 /* 
 业务办理-选择单元-查询户信息
 */
-export function selectH(data) {
+export function selectH (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectH',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 
@@ -56,8 +52,7 @@ export function selectOtherH (data) {
     return request({
         url: 'ywbl/ywsq/selectOtherH',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 
@@ -76,52 +71,48 @@ export function selectOtherH (data) {
 /* 
 业务办理-选择权利信息-根据条件进行列表查询
 */
-export function selectQlxx(data) {
+export function selectQlxx (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 /* 
 业务办理-选择抵押权信息-根据条件进行列表查询
 */
-export function selectDiyaq(data) {
+export function selectDiyaq (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 /* 
 业务办理-选择查封信息-根据条件进行列表查询
 */
-export function selectCfdj(data) {
+export function selectCfdj (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 
 /* 
 业务办理-业务申请-添加收藏业务
 */
-export function deleteCollectBiz(bsmSqyw) {
+export function deleteCollectBiz (bsmSqyw) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/deleteCollectBiz?bsmSqyw=' + bsmSqyw,
         method: 'post'
     })
 }
 // 国有建设用地使用权/房屋使用权 -选择不动产单元
-export function choiceBdcdy(data) {
+export function choiceBdcdy (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
\ No newline at end of file

@@ -8,8 +8,7 @@ export function getSysSqdjywBysearch (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/getSysSqdjywBysearch',
     method: 'post',
-    data,
-    showLoading: true
+    data
   })
 }
 /* 
@@ -38,9 +37,7 @@ export function saveSqdjyw (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/system/sysSqdjyw/saveSqdjyw',
     method: 'post',
-    data,
-    showLoading: true,
-    loadingTarget: '正在保存中...'
+    data
   })
 }
 
@@ -51,8 +48,7 @@ export function sysSqywmbszSearch (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/search',
     method: 'post',
-    data,
-    showLoading: true
+    data
   })
 }
 /* 
@@ -71,7 +67,6 @@ export function updateSysSqywmbsz (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/system/sysSqywmbsz/updateSysSqywmbsz',
     method: 'put',
-    data,
-    showLoading: true
+    data
   })
 }
\ No newline at end of file

@@ -7,8 +7,7 @@ export function getErrorLogList (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/xtjk/view/getErrorLogList',
     method: 'post',
-    data,
-    showLoading: true
+    data
   })
 }
 
@@ -19,8 +18,7 @@ export function getOperationLogList (data) {
   return request({
     url: SERVER.SERVERAPI + '/rest/xtjk/view/getOperationLogList',
     method: 'post',
-    data,
-    showLoading: true
+    data
   })
 }
 
@@ -30,7 +28,6 @@ export function getOperationLogList (data) {
 export function getServerInfo () {
   return request({
     url: SERVER.SERVERAPI + '/rest/xtjk/view/getServerInfo',
-    method: 'get',
-    showLoading: true
+    method: 'get'
   })
 }

@@ -3,11 +3,10 @@ import SERVER from './config'
 /* 
 业务办理-获取收藏业务集合
 */
-export function getCollectBiz (headers) {
+export function getCollectBiz () {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getCollectBiz',
-        method: 'post',
-        headers
+        method: 'post'
     })
 }
 
@@ -17,32 +16,27 @@ export function getCollectBiz (headers) {
 export function getleftMenu () {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getleftMenu',
-        method: 'post',
-        headers: {
-            showLoading: false
-        }
+        method: 'post'
     })
 }
 /* 
 业务办理-获取下个节点内容
 */
-export function getNextNode (bsmSqyw, headers) {
+export function getNextNode (bsmSqyw) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/BusinessApply/getNextNode?parentid=' + bsmSqyw,
-        method: 'post',
-        headers
+        method: 'post'
     })
 }
 
 /* 
 业务办理-选择单元-根据条件进行列表查询-国有建设用地使用权、房屋所有权（首次登记）
 */
-export function selectScBdcdy (data, headers) {
+export function selectScBdcdy (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectScBdcdy',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 
@@ -53,82 +47,75 @@ export function selectScBdcdy (data, headers) {
 //     return request({
 //         url: 'ywbl/ywsq/selectFwsyq',
 //         method: 'post',
-//         data,
+//         data
 //         showLoading: true
 //     })
 // }
 
 // 待办箱列表查询接口
-export function searchTaskToDo (data, headers = {}) {
+export function searchTaskToDo (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskToDo',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 // 待办箱/不动产单元删除接口
-export function deleteFlow (data, headers = {}) {
+export function deleteFlow (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteFlow',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 /* 
 业务办理-发起业务申请流程
 */
-export function startBusinessFlow (data, headers = {}) {
+export function startBusinessFlow (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/business/workFlow/startBusinessFlow',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 /* 
 已办箱列表查询接口
 */
-export function searchTaskDone (data, headers = {}) {
+export function searchTaskDone (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/workBox/search/searchTaskDone',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 /* 
 业务办理-选择权利信息-根据条件进行列表查询
 */
-export function selectQlxx (data, headers = {}) {
+export function selectQlxx (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectQlxx',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 /* 
 业务办理-选择抵押权信息-根据条件进行列表查询
 */
-export function selectDiyaq (data, headers = {}) {
+export function selectDiyaq (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectDiyaq',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 /* 
 业务办理-选择查封信息-根据条件进行列表查询
 */
-export function selectCfdj (data, headers = {}) {
+export function selectCfdj (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectCfdj',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 /* 
@@ -150,31 +137,28 @@ export function deleteCollectBiz (bsmSqyw) {
     })
 }
 // 国有建设用地使用权/房屋使用权 -选择不动产单元
-export function choiceBdcdy (data, headers = {}) {
+export function choiceBdcdy (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/business/workFlow/choiceBdcdy',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 
 // 申请列表删除
-export function deleteBdcdy (data, headers = {}) {
+export function deleteBdcdy (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/business/workFlow/deleteBdcdy',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
 
 // 获取自然幢下其他户
-export function selectOtherH (data, headers = {}) {
+export function selectOtherH (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/ywbl/ywsq/selectOtherH',
         method: 'post',
-        data,
-        headers
+        data
     })
 }
\ No newline at end of file

@@ -17,8 +17,7 @@ export function getZsglrkList (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglrkList',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 /* 
@@ -28,9 +27,7 @@ export function zsrk (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsrk',
         method: 'post',
-        data,
-        showLoading: true,
-        loadingTarget: '正在保存中...'
+        data
     })
 }
 /* 
@@ -60,8 +57,7 @@ export function getZsglffList (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZsglffList',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 /* 
@@ -90,9 +86,7 @@ export function zsff (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/sys/zsgl/zsff',
         method: 'post',
-        data,
-        showLoading: true,
-        loadingTarget: '正在保存中...'
+        data
     })
 }
 /* 
@@ -112,8 +106,7 @@ export function getZssyqkList (data) {
     return request({
         url: SERVER.SERVERAPI + '/rest/sys/zsgl/getZssyqkList',
         method: 'post',
-        data,
-        showLoading: true
+        data
     })
 }
 /* 

@@ -8,11 +8,15 @@ import './styles/element-variables.scss'
 import '@/styles/index.scss'
 import Base from './components/Base/base' // 全局组件引入
 import mixin from '@/utils/mixin/theme.js'
+import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
 Vue.mixin(mixin);
 
 import rules from './utils/rule.js'
 // 全局方法挂载
 Vue.prototype.$rules = rules
+// 全局加载
+Vue.prototype.$startLoading = startLoadingAddCount
+Vue.prototype.$endLoading = endLoadingSubCount
 
 import Popup from './components/tanchuang/index'
 Vue.prototype.$popup = Popup.install

@@ -3,7 +3,7 @@
  */
 import axios from 'axios'
 import { Message } from 'element-ui'
-import { startLoadingAddCount, endLoadingSubCount } from './requestLoading'
+import { endLoadingSubCount } from './utils/requestLoading'
 
 // create an axios instance
 const service = axios.create({
@@ -19,22 +19,12 @@ const service = axios.create({
 // request interceptor
 service.interceptors.request.use(
     config => {
-        // config.headers.showLoading !== false
-        if (config.headers.target) {
-            startLoadingAddCount(config.headers.loadingTarget ? config.headers.loadingTarget : '正在加载中...',
-                config.headers.target ? config.headers.target : 'body');
-        }
         config.headers.Authorization =
             'bearer AT-4-MxSrO29Coe7VTazx8uuixtqqgO-hvCB6'
         config.headers.Accept = 'application/json'
         return config
     },
     error => {
-        // error.headers.showLoading !== false
-        if (error.headers.target) {
-            endLoadingSubCount(config.headers.loadingTarget ? config.headers.loadingTarget : '正在加载中...',
-                config.headers.target ? config.headers.target : 'body');
-        }
         Message.error('请求超时!');
         return Promise.reject(error)
     }
@@ -43,9 +33,6 @@ service.interceptors.request.use(
 // response interceptor
 service.interceptors.response.use(
     response => {
-        if (response.config.headers.showLoading !== false) {
-            endLoadingSubCount();
-        }
         /**
          * 对响应数据判断:
          *  如果成功返回数据，就通过return把数据返出去
@@ -59,15 +46,13 @@ service.interceptors.response.use(
         return response;
     },
     error => {
+        endLoadingSubCount()
         // 对响应错误做点什么
         Message({
             message: '服务器异常,请联系管理员',
             type: 'error',
             duration: 5 * 1000
         })
-        if (error.config.headers.showLoading !== false) {
-            endLoadingSubCount();
-        }
         return Promise.reject(error);
     }
 )
@@ -89,12 +74,6 @@ function handleErrorData (errMes) {
             case 500:
                 Message.error("服务器错误!");
                 break;
-            case 504:
-                Message.error("网络超时!");
-                break;
-            case 2002:
-                Message.error(errMes.message);
-                break;
             default:
                 Message.error("服务正在联调中，请稍后!");
                 break;

@@ -4,12 +4,12 @@ import Loading from '@/components/loading/index.js';
 let loading
 
 // loading开始 方法
-function startLoading (LoadingText = '正在加载中...', target = "body") {
+function startLoading (target = "body") {
   loading = Loading.service({
-    text: LoadingText,
+    text: '正在加载中...',
     spinner: 'el-icon-loading',
     background: 'rgba(255, 255, 255, 0.5)',
-    target: target
+    target: '#' + target
   })
 }
 

@@ -114,8 +114,10 @@ export default {
     },
     // 列表渲染接口
     fetchData () {
-      searchTaskToDo({ ...this.queryForm, ...this.pageData }, { 'target': '#dbx' }).then(res => {
+      this.$startLoading('dbx')
+      searchTaskToDo({ ...this.queryForm, ...this.pageData }).then(res => {
         if (res.code === 200) {
+          this.$endLoading()
           let { total, records } = res.result
           records.forEach(item => {
             item.qlrmc = item.qlrmc.join(',')