xjc пре 2 година
родитељ
комит
1ff844bce8
3 измењених фајлова са 9 додато и 4 уклоњено
  1. 3 1
      src/views/menu6/menu6-1/index.vue
  2. 4 1
      src/views/menu6/menu6-2/index.vue
  3. 2 2
      vue.config.js

+ 3 - 1
src/views/menu6/menu6-1/index.vue

@@ -237,7 +237,9 @@ export default {
       }, 2000);
     },
     getList(size, page) {
-      let params = this.listQuery;
+      let params = {...this.listQuery};
+      params.gid = params.gid?params.gid:0
+      params.cid = params.cid?params.cid:0
       WrongApi.getListC(params).then((res) => {
         res.data.forEach((item) => {
           item.dist = item.dist.map((di) => {

+ 4 - 1
src/views/menu6/menu6-2/index.vue

@@ -206,8 +206,11 @@ export default {
   },
   methods: {
     getList() {
+      let params = {...this.listQuery};
+      params.gid = params.gid?params.gid:0
+      params.cid = params.cid?params.cid:0
       WrongApi.getListS(
-        Object.assign(this.listQuery, {
+        Object.assign(params, {
           page: this.dataTable.paginationOpt.pageIndex,
           size: this.dataTable.paginationOpt.pageRows,
         })

+ 2 - 2
vue.config.js

@@ -29,8 +29,8 @@ module.exports = {
         /* 使用代理 */
         proxy: {
             "/": {
-                // target: "http://47.108.130.28:8000",
-                target: "http://10.10.153.242:8000",
+                target: "http://47.108.130.28:8000",
+                // target: "http://10.10.153.242:8000",
                 // target: "http://192.168.192.131:8000",
                 // target: "http://47.104.213.35",
                 changeOrigin: true,