Albania_Mes.git

			@@ -397,7 +397,7 @@
			<div id="fileinput" class="container">
			<div class="header">
			<div class="btn">
			<button @click="AllAdd">保存</button>
			<el-button type="primary" @click="importData()">保存</el-button>
			</div>
			<div class="inp">
			<input type="file" id="uploadExcel" multiple @change="Change" />
			@@ -457,7 +457,9 @@
			<el-button type="primary" @click="ManualMatching()" :disabled="SoftEmergencyStopState"
			style="z-index: 999;">人工匹配</el-button>
			<el-button type="primary" @click="ManualTake()" :disabled="SoftEmergencyStopState"
			style="z-index: 999;">人工匹配</el-button>
			style="z-index: 999;">人工拿走</el-button>
			<el-button type="primary" @click="AnewMeasure()" :disabled="SoftEmergencyStopState"
			style="z-index: 999;">重新测量</el-button>
			</div>
			<!--显示-->
			<div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;margin: auto auto;">
			@@ -601,7 +603,7 @@
			Disabled, SelectPermissionByUserName, currentUsername, CompleteQueue,
			isAllowReorderings,

			UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue
			UpdateStroageCageByCell, FinishTask, SelectGlassInfo, StorageCageAddGlass, ClaimTasks, ModeChange, UpdateQueue,importData,ManualTake,AnewMeasure
			} from "../../api/home";


			@@ -991,7 +993,21 @@
			},
			//人工拿走
			ManualTake() {

			let s="123";
			ManualTake(s).then(res => {
			if (res.data.message == 200) {
			console.log(res.data.message);
			}
			})
			},
			//重新测量
			AnewMeasure() {
			let s="123";
			AnewMeasure(s).then(res => {
			if (res.data.message == 200) {
			console.log(res.data.message);
			}
			})
			},
			Change(event) {
			// 获取到文件夹
			@@ -1022,12 +1038,16 @@
			Add() {

			},
			Hide() {
			importData() {

			},
			AllAdd() {
			//添加数据进后台
			console.log(this.dataList);
			//let tbdata=JSON.stringify(this.dataList);
			let tbdata=this.dataList;
			console.log(tbdata);
			importData(tbdata).then(res => {
			if (res.data.message == 200) {
			//this.$message.success(this.$t('Operation successful'));
			}
			});
			},
			del() {