浏览代码

逻辑完善。

tomatozq 5 年之前
父节点
当前提交
f33bf926c7
共有 5 个文件被更改,包括 10 次插入6 次删除
  1. 2 1
      .env.development
  2. 2 2
      .env.production
  3. 3 1
      src/api/base/employeeInfo.js
  4. 2 2
      src/views/base/employeeInfo-list.vue
  5. 1 0
      src/views/sys/menu-list.vue

+ 2 - 1
.env.development

@@ -1,3 +1,4 @@
-VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
+VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
+#VUE_APP_BACKEND_URL=http://127.0.0.1:8086/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/
 #VUE_APP_BACKEND_URL=http://kr6zr7.natappfree.cc/smart-community-server/

+ 2 - 2
.env.production

@@ -1,3 +1,3 @@
-#VUE_APP_BACKEND_URL=http://wisdomhouseadmin.sudaonline.net
+VUE_APP_BACKEND_URL=http://wisdomhouse.sudaonline.net
 VUE_APP_IMAGE_URL=http://wisdomhouseadmin.sudaonline.net
 VUE_APP_IMAGE_URL=http://wisdomhouseadmin.sudaonline.net
-VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server
+#VUE_APP_BACKEND_URL=http://zldb.xiaoxinda.com:8088/smart-community-server

+ 3 - 1
src/api/base/employeeInfo.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 import request from '@/utils/request'
 import constant from '@/constant'
 import constant from '@/constant'
+import { getToken } from '@/utils/auth' // get token from cookie
 
 
 function pageList(formData) {
 function pageList(formData) {
   return request.post(constant.serverUrl + "/base/employeeInfo/pageList", formData);
   return request.post(constant.serverUrl + "/base/employeeInfo/pageList", formData);
@@ -42,7 +43,8 @@ function batchRemove(idList) {
 }
 }
 
 
 function downloadZip(idList, localPath) {
 function downloadZip(idList, localPath) {
-  window.open(constant.serverUrl + "/base/employeeInfo/downloadZip?ids=" + idList + "&localPath=" + localPath);
+  window.open(constant.serverUrl + "/base/employeeInfo/downloadZip?ids=" + idList + 
+  "&localPath=" + encodeURIComponent(localPath) + "&token=" + getToken());
 }
 }
 
 
 export default {
 export default {

+ 2 - 2
src/views/base/employeeInfo-list.vue

@@ -137,7 +137,7 @@ export default {
       businessKey: "",
       businessKey: "",
       companyList: [],
       companyList: [],
       dialogFormVisible: false,
       dialogFormVisible: false,
-      downPath: ""
+      downPath: "C:\\"
     };
     };
   },
   },
   methods: {
   methods: {
@@ -232,7 +232,7 @@ export default {
       });
       });
       var localPath = self.downPath;
       var localPath = self.downPath;
       if (localPath == null || localPath.length == 0) {
       if (localPath == null || localPath.length == 0) {
-        localPath = "C:";
+        localPath = "C:\\";
       }
       }
       employeeInfoApi.downloadZip(idList, localPath);
       employeeInfoApi.downloadZip(idList, localPath);
     }
     }

+ 1 - 0
src/views/sys/menu-list.vue

@@ -336,6 +336,7 @@ export default {
         this.queryMenuResult.length=0; //清空
         this.queryMenuResult.length=0; //清空
         this.queryMenuResult.push(row);
         this.queryMenuResult.push(row);
 
 
+        this.queryModel.menuName = "";
         this.queryModel.parentId = row.id;
         this.queryModel.parentId = row.id;
         this.changePage(1);
         this.changePage(1);
     },
     },