完善前端文件

vue-admin-master/src/views/nav1/Table.vue

@@ -130,6 +130,8 @@
     <!--底部工具条-->
     <el-col :span="24" class="toolbar" v-if="display_table">
       <el-button type="danger" @click="Insert" :disabled="this.sels.length===0" :loading="loading_insert">Insert</el-button>
+	  <el-button type="warning" @click="Preview" >刷新</el-button>
+	  <el-button type="primary" @click="Insert_all" :loading="loading_insert">执行全部</el-button>
       <el-pagination layout="total,sizes,prev, pager, next,jumper"   @size-change="handleSizeChange"  @current-change="handleCurrentChange" :page-sizes="[100, 200, 300, 500,1000,2000,total]"  :page-size="page_size" :total="total"  style="float:right;"></el-pagination>
     </el-col>
 
@@ -160,7 +162,8 @@
 		<!--底部工具条-->
 		<el-col  class="toolbar" v-if="lock_order" style="width:99%;" >
 			<el-button type="danger" @click="Rollback" :disabled="this.rollback_sels.length===0"  :loading="loading_rollback">Rollback</el-button>
-			 <el-button type="info"  @click="roolback_query">刷新</el-button>
+			 <el-button type="warning"  @click="roolback_query">刷新</el-button>
+			 <el-button type="primary" @click="Rollback_all" :loading="loading_rollback">执行全部</el-button>
 			<el-pagination layout="total,sizes,prev, pager, next,jumper" @current-change="rollbackCurrentChange"  @size-change="rollbackSizeChange"  :page-sizes="[100, 200, 300, 500,1000,2000,rollback_total]"     :page-size="rollback_page_size" :total="rollback_total" style="float:right;"></el-pagination>
 		</el-col>
     </div>
@@ -203,7 +206,9 @@
     <el-dialog  title="进度提示"   width="30%" :visible.sync="dialogVisible"  :before-close="handleClose" :show-close='false' >
 		 <el-progress type="circle" :percentage="child_num" ></el-progress>
     </el-dialog>
-	
+<!-- 遮罩框的显示 -->	
+
+
   </section>
    
 </template>
