diff --git a/src/components/TreeWithLine/index.vue b/src/components/TreeWithLine/index.vue
index 4c1b525..f79f0ae 100644
--- a/src/components/TreeWithLine/index.vue
+++ b/src/components/TreeWithLine/index.vue
@@ -1,6 +1,6 @@
-
+
@@ -12,6 +12,9 @@ export default {
props: {
selectedKeys: {
type: Array
+ },
+ defaultExpandedKeys: {
+ type: Array
}
},
methods: {
diff --git a/src/style.less b/src/style.less
index 8dfd21f..9af4f59 100644
--- a/src/style.less
+++ b/src/style.less
@@ -127,8 +127,9 @@ body {
}
&-clear,
&-icon {
- color: #01b6e3 !important;
- background-color: #03353f !important;
+ >svg {
+ display: none;
+ }
}
}
@@ -287,6 +288,9 @@ body {
background-color: transparent;
}
}
+ &-clear-icon {
+ color: #00e9fe !important;
+ }
}
// 单选样式
@@ -420,6 +424,16 @@ body {
}
}
}
+
+ &-clear-icon {
+ color: #00e9fe !important;
+ background-color: #03353f !important;
+ }
+ &-open {
+ .ant-select-clear-icon {
+ background-color: #055565 !important;
+ }
+ }
}
// 下拉菜单
diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue
index f199545..706000d 100644
--- a/src/views/logManage/index.vue
+++ b/src/views/logManage/index.vue
@@ -17,7 +17,7 @@
-
+
@@ -47,7 +47,7 @@
- 这里是Log内容
+ 这里是Log内容
Add
@@ -84,47 +84,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import FormMixin from '@/mixins/FormMixin'
import { cloneDeep } from 'lodash'
-
-const formItems = [
- {
- label: 'Name',
- type: 'a-input',
- name: 'facilityName',
- style: {
- width: '300px'
- }
- },
- {
- label: 'Type',
- type: 'a-input',
- name: 'type',
- style: {
- width: '300px'
- }
- },
- {
- label: 'Location',
- type: 'a-input',
- name: 'location',
- style: {
- width: '300px'
- }
- },
- {
- label: 'Status',
- type: 'j-dict-select-tag',
- name: 'status',
- props: {
- getPopupContainer: () => {
- return document.body
- },
- dictCode: 'NUCLEARFACILITY_STATUS'
- },
- style: {
- width: '300px'
- }
- }
-]
+import { getAction } from '../../api/manage'
const columns = [
{
@@ -182,7 +142,6 @@ const columns = [
export default {
mixins: [JeecgListMixin, FormMixin],
data() {
- this.formItems = formItems
this.columns = columns
return {
queryParam: {},
@@ -195,10 +154,38 @@ export default {
delete: '/gardsNuclearfacility/deleteById',
add: '/gardsNuclearfacility/create',
edit: '/gardsNuclearfacility/update'
- }
+ },
+ typeList: [],
+ locationList: []
}
},
+ created() {
+ this.getTypeList()
+ this.getLocationList()
+ },
methods: {
+ async getTypeList() {
+ try {
+ const res = await getAction('/gardsNuclearfacility/findType')
+ this.typeList = res.filter(item => item).map(item => ({ label: item, value: item }))
+ } catch (error) {
+ console.error(error)
+ }
+ },
+
+ async getLocationList() {
+ try {
+ const res = await getAction('/gardsNuclearfacility/findLocation')
+ this.locationList = res.filter(item => item).map(item => ({ label: item, value: item }))
+ } catch (error) {
+ console.error(error)
+ }
+ },
+
+ filterOption(input, option) {
+ return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+
onAdd() {
this.isAdd = true
this.model = {}
@@ -228,6 +215,65 @@ export default {
this.$message.warn('Please Select An Item To Delete')
}
}
+ },
+ computed: {
+ formItems() {
+ return [
+ {
+ label: 'Name',
+ type: 'a-input',
+ name: 'facilityName',
+ props: {
+ allowClear: true
+ },
+ style: {
+ width: '300px'
+ }
+ },
+ {
+ label: 'Type',
+ type: 'custom-select',
+ name: 'type',
+ props: {
+ options: this.typeList,
+ allowClear: true,
+ showSearch: true,
+ filterOption: this.filterOption
+ },
+ style: {
+ width: '300px'
+ }
+ },
+ {
+ label: 'Location',
+ type: 'custom-select',
+ name: 'location',
+ props: {
+ options: this.locationList,
+ allowClear: true,
+ showSearch: true,
+ filterOption: this.filterOption
+ },
+ style: {
+ width: '300px'
+ }
+ },
+ {
+ label: 'Status',
+ type: 'j-dict-select-tag',
+ name: 'status',
+ props: {
+ getPopupContainer: () => {
+ return document.body
+ },
+ dictCode: 'NUCLEARFACILITY_STATUS'
+ },
+ style: {
+ width: '300px'
+ }
+ }
+ ]
+ }
}
}
diff --git a/src/views/system/stationList.vue b/src/views/system/stationList.vue
index b292986..dfc4823 100644
--- a/src/views/system/stationList.vue
+++ b/src/views/system/stationList.vue
@@ -91,39 +91,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import FormMixin from '@/mixins/FormMixin'
import { cloneDeep } from 'lodash'
-
-const formItems = [
- {
- label: 'Country Code',
- type: 'a-input',
- name: 'countryCode',
- style: {
- width: '310px'
- }
- },
- {
- label: 'Type',
- type: 'a-input',
- name: 'type',
- style: {
- width: '310px'
- }
- },
- {
- label: 'Status',
- type: 'j-dict-select-tag',
- name: 'status',
- props: {
- dictCode: 'STATION_STATUS',
- getPopupContainer: () => {
- return document.body
- }
- },
- style: {
- width: '310px'
- }
- }
-]
+import { getAction } from '../../api/manage'
const columns = [
{
@@ -191,7 +159,6 @@ const columns = [
export default {
mixins: [JeecgListMixin, FormMixin],
data() {
- this.formItems = formItems
this.columns = columns
const validateStationCode = (_, value, callback) => {
if (!value) {
@@ -224,10 +191,38 @@ export default {
delete: '/gardsStations/deleteById',
add: '/gardsStations/create',
edit: '/gardsStations/update'
- }
+ },
+ countryCodeList: [],
+ typeList: []
}
},
+ created() {
+ this.getTypeList()
+ this.getCountryCodeList()
+ },
methods: {
+ async getTypeList() {
+ try {
+ const res = await getAction('/gardsStations/findType')
+ this.typeList = res.filter(item => item).map(item => ({ label: item, value: item }))
+ } catch (error) {
+ console.error(error)
+ }
+ },
+
+ async getCountryCodeList() {
+ try {
+ const res = await getAction('/gardsStations/findCountryCode')
+ this.countryCodeList = res.filter(item => item).map(item => ({ label: item, value: item }))
+ } catch (error) {
+ console.error(error)
+ }
+ },
+
+ filterOption(input, option) {
+ return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ },
+
onAdd() {
this.isAdd = true
this.model = {}
@@ -257,6 +252,54 @@ export default {
this.$message.warn('Please Select An Item To Delete')
}
}
+ },
+ computed: {
+ formItems() {
+ return [
+ {
+ label: 'Country Code',
+ type: 'custom-select',
+ name: 'countryCode',
+ props: {
+ options: this.countryCodeList,
+ allowClear: true,
+ showSearch: true,
+ filterOption: this.filterOption
+ },
+ style: {
+ width: '310px'
+ }
+ },
+ {
+ label: 'Type',
+ type: 'custom-select',
+ name: 'type',
+ props: {
+ options: this.typeList,
+ allowClear: true,
+ showSearch: true,
+ filterOption: this.filterOption
+ },
+ style: {
+ width: '310px'
+ }
+ },
+ {
+ label: 'Status',
+ type: 'j-dict-select-tag',
+ name: 'status',
+ props: {
+ dictCode: 'STATION_STATUS',
+ getPopupContainer: () => {
+ return document.body
+ }
+ },
+ style: {
+ width: '310px'
+ }
+ }
+ ]
+ }
}
}