Merge branch 'rebuild_UI'

src/views/datasheet_manage/sheetList.vue

@@ -649,23 +649,18 @@ export default {
       let value = "";
       if (Source === 1) {
         value = FileUrl;
+        this.downLoad(value, ExcelName);
       } else if ([2, 3].includes(Source)) {
         value = `${this.downExcelFileUrl}&ExcelInfoId=${ExcelInfoId}`;
-      }
-
-      if (!value) return;
-
-      this.downLoad(value, ExcelName);
 
-      // let downDom = document.getElementById("sheet-download");
-      // if(!downDom){
-      // 	downDom = document.createElement("iframe");
-      // 	downDom.style.display = "none";
-      // 	downDom.id = "sheet-download";
-      // 	downDom.name = this.sheetDetailInfo.ExcelName;
-      // 	document.body.appendChild(downDom);
-      // }
-      // downDom.src = value;
+        const a = document.createElement("a");
+        a.href = value;
+        a.target = "_blank";
+        a.download = ExcelName;
+        a.style.display = "none";
+        document.body.append(a);
+        a.click();
+      }
     },
 
     downLoad(url, filename) {

src/views/predictEdb_manage/predictEdb.vue

@@ -1003,7 +1003,7 @@ export default {
 				this.public_page++;
 				this.getPublicList();
 			}
-		}),
+		},300),
 
 		/* 切换中英文 */
 		changeLangHandle: _.debounce(async function (lang){
@@ -1120,6 +1120,9 @@ export default {
     //只看我的
     onlyMeHandler(){
       this.getTreeData()
+
+			this.public_page = 1;
+			this.$refs.listRef.scrollTop = 0;
       this.getPublicList();
     },
 	},

src/views/system_manage/departManage.vue

@@ -51,7 +51,7 @@
 			<div class="right_cont_top">
 				<div>
 					<el-button type="primary" @click="addUser">添加用户</el-button>
-					<el-button type="primary" @click="synchronizationMEIKE" style="margin-left: 26px;">同步每刻</el-button>
+					<!-- <el-button type="primary" @click="synchronizationMEIKE" style="margin-left: 26px;">同步每刻</el-button> -->
 				</div>
 				<el-input
 					placeholder="姓名/账号/手机号搜索"