修改

src/assets/js/common.js

@@ -1768,6 +1768,37 @@ var HttpReq = function(){
 					params:param,
 				})
 			},
+			//大屏——智能调度——近期通知列表
+			recentNoticeQuery: function(param){
+				return request({
+					url: '/api/Notice',
+					method: 'get',
+					params:param,
+				})
+			},
+			recentNoticeAdd: function(data){
+				return request({
+					url: '/api/Notice',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			recentNoticeUpdate: function(data){
+				return request({
+					url: '/api/Notice',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			recentNoticeDel: function(data){
+				return request({
+					url: '/api/Notice',
+					method: 'Delete',
+					data:data,
+				})
+			},
 
 
 			

src/views/IntelligentDispatchManagement/IntelligentDispatch/index.vue

@@ -11,12 +11,6 @@
 				<label class="el-form-item-label" style="font-weight: 500;">派单名称</label>
 				<el-input v-model="query.names" clearable size="small" placeholder="请输入派单名称" style="width:180px;"/>
 
-				<!-- <label class="el-form-item-label" style="font-weight: 500;">开始时间</label>
-				<el-date-picker v-model="query.startTime" type="datetime" placeholder="请选择开始时间"></el-date-picker>
-
-				<label class="el-form-item-label" style="font-weight: 500;">结束时间</label>
-				<el-date-picker v-model="query.endTime" type="datetime" placeholder="请选择结束时间"></el-date-picker> -->
-
 				<el-button size="mini" type="success" icon="el-icon-search" @click="toSearch">搜索</el-button>
 				<el-button size="mini" icon="el-icon-refresh" @click="clearLimit">重置</el-button>
 			</div>
@@ -28,9 +22,7 @@
 			<div class="ctin-box">
 				<div class="content-within">
 					<div class="content-fix">
-						<div class="toolbar">
-							<!-- <el-button size="mini" type="primary" icon="el-icon-plus" @click="toAdd">新增</el-button> -->
-						</div>
+						<div class="toolbar"></div>
 						<div class="content">
 							<el-table :data="tableData" v-loading="loading" border style="width:auto" :row-class-name="tableRowClassName">
 								<el-table-column prop="id" label="单号" align="center"></el-table-column>
@@ -38,16 +30,10 @@
 								<el-table-column prop="names" label="派单名称" align="center"></el-table-column>
 								<el-table-column prop="zero" label="起点" align="center"></el-table-column>
 								<el-table-column prop="end" label="终点" align="center"></el-table-column>
-								<el-table-column prop="space" label="里程" align="center"></el-table-column>
+								<el-table-column prop="space" label="里程(Km)" align="center"></el-table-column>
 								<el-table-column prop="startTime" label="开始时间" align="center"></el-table-column>
 								<el-table-column prop="endTime" label="完成时间" align="center"></el-table-column>
-								<el-table-column prop="status" label="状态" align="center"></el-table-column>
-								<!-- <el-table-column label="操作" align="center" fixed="right">
-									<template slot-scope="scope">
-										<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
-										<el-button size="mini" type="danger" icon="el-icon-delete" @click="toDelete(scope.row)"></el-button>
-									</template>
-								</el-table-column> -->
+								<el-table-column prop="status" label="状态" align="center" :formatter="statusChange"></el-table-column>
 							</el-table>
 							<!--分页组件-->
 							<el-pagination :total="total" :current-page="page" style="margin-top: 8px;" layout="total, prev, pager, next, sizes" @size-change="sizeChange" @current-change="pageChange" />
@@ -57,42 +43,6 @@
 			</div>
 		</div>
 
-		<!-- 表单渲染 -->
-		<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
-			<el-form :model="form.item" :rules="rules" ref="form1" :inline="true" size="small" label-width="150px">
-				<el-form-item label="设备名称" prop="name">
-					<el-input v-model="form.item.name" style="width:280px;" placeholder="请输入设备名称"/>
-				</el-form-item>
-				<el-form-item label="设备编码" prop="code">
-					<el-input v-model="form.item.code" style="width:280px;" placeholder="请输入车牌号"/>
-				</el-form-item>
-				<el-form-item label="设备状态" prop="status">
-					<el-select v-model="form.item.status" placeholder="请选择设备状态" style="width:280px;">
-						<el-option label="正常" value="正常"></el-option>
-						<el-option label="故障" value="故障"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="终端车辆类型" prop="carclass">
-					<el-select v-model="form.item.carclass" placeholder="请选择终端车辆类型" style="width:280px;">
-						<el-option label="卡车" value="卡车"></el-option>
-						<el-option label="电铲" value="电铲"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="安装车辆" prop="carname">
-					<el-select v-model="form.item.carname" placeholder="请选择安装车辆" style="width:280px;">
-						<el-option :label="item.name + '/' + item.number" :value="item.name + '/' + item.number" v-for="(item,index) in selectList" :key="index"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item label="备注" prop="remarks">
-					<el-input type="textarea" v-model="form.item.remarks" style="width:280px;"></el-input>
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="text" @click="cancelForm">取消</el-button>
-				<el-button :loading="form.status.cu === 2" type="primary" @click="submitForm('form1', form.item)">确认</el-button>
-			</div>
-		</el-dialog>
-
 	</div>
 </template>
 
@@ -140,7 +90,7 @@ export default {
 			param.sort = sort;
 			
 			this.$nextTick(()=>{
-				//获取设备信息
+				
 				HttpReq.truckDispatching.IntelligentDispatchHistoryQuery(param).then((res) => {
 					if(res.code == 200){
 						this.loading = false;
@@ -168,37 +118,6 @@ export default {
 			this.query = {};
 			this.loadData()
 		},
-		cancelForm(a, b, c){
-			this.form.visible = false;
-		},
-		toAdd() {
-			// 请除表单验证
-			this.$refs['form1'] && this.$refs['form1'].clearValidate();
-			this.form.title = '新增设备';
-			this.form.status.cu = 0;
-			this.form.visible = true;
-			this.form.reqType = 'add';
-			this.form.item = {};
-		},
-		toEdit(item) {
-			// 请除表单验证
-			this.$refs['form1'] && this.$refs['form1'].clearValidate();
-			this.form.title = '修改设备';
-			this.form.status.cu = 0;
-			this.form.visible = true;
-			this.form.item = {...item};
-			this.form.reqType = 'edit';
-		},
-		toDelete(item) {
-			var id = item.id;
-			this.$confirm('确认删除该条数据吗?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then((e) => {
-				this.reqRemoveProject([id])
-			}).catch((e) => {})
-		},
 		pageChange(e) {
 			this.page = e
 			this.loadData()
@@ -208,118 +127,9 @@ export default {
 			this.size = e
 			this.loadData()
 		},
-		submitForm(validateName, item){
-			if(!this.form.status.cu){
-				this.form.status.cu = 2;
-				this.$refs[validateName].validate(valid => {
-					if(valid){
-						if(this.form.reqType === 'add'){
-							this.reqAddItem(this.form, item)
-						}else{
-							this.reqUpdateItem(this.form, item)
-						}
-					}else{
-						this.form.status.cu = 0
-					}
-				});
-			};
-		},
-		//新增设备
-		reqAddItem(form, item){
-			let lastData = {...item};
-			HttpReq.truckDispatching.deviceManagementAdd(lastData).then((res) => {
-				form.visible = false;
-				if(res.code == 200){
-					this.$notify({
-						title: '设备新增成功！',
-						type: 'success',
-						duration: 2500
-					});
-					this.loadData()
-				}else{
-					this.$notify({
-						title: res.msg,
-						type: 'error',
-						duration: 2500
-					})
-				}
-			}).catch(function(error) {
-				form.status.cu = 0
-			});
-		},
-		//修改设备
-		reqUpdateItem(form, item){
-			let lastData = {...item};
-			HttpReq.truckDispatching.deviceManagementUpdate(lastData).then((res) => {
-				form.visible = false;
-				if(res.code == 200){
-					this.$notify({
-						title: '设备修改成功！',
-						type: 'success',
-						duration: 2500
-					});
-					this.loadData()
-				}else{
-					this.$notify({
-						title: res.msg,
-						type: 'error',
-						duration: 2500
-					})
-				}
-			}).catch(function(error) {
-				form.status.cu = 0
-			});
-		},
-		//删除设备
-		reqRemoveProject(item){
-			HttpReq.truckDispatching.deviceManagementDel(item).then((res) => {
-				if(res.status == 400){
-					this.$notify({
-						title: res.msg,
-						type: 'error',
-						duration: 2500
-					})
-				}else{
-					this.$notify({
-						title: '删除成功！',
-						type: 'success',
-						duration: 2500
-					});
-				}
-				this.loadData();
-			})
-		},
-		//时间转换
-		currentTime(time){
-			var date = new Date(time);
-			var year = date.getFullYear();        //年 ,从 Date 对象以四位数字返回年份
-			var month = date.getMonth() + 1;      //月 ,从 Date 对象返回月份 (0 ~ 11) ,date.getMonth()比实际月份少 1 个月
-			var day = date.getDate();             //日 ,从 Date 对象返回一个月中的某一天 (1 ~ 31)
-			var hours = date.getHours();          //小时 ,返回 Date 对象的小时 (0 ~ 23)
-			var minutes = date.getMinutes();      //分钟 ,返回 Date 对象的分钟 (0 ~ 59)
-			var seconds = date.getSeconds();      //秒 ,返回 Date 对象的秒数 (0 ~ 59)   
-			//修改月份格式
-			if (month >= 1 && month <= 9) {
-				month = "0" + month;
-			}
-			//修改日期格式
-			if (day >= 0 && day <= 9) {
-				day = "0" + day;
-			}
-			//修改小时格式
-			if (hours >= 0 && hours <= 9) {
-				hours = "0" + hours;
-			}
-			//修改分钟格式
-			if (minutes >= 0 && minutes <= 9) {
-				minutes = "0" + minutes;
-			}
-			//修改秒格式
-			if (seconds >= 0 && seconds <= 9) {
-				seconds = "0" + seconds;
-			}
-			let currentFormatDate = year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds;
-			return currentFormatDate;
+		//状态转换
+		statusChange(row){
+			return row.status == 0 ? '完成' : '进行中';
 		}
 	}
 }