Commit 6475a1f2 authored by zhanglw's avatar zhanglw

修复后台页面bug

parent 9cdbf5c4
......@@ -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>
......
......@@ -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;
......@@ -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};
......
......@@ -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'
......
......@@ -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) {
......
......@@ -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;
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment