修改

src/assets/js/common.js

@@ -7,10 +7,11 @@ var HttpReq = function(){
 		//卡车调度系统
 		truckDispatching:{
 			//系统管理——班次设置
-			shiftQuery: function(){
+			shiftQuery: function(param){
 				return request({
 					url: '/api/Class',
 					method: 'get',
+					params:param,
 				})
 			},
 			shiftAdd: function(data){
@@ -37,10 +38,11 @@ var HttpReq = function(){
 				})
 			},
 			//系统管理——数据字典——报警时长
-			alarmTimeQuery: function(){
+			alarmTimeQuery: function(param){
 				return request({
 					url: '/api/AlarmTime',
 					method: 'get',
+					params:param,
 				})
 			},
 			alarmTimeAdd: function(data){
@@ -67,10 +69,11 @@ var HttpReq = function(){
 				})
 			},
 			//系统管理——数据字典——疲劳驾驶
-			fdriTimeQuery: function(){
+			fdriTimeQuery: function(param){
 				return request({
 					url: '/api/FdriTime',
 					method: 'get',
+					params:param,
 				})
 			},
 			fdriTimeAdd: function(data){
@@ -97,10 +100,11 @@ var HttpReq = function(){
 				})
 			},
 			//系统管理——数据字典——优先级设置
-			getPriorityQuery: function(){
+			getPriorityQuery: function(param){
 				return request({
 					url: '/api/Pri',
 					method: 'get',
+					params:param,
 				})
 			},
 			getPriorityTimeAdd: function(data){
@@ -126,6 +130,221 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
+			//车辆管理——车辆类型
+			carTypeQuery: function(param){
+				return request({
+					url: '/api/CarClass',
+					method: 'get',
+					params:param,
+				})
+			},
+			carTypeAdd: function(data){
+				return request({
+					url: '/api/CarClass',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carTypeUpdate: function(data){
+				return request({
+					url: '/api/CarClass',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			carTypeDel: function(data){
+				return request({
+					url: '/api/CarClass',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//车辆管理——车辆型号
+			carModelQuery: function(param){
+				return request({
+					url: '/api/CarModel',
+					method: 'get',
+					params:param,
+				})
+			},
+			carModelAdd: function(data){
+				return request({
+					url: '/api/CarModel',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carModelUpdate: function(data){
+				return request({
+					url: '/api/CarModel',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			carModelDel: function(data){
+				return request({
+					url: '/api/CarModel',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//车辆管理——车队管理
+			carFleetQuery: function(param){
+				return request({
+					url: '/api/CarRoad',
+					method: 'get',
+					params:param,
+				})
+			},
+			carFleetAdd: function(data){
+				return request({
+					url: '/api/CarRoad',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carFleetUpdate: function(data){
+				return request({
+					url: '/api/CarRoad',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			carFleetDel: function(data){
+				return request({
+					url: '/api/CarRoad',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//车辆管理——车辆信息
+			carInformationQuery: function(param){
+				return request({
+					url: '/api/Car',
+					method: 'get',
+					params:param,
+				})
+			},
+			carInformationAdd: function(data){
+				return request({
+					url: '/api/Car',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carInformationUpdate: function(data){
+				return request({
+					url: '/api/Car',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			carInformationDel: function(data){
+				return request({
+					url: '/api/Car',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//车辆管理——车辆故障管理
+			carFaultQuery: function(param){
+				return request({
+					url: '/api/CarBreak',
+					method: 'get',
+					params:param,
+				})
+			},
+			carFaultAdd: function(data){
+				return request({
+					url: '/api/CarBreak',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carFaultUpdate: function(data){
+				return request({
+					url: '/api/CarBreak',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			carFaultDel: function(data){
+				return request({
+					url: '/api/CarBreak',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//车辆管理——车辆维修管理
+			carRepairQuery: function(param){
+				return request({
+					url: '/api/CarRepair',
+					method: 'get',
+					params:param,
+				})
+			},
+			carRepairAdd: function(data){
+				return request({
+					url: '/api/CarRepair',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carRepairUpdate: function(data){
+				return request({
+					url: '/api/CarRepair',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			carRepairDel: function(data){
+				return request({
+					url: '/api/CarRepair',
+					method: 'Delete',
+					data:data,
+				})
+			},
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

src/views/carManagement/carType/index.vue

@@ -13,10 +13,14 @@
 						<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>
-								<el-table-column prop="id" label="编码" align="center"></el-table-column>
-								<el-table-column prop="id" label="车辆类型名称" align="center"></el-table-column>
-								<el-table-column prop="id" label="车辆标识图" align="center"></el-table-column>
-								<el-table-column prop="time" label="日期" align="center"></el-table-column>
+								<el-table-column prop="code" label="编码" align="center"></el-table-column>
+								<el-table-column prop="name" label="车辆类型名称" align="center"></el-table-column>
+								<el-table-column prop="card" label="车辆标识图" align="center">
+									<template slot-scope="scope">
+										<img :src="imgSrcStart + '/avatar/' + scope.row.card" width="40" height="40"/>
+									</template>
+								</el-table-column>
+								<el-table-column prop="createTime" 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>
@@ -36,15 +40,20 @@
 		<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="编码">
-					<el-input v-model="form.item.time" style="width:280px;" placeholder="请输入编码"/>
+					<el-input v-model="form.item.code" style="width:280px;" placeholder="请输入编码"/>
 				</el-form-item>
 				<el-form-item label="车辆类型名称">
-					<el-input v-model="form.item.time" style="width:280px;" placeholder="请输入车辆类型名称"/>
+					<el-select v-model="form.item.name" placeholder="请选择车辆类型" style="width:280px;">
+						<el-option label="挖机" value="挖机"></el-option>
+						<el-option label="铲车" value="铲车"></el-option>
+						<el-option label="卡车" value="卡车"></el-option>
+						<el-option label="清扫车" value="清扫车"></el-option>
+					</el-select>
 				</el-form-item>
-				<!-- <el-form-item label="车辆标识图" prop="position">
+				<el-form-item label="车辆标识图" prop="position">
 					<el-input v-model="picFileName" style="width:160px;" placeholder="请上传设备位置" disabled />
 					<input type="file" name="image" @change="excelImport($event)" />
-				</el-form-item> -->
+				</el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="text" @click="cancelForm">取消</el-button>
@@ -64,20 +73,20 @@ export default {
 	components: {},
 	data() {
 		return {
+			imgSrcStart:process.env.VUE_APP_LOCAL_API2,
 			loading: false,
 			page: 1,
 			size: 10,
 			total: 0,
 			query:{},
-			alarmTimeId:'',
 			picFileName:'',
 			tableData: [],
 			form: {
-			title:'新增车辆类型',
-        	visible:false,
-        	reqType:'add',
-			status:{cu:0},
-			item:{},
+				title:'新增车辆类型',
+				visible:false,
+				reqType:'add',
+				status:{cu:0},
+				item:{},
 			},
 			rules: {
 				time: [
@@ -101,7 +110,7 @@ export default {
 			param.sort = sort;
 			
 			this.$nextTick(()=>{
-				HttpReq.truckDispatching.alarmTimeQuery(param).then((res) => {
+				HttpReq.truckDispatching.carTypeQuery(param).then((res) => {
 					if(res.code == 200){
 						this.loading = false;
 						this.tableData = res.data.content;
@@ -140,8 +149,7 @@ export default {
 			this.form.visible = true;
 			this.form.item = {...item};
 			this.form.reqType = 'edit';
-			this.alarmTimeId = this.form.item.id;
-			//this.picFileName = this.form.item.position;
+			this.picFileName = this.form.item.card;
 		},
 		toDelete(item) {
 			var id = item.id;
@@ -181,8 +189,8 @@ export default {
 		//新增车辆类型
 		reqAddItem(form, item){
 			let lastData = {...item};
-			//lastData.position = this.picFileName;
-			HttpReq.truckDispatching.alarmTimeAdd(lastData).then((res) => {
+			lastData.card = this.picFileName;
+			HttpReq.truckDispatching.carTypeAdd(lastData).then((res) => {
 				form.visible = false;
 				if(res.code == 200){
 					this.$notify({
@@ -205,9 +213,8 @@ export default {
 		//修改车辆类型
 		reqUpdateItem(form, item){
 			let lastData = {...item};
-			lastData.id = this.alarmTimeId;
-			//lastData.position = this.picFileName;
-			HttpReq.truckDispatching.alarmTimeUpdate(lastData).then((res) => {
+			lastData.card = this.picFileName;
+			HttpReq.truckDispatching.carTypeUpdate(lastData).then((res) => {
 				form.visible = false;
 				if(res.code == 200){
 					this.$notify({
@@ -222,6 +229,7 @@ export default {
 						type: 'error',
 						duration: 2500
 					})
+					this.loadData()
 				}
 			}).catch(function(error) {
 				form.status.cu = 0
@@ -229,7 +237,7 @@ export default {
 		},
 		//删除车辆类型
 		reqRemoveProject(item){
-			HttpReq.truckDispatching.alarmTimetDel(item).then((res) => {
+			HttpReq.truckDispatching.carTypeDel(item).then((res) => {
 				if(res.status == 400){
 					this.$notify({
 						title: res.msg,