Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises_ys

Administrator

2021-11-24 9e1b90ee51923869010b2394f8efbdd3b76f77d1

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises_ys

 src/views/licenseApproval/branchOffice.vue

@@ -2,7 +2,7 @@
 * @Author: liu
 * @Date: 2021-08-26 17:00:55 
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-23 16:43:42
 * @Last Modified time: 2021-09-25 18:01:55
 */


@@ -488,9 +488,24 @@
    onLoad(page, params = {}) {
      this.loading = true;
      params["ptype"] = 2;
      var gonganj = "";
      if (this.userInfo.role_name == "公安管理员") {
        let test = /派出所$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "派出所管理员";
        }
        test = /分局|公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "县局管理员";
        }
        test = /市公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "市局管理员";
        }
      }
      params = {
        ...params,
        ...this.getFenji(this.userInfo.role_name),
        ...this.getFenji(gonganj),
      };
      getList(
        page.currentPage,

 src/views/licenseApproval/crossRegion.vue

@@ -486,9 +486,24 @@
    onLoad(page, params = {}) {
      this.loading = true;
      params["ptype"] = 5;
       var gonganj = "";
      if (this.userInfo.role_name == "公安管理员") {
        let test = /派出所$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "派出所管理员";
        }
        test = /分局|公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "县局管理员";
        }
        test = /市公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "市局管理员";
        }
      }
      params = {
        ...params,
        ...this.getFenji(this.userInfo.role_name),
        ...this.getFenji(gonganj),
      };
      getList(
        page.currentPage,

 src/views/licenseApproval/securityGuard.vue

@@ -2,7 +2,7 @@
 * @Author: liu
 * @Date: 2021-08-26 16:57:58 
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-23 16:14:20
 * @Last Modified time: 2021-09-26 11:57:10
 */


@@ -552,9 +552,24 @@
    onLoad(page, params = {}) {
      this.loading = true;
      params["ptype"] = 3;
      var gonganj = "";
      if (this.userInfo.role_name == "公安管理员") {
        let test = /派出所$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "派出所管理员";
        }
        test = /分局|公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "县局管理员";
        }
        test = /市公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "市局管理员";
        }
      }
      params = {
        ...params,
        ...this.getFenji(this.userInfo.role_name),
        ...this.getFenji(gonganj),
      };
      console.log(params, "params");
      // return;

 src/views/licenseApproval/securityPermit.vue

@@ -483,9 +483,24 @@
    onLoad(page, params = {}) {
      this.loading = true;
      params["ptype"] = 0;
       var gonganj = "";
      if (this.userInfo.role_name == "公安管理员") {
        let test = /派出所$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "派出所管理员";
        }
        test = /分局|公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "县局管理员";
        }
        test = /市公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "市局管理员";
        }
      }
      params = {
        ...params,
        ...this.getFenji(this.userInfo.role_name),
        ...this.getFenji(gonganj),
      };
      getList(
        page.currentPage,

 src/views/licenseApproval/securityTraining.vue

@@ -483,9 +483,24 @@
    onLoad(page, params = {}) {
      this.loading = true;
      params["ptype"] = 1;
       var gonganj = "";
      if (this.userInfo.role_name == "公安管理员") {
        let test = /派出所$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "派出所管理员";
        }
        test = /分局|公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "县局管理员";
        }
        test = /市公安局$/g;
        if (test.test(this.userInfo.list.name)) {
          gonganj = "市局管理员";
        }
      }
      params = {
        ...params,
        ...this.getFenji(this.userInfo.role_name),
        ...this.getFenji(gonganj),
      };
      getList(
        page.currentPage,

 vue.config.js

@@ -31,7 +31,7 @@
                // target: 'http://192.168.0.114:83',//钟日健W
                // target: 'http://192.168.0.106:83',//曾杭W
                // target: 'http://localhost:81',
                // target: 'http://192.168.0.115:83',//钟日健W
                // target: 'http://192.168.0.115:83',//原W
                // target: 'http://localhost:81', //原W
                // target: 'http://192.168.0.115:83',//原W
                // target: 'http://192.168.0.107:83',//唐N