@@ -526,87 +531,139 @@
 
             //插入函数
 			Insert:function() {
-				console.log('插入函数');
-				for (let index = 0; index < this.sels.length; index++) {
-					const element = this.sels[index];
-					if(element.state !=0){
-						this.$message.error("含有做过的单");
+				var _this = this;
+				this.$confirm('确认操作吗?', '提示', {
+					//type: 'warning'
+				}).then(() => {
+					console.log('插入函数');
+					if(_this.sels.length==0){
+						_this.$message.error("没有任何选择");
 						return false;
-					}else{
-					   element.step = this.filters.step;  //加入步长的计算	
 					}
-                }
-                this.insert_index = 0;
-                this.loading_insert = true;
-                this.dialogVisible = true;
-				let data_insert={};
-				data_insert.type = 'vue_insert';
-				data_insert.orderid = this.filters.orderid;
-                data_insert.data = this.sels;      //数组的格式(多个数据发送过去)
-				// 发送socket
-				this.socket.send(JSON.stringify(data_insert));
+					for (let index = 0; index < _this.sels.length; index++) {
+						const element = _this.sels[index];
+						if(element.state !=0){
+							_this.$message.error("含有做过的单");
+							return false;
+						}else{
+						   element.step = _this.filters.step;  //加入步长的计算	
+						}
+					}
+					_this.insert_index = 0;
+					_this.loading_insert = true;
+					_this.dialogVisible = true;
+					let data_insert={};
+					data_insert.type = 'vue_insert';
+					data_insert.orderid = _this.filters.orderid;
+					data_insert.data = _this.sels;      //数组的格式(多个数据发送过去)
+					// 发送socket
+					_this.socket.send(JSON.stringify(data_insert));
+				}).catch(() => {
+                   console.log('取消了');
+				});
+				
+			},
+			//插入全部函数
+			Insert_all(){
+               //将所有的数据传递给sels    
+			   this.sels = this.users;
+			   this.Insert();             //发送数据
+
 			},
 
             // rollback函数
 			Rollback:function() {
-				console.log('rollback函数');
-				for (let index = 0; index < this.rollback_sels.length; index++) {
-					const element = this.rollback_sels[index];
-					if(element.state !=0){
-						this.$message.error("含有做过的订单");
+				var _this = this;
+				this.$confirm('确认操作吗?', '提示', {
+					//type: 'warning'
+				}).then(() => {
+					console.log('rollback函数');
+					if(_this.rollback_sels.length==0){
+						_this.$message.error("没有任何选择");
 						return false;
 					}
-                }
-                this.rollback_index =0;
-                this.loading_rollback = true;
-                this.dialogVisible = true;
-				let data_insert={};
-                data_insert.type = 'vue_rollback'; 
-				data_insert.data = this.rollback_sels;
-				// 发送socket
-				this.socket.send(JSON.stringify(data_insert));
-			},
+					for (let index = 0; index < _this.rollback_sels.length; index++) {
+						const element = _this.rollback_sels[index];
+						if(element.state !=0){
+							_this.$message.error("含有做过的订单");
+							return false;
+						}
+					}
+					_this.rollback_index =0;
+					_this.loading_rollback = true;
+					_this.dialogVisible = true;
+					let data_insert={};
+					data_insert.type = 'vue_rollback'; 
+					data_insert.data = _this.rollback_sels;
+					// 发送socket
+					_this.socket.send(JSON.stringify(data_insert));
+				}).catch(() => {
 
+                    console.log("取消了");
+				});
+				
+			},
+			Rollback_all(){
+				//将所有的数据传递给rollback_sels
+				this.rollback_sels = this.rollbackdata;
+				this.Rollback();            //发送数据
+			},
+            
 			// retry表中的数据进行rollback
 			Rollback_retry(){
-			   console.log('retry表中rollback');
-				for (let index = 0; index < this.retry_sels.length; index++) {
-					const element = this.retry_sels[index];
-					if(element.state !=0){
-						this.$message.error("含有做过的订单");
-						return false;
+				var _this = this;
+				this.$confirm('确认rollback吗?', '提示', {
+					//type: 'warning'
+				}).then(() => {
+					console.log('retry表中rollback');
+					for (let index = 0; index < _this.retry_sels.length; index++) {
+						const element = _this.retry_sels[index];
+						if(element.state !=0){
+							_this.$message.error("含有做过的订单");
+							return false;
+						}
 					}
-                }
-                this.retry_index =0;
-                this.loading_retry = true;
-                this.dialogVisible = true;
-				let data_insert={};
-				data_insert.type = 'vue_except_rollback';
-				data_insert.data = this.retry_sels;
-				// 发送socket
-				this.socket.send(JSON.stringify(data_insert));
+					_this.retry_index =0;
+					_this.loading_retry = true;
+					_this.dialogVisible = true;
+					let data_insert={};
+					data_insert.type = 'vue_except_rollback';
+					data_insert.data = _this.retry_sels;
+					// 发送socket
+					_this.socket.send(JSON.stringify(data_insert));
+				}).catch(() => {
+                   console.log("取消了");
+				});
+			   
 			},
 
 
 			//retry 函数
 			Retry:function(params) {
-
-				console.log('retry函数');
-				for (let index = 0; index < this.retry_sels.length; index++) {
-					const element = this.retry_sels[index];
-					if(element.state !=0){
-						this.$message.error("含有做过的订单");
-						return false;
+                var _this = this;
+				this.$confirm('确认Retry操作吗?', '提示', {
+					//type: 'warning'
+				}).then(() => {
+					console.log('retry函数');
+					for (let index = 0; index < _this.retry_sels.length; index++) {
+						const element = _this.retry_sels[index];
+						if(element.state !=0){
+							_this.$message.error("含有做过的订单");
+							return false;
+						}
 					}
-                }
-                this.retry_index =0;
-                this.loading_retry = true;
-                this.dialogVisible = true;
-				let data_insert={};
-				data_insert.type = 'vue_retry';
-				data_insert.data = this.retry_sels;
-				// 发送socket
-				this.socket.send(JSON.stringify(data_insert));
+					_this.retry_index =0;
+					_this.loading_retry = true;
+					_this.dialogVisible = true;
+					let data_insert={};
+					data_insert.type = 'vue_retry';
+					data_insert.data = _this.retry_sels;
+					// 发送socket
+					_this.socket.send(JSON.stringify(data_insert));
+				}).catch(() => {
+                    console.log("取消了");
+				});
+				
 			},
 		
             // socket连接函数