修复后台页面bug

src/views/MLargeScreen/index.vue

@@ -40,7 +40,7 @@
 		</div>
 		<!-- 嵌入三维地图页面 -->
 <!--		<iframe :src="url" frameborder="0" class="mapcontainer1"></iframe>-->
-<!--    <iframe src="http://192.168.3.38:3002/#/Index" frameborder="0" class="mapcontainer1"></iframe>-->
+    <iframe src="http://192.168.3.60:18041//#/Index" frameborder="0" class="mapcontainer1"></iframe>
 		<!-- 单个车辆视频监控 -->
 		<div class="monitorCover1" v-if="monitorCover1Show">
 			<div class="monitorCover1_closePic" @click="closeMonitorCoverFn"></div>

src/views/driverManagement/index.vue

@@ -21,7 +21,7 @@
 
     	<!-- 表格 -->
 		<div class="panel-bottom page-row">
-			<h3>司机人员管理</h3>
+			<h3>人员管理</h3>
 			<div class="ctin-box">
 				<div class="content-within">
 					<div class="content-fix">
@@ -54,7 +54,7 @@
 		</div>
 
 		<!-- 表单渲染 -->
-		<el-dialog append-to-body :close-on-click-modal="true" :before-close="cancelForm" :visible.sync="form.visible" :title="form.title" width="700px">
+		<el-dialog append-to-body :close-on-click-modal="false" :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="请输入名称"/>
@@ -137,7 +137,7 @@ export default {
 			//角色单独属性
 			rolesLonely:"",
 			form: {
-				title:'新增司机人员',
+				title:'新增人员',
 				visible:false,
 				reqType:'add',
 				status:{cu:0},
@@ -192,6 +192,15 @@ export default {
 		})
 	},
 	methods: {
+    normalizer(node) {
+      if(node){
+        node.id = node.name?node.name:null;
+        node.label = node.name?node.name:null;
+        if (node.children == null || node.children == 'null'|| node.children.length == 0) {
+          delete node.children
+        }
+      }
+    },
 		selectDepart(val){
 			console.log('selectDepart', val);
 			this.lastDeptData = val;
@@ -227,7 +236,7 @@ export default {
 			param.page = this.page - 1;
 			param.size = this.size;
 			param.sort = sort;
-			
+
 			this.$nextTick(()=>{
 				//获取司机人员信息
 				HttpReq.truckDispatching.driverManagementPCQuery(param).then((res) => {
@@ -296,7 +305,7 @@ export default {
 		toAdd() {
 			// 请除表单验证
 			this.$refs['form1'] && this.$refs['form1'].clearValidate();
-			this.form.title = '新增司机人员';
+			this.form.title = '新增人员';
 			this.form.status.cu = 0;
 			this.form.visible = true;
 			this.form.reqType = 'add';
@@ -305,7 +314,7 @@ export default {
 		toEdit(item) {
 			// 请除表单验证
 			this.$refs['form1'] && this.$refs['form1'].clearValidate();
-			this.form.title = '修改司机人员';
+			this.form.title = '修改人员';
 			this.form.status.cu = 0;
 			this.form.visible = true;
 			this.form.item = {...item};
@@ -499,7 +508,7 @@ export default {
 			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)   
+			var seconds = date.getSeconds();      //秒 ,返回 Date 对象的秒数 (0 ~ 59)
 			//修改月份格式
 			if (month >= 1 && month <= 9) {
 				month = "0" + month;
@@ -535,7 +544,7 @@ export default {
 	.el-table .success-row {
 		background: #f0f9eb;
 	}
-	
+
 	.device-manage{
 		.panel-bottom{
 			.el-button{margin:2px 0;padding:6px 15px;font-size:14px;}
@@ -550,7 +559,7 @@ export default {
 			}
 		}
 	}
-	
+
 	.ecahrt1-dialog{
 		display:flex;align-items:center;
 		.el-dialog{

src/views/safetyManagement/checkLog/index.vue

@@ -158,7 +158,7 @@ export default {
     },
     toDelete(item) {
       var id = item.id;
-      this.$confirm( item.carclass == '铲车' ? '该车为铲车，如要删除，请在删除以后为采点管理中对应的采点分配新的铲车！' : '确认删除该条数据吗?', '提示', {
+      this.$confirm( '确认删除该条数据吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: item.carclass == '铲车' ? 'error' : 'warning'

src/views/system/menu/index.vue

@@ -8,7 +8,7 @@
         <date-range-picker v-model="query.createTime" class="date-item" />
         <rrOperation />
       </div>
-      <crudOperation :permission="permission" />
+      <crudOperation :permission="permission"/>
     </div>
     <!--表单渲染-->
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="580px">
@@ -186,6 +186,9 @@ export default {
       }
     }
   },
+  created(){
+    this.crud.optShow.download = false
+  },
   methods: {
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {

src/views/system/shift/index.vue

@@ -109,7 +109,7 @@ export default {
 			param.page = this.page - 1;
 			param.size = this.size;
 			//param.sort = sort;
-			
+
 			this.$nextTick(()=>{
 				HttpReq.truckDispatching.shiftQuery(param).then((res) => {
           if(res.code == 200){
@@ -135,7 +135,7 @@ export default {
 			this.loadData()
 		},
     // 清除限制
-		clearLimit(){		
+		clearLimit(){
 			this.loadData()
 		},
 		cancelForm(a, b, c){
@@ -158,8 +158,6 @@ export default {
 			this.form.status.cu = 0;
 			this.form.visible = true;
 			this.form.item = {...item};
-      		this.form.item.startTime = '';
-      		this.form.item.endTime = '';
 			this.form.reqType = 'edit';
 			this.ShiftId = this.form.item.id;
 		},
@@ -277,7 +275,7 @@ export default {
 			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)   
+			var seconds = date.getSeconds();      //秒 ,返回 Date 对象的秒数 (0 ~ 59)
 			//修改月份格式
 			if (month >= 1 && month <= 9) {
 				month = "0" + month;
@@ -310,7 +308,7 @@ export default {
 			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)   
+			var seconds = date.getSeconds();      //秒 ,返回 Date 对象的秒数 (0 ~ 59)
 			//修改月份格式
 			if (month >= 1 && month <= 9) {
 				month = "0" + month;
@@ -347,7 +345,7 @@ export default {
 	.el-table .success-row {
 		background: #f0f9eb;
 	}
-	
+
 	.device-manage{
 		.panel-bottom{
 			.el-button{margin:2px 0;padding:6px 15px;font-size:14px;}
@@ -362,7 +360,7 @@ export default {
 			}
 		}
 	}
-	
+
 	.ecahrt1-dialog{
 		display:flex;align-items:center;
 		.el-dialog{