diff --git a/.env.development b/.env.development index 0a6098f..5aef017 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ 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_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview \ No newline at end of file diff --git a/src/views/data/dataIndexing.vue b/src/views/data/dataIndexing.vue index 7310494..85a651b 100644 --- a/src/views/data/dataIndexing.vue +++ b/src/views/data/dataIndexing.vue @@ -35,7 +35,7 @@
-
+
@@ -123,7 +123,7 @@ export default { scopedSlots: { customRender: 'action' }, } ], - dataTypedataSources:[] + dataTypedataSources:[], } }, watch: { @@ -133,7 +133,6 @@ export default { } }, mounted() { - }, computed: { diff --git a/src/views/data/dataSearch.vue b/src/views/data/dataSearch.vue index 98ab894..4f7e977 100644 --- a/src/views/data/dataSearch.vue +++ b/src/views/data/dataSearch.vue @@ -41,7 +41,7 @@
-
+
@@ -99,7 +99,8 @@ export default { treeDate: [], dataSource: [], columns: [], - dataTypedataSources:[] + dataTypedataSources:[], + treeHeight:0 } }, watch: { @@ -109,7 +110,7 @@ export default { } }, mounted() { - + this.calculateScrollY(); }, computed: { @@ -118,6 +119,11 @@ export default { this.getselect() }, methods: { + calculateScrollY() { + // 获取父容器高度(需减去表格内其他元素的高度,如分页栏) + const container = this.$refs.treeContainer; + this.treeHeight = container.clientHeight; + }, getselect(){ getAction("/dataType/getExistingDataTypes", {}).then((res) => { if (res.success) { diff --git a/src/views/data/metadata.vue b/src/views/data/metadata.vue index 9a8be9f..a6bbce4 100644 --- a/src/views/data/metadata.vue +++ b/src/views/data/metadata.vue @@ -32,7 +32,7 @@
-
+
@@ -113,7 +113,7 @@ export default { dataIndex: 'dataDefault', } ], - dataTypedataSources:[] + dataTypedataSources:[], } }, watch: { @@ -123,7 +123,6 @@ export default { } }, mounted() { - }, computed: { diff --git a/src/views/task/index.vue b/src/views/task/index.vue index 8fe36e6..ab77dec 100644 --- a/src/views/task/index.vue +++ b/src/views/task/index.vue @@ -50,7 +50,7 @@
-
+
{ 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) { this.model.startTime = dateString[0];