Merge branch 'master' of http://git.taauav.net/gitadmin/jndz_admin_web

src/config/setting.js

@@ -4,7 +4,8 @@
 export default {
     version: '1.0',
     name: 'JNDZ考核管理系统',  // 项目名称
-    baseURL: 'http://121.40.249.52:9031/api/',  // 接口地址
+    // baseURL: 'http://121.40.249.52:9031/api/',  // 接口地址
+    baseURL:"http://47.98.157.120:9031/api/",
     whiteList: ['/login', '/forget'],  // 路由白名单(不需要登录的)
     keepAliveList: [],  // 需要缓存的组件名称
     menuUrl: '/index/getMenuList',  // 菜单数据接口

src/store/modules/base.js

@@ -92,9 +92,9 @@ export default {
                 })
             })
         },
-        getQuota2List({ commit }, data) {
+        getQuota2List({ commit }, params) {
             return new Promise((resolve) => {
-                axios.get('/quota/getQuota2List/' + data).then(res => {
+                axios.get('/quota/getQuota2List', {params}).then(res => {
                     let data = res.data.data;
                     commit('SET_QUOTAL2', data);
                     resolve(data)

src/views/second/search.vue

@@ -7,7 +7,7 @@
             filterable
             clearable
             v-model="searchParams.quota1"
-            @change="getQuota2List(searchParams.quota1)"
+            @change="getQuota2List({quota1:searchParams.quota1,categoryId:type})"
             placeholder="请选择一级指标"
           >
             <el-option