修改左侧树添加滚动条,修改任务列表样式,修改添加任务时时间有默认值
This commit is contained in:
parent
5a2b48346d
commit
61cbc7da8e
|
@ -1,4 +1,4 @@
|
||||||
NODE_ENV=development
|
NODE_ENV=development
|
||||||
VUE_APP_API_BASE_URL=http://rcproject.natapp1.cc/jeecg-boot
|
VUE_APP_API_BASE_URL=http://pbl.natapp1.cc/jeecg-boot
|
||||||
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
|
VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
|
||||||
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
|
VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
|
|
@ -35,7 +35,7 @@
|
||||||
<a-col :md="6">
|
<a-col :md="6">
|
||||||
<div class="linese"></div>
|
<div class="linese"></div>
|
||||||
<!-- 分类区域 -->
|
<!-- 分类区域 -->
|
||||||
<div style="height:calc(100vh - 316px);background: #e6e9f1;padding:10px;">
|
<div style="height:calc(100vh - 316px);overflow: auto;background: #e6e9f1;padding:10px;">
|
||||||
<a-tree :tree-data="treeDate" @select="onSelect" />
|
<a-tree :tree-data="treeDate" @select="onSelect" />
|
||||||
</div>
|
</div>
|
||||||
<div class="linese"></div>
|
<div class="linese"></div>
|
||||||
|
@ -123,7 +123,7 @@ export default {
|
||||||
scopedSlots: { customRender: 'action' },
|
scopedSlots: { customRender: 'action' },
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
dataTypedataSources:[]
|
dataTypedataSources:[],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -133,7 +133,6 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
<a-col :md="6">
|
<a-col :md="6">
|
||||||
<div class="linese"></div>
|
<div class="linese"></div>
|
||||||
<!-- 分类区域 -->
|
<!-- 分类区域 -->
|
||||||
<div style="height:calc(100vh - 316px);background: #e6e9f1;padding:10px;">
|
<div style="height:calc(100vh - 316px);overflow: auto;background: #e6e9f1;padding:10px;">
|
||||||
<a-tree :tree-data="treeDate" @select="onSelect" />
|
<a-tree :tree-data="treeDate" @select="onSelect" />
|
||||||
</div>
|
</div>
|
||||||
<div class="linese"></div>
|
<div class="linese"></div>
|
||||||
|
@ -99,7 +99,8 @@ export default {
|
||||||
treeDate: [],
|
treeDate: [],
|
||||||
dataSource: [],
|
dataSource: [],
|
||||||
columns: [],
|
columns: [],
|
||||||
dataTypedataSources:[]
|
dataTypedataSources:[],
|
||||||
|
treeHeight:0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -109,7 +110,7 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
this.calculateScrollY();
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|
||||||
|
@ -118,6 +119,11 @@ export default {
|
||||||
this.getselect()
|
this.getselect()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
calculateScrollY() {
|
||||||
|
// 获取父容器高度(需减去表格内其他元素的高度,如分页栏)
|
||||||
|
const container = this.$refs.treeContainer;
|
||||||
|
this.treeHeight = container.clientHeight;
|
||||||
|
},
|
||||||
getselect(){
|
getselect(){
|
||||||
getAction("/dataType/getExistingDataTypes", {}).then((res) => {
|
getAction("/dataType/getExistingDataTypes", {}).then((res) => {
|
||||||
if (res.success) {
|
if (res.success) {
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
<a-col :md="6">
|
<a-col :md="6">
|
||||||
<div class="linese"></div>
|
<div class="linese"></div>
|
||||||
<!-- 分类区域 -->
|
<!-- 分类区域 -->
|
||||||
<div style="height:calc(100vh - 316px);background: #e6e9f1;padding:10px;">
|
<div style="height:calc(100vh - 316px);overflow: auto;background: #e6e9f1;padding:10px;">
|
||||||
<a-tree :tree-data="treeDate" @select="onSelect" />
|
<a-tree :tree-data="treeDate" @select="onSelect" />
|
||||||
</div>
|
</div>
|
||||||
<div class="linese"></div>
|
<div class="linese"></div>
|
||||||
|
@ -113,7 +113,7 @@ export default {
|
||||||
dataIndex: 'dataDefault',
|
dataIndex: 'dataDefault',
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
dataTypedataSources:[]
|
dataTypedataSources:[],
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
|
@ -123,7 +123,6 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- table区域-begin -->
|
<!-- table区域-begin -->
|
||||||
<div style="height:calc(100vh - 300px);overflow:hidden;">
|
<div style="height:calc(100vh - 300px);overflow:hidden; background: #e6e9f1 !important;">
|
||||||
<div class="linese"></div>
|
<div class="linese"></div>
|
||||||
<a-table
|
<a-table
|
||||||
ref="table"
|
ref="table"
|
||||||
|
|
|
@ -170,7 +170,9 @@ import { taskCreate,
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.form.setFieldsValue(pick(this.model,'name','describe','shipModelId','shipNumId'));
|
this.form.setFieldsValue(pick(this.model,'name','describe','shipModelId','shipNumId'));
|
||||||
});
|
});
|
||||||
this.rangeTime.push(moment(this.model.startTime),moment(this.model.endTime))
|
if(this.model.id){
|
||||||
|
this.rangeTime.push(moment(this.model.startTime),moment(this.model.endTime))
|
||||||
|
}
|
||||||
},
|
},
|
||||||
onChange(value, dateString) {
|
onChange(value, dateString) {
|
||||||
this.model.startTime = dateString[0];
|
this.model.startTime = dateString[0];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user