Skip to content

M
multiSystem
Commit 02d5c89b authored by levante's avatar levante
Browse files
Options

标签二级菜单调整到一级菜单

parent e25d5a61
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 16 deletions
src/router/routes.js
View file @ 02d5c89b
...@@ -140,9 +140,19 @@ const appRoutes = [ ...@@ -140,9 +140,19 @@ const appRoutes = [
}, },
] ]
}, },
]
},
{
path: '/labelWarehouse', name: 'labelWarehouse', component: resolve => require(['@/components/Layout/content-wrapper'], resolve), //ContentWrapper,
meta: { title: '标签库', menuPath: true, menuIcon: 'profile', authCode: '0000', hideInBread: true },
children: [
{ // 标签管理 { // 标签管理
path: '/systemManagement/lvot', name: 'lvot', component: resolve => require(['@/views/label/labelList'], resolve), //Tbls, path: '/labelWarehouse/lvot', name: 'lvot', component: resolve => require(['@/views/label/labelList'], resolve), //Tbls,
meta: { title: '标签管理', menuPath: true, menuIcon: 'setting', hideInBread: false, }, meta: { title: '标签配置', menuPath: true, menuIcon: 'setting', hideInBread: false, },
},
{
path: '/labelWarehouse/basicInfoByLabel', name: 'basicInfoByLabel', component: resolve => require(['@/views/houseData/basicInfoByLabel'], resolve), //basicInfo,
meta: { title: '标签筛选列表', menuPath: true, hideInBread: false, },
}, },
] ]
}, },
...@@ -150,10 +160,6 @@ const appRoutes = [ ...@@ -150,10 +160,6 @@ const appRoutes = [
path: '/house', name: 'house', component: resolve => require(['@/components/Layout/content-wrapper'], resolve), // ContentWrapper, path: '/house', name: 'house', component: resolve => require(['@/components/Layout/content-wrapper'], resolve), // ContentWrapper,
meta: { title: '住宅信息', menuPath: true, menuIcon: 'home', hideInBread: true, requirePerm: false, authCode: '0001' }, meta: { title: '住宅信息', menuPath: true, menuIcon: 'home', hideInBread: true, requirePerm: false, authCode: '0001' },
children: [ children: [
{
path: '/houseData/basicInfoByLabel', name: 'basicInfoByLabel', component: resolve => require(['@/views/houseData/basicInfoByLabel'], resolve), //basicInfo,
meta: { title: '小区列表-标签', menuPath: true, hideInBread: false, },
},
{ // 小区列表 { // 小区列表
path: '/houseData/basicInfo', name: 'basicInfo', component: resolve => require(['@/views/houseData/basicInfo'], resolve), //basicInfo, path: '/houseData/basicInfo', name: 'basicInfo', component: resolve => require(['@/views/houseData/basicInfo'], resolve), //basicInfo,
meta: { title: '住宅小区', menuPath: true, hideInBread: false, authCode: '000101', menuIcon: 'home'}, meta: { title: '住宅小区', menuPath: true, hideInBread: false, authCode: '000101', menuIcon: 'home'},
......
src/views/label/labelList.vue
View file @ 02d5c89b
...@@ -97,7 +97,6 @@ export default { ...@@ -97,7 +97,6 @@ export default {
}).then(res => { }).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.treeData = this.$com.confirm(res, 'data.content', []) this.treeData = this.$com.confirm(res, 'data.content', [])
console.log(JSON.stringify(this.treeData))
} }
}) })
}, },
......
src/views/label/labelRightSide.vue
View file @ 02d5c89b
...@@ -438,7 +438,7 @@ export default { ...@@ -438,7 +438,7 @@ export default {
* key => 业务属性二级可选值 * key => 业务属性二级可选值
*/ */
checkIfSelectOptionAppears(options, formValue, key) { checkIfSelectOptionAppears(options, formValue, key) {
console.log(options, formValue, key) // console.log(options, formValue, key)
let findKey = options.find(item => (item.tblKey == key)) let findKey = options.find(item => (item.tblKey == key))
let pushSels = [] let pushSels = []
// 如果没找到 // 如果没找到
...@@ -458,7 +458,6 @@ export default { ...@@ -458,7 +458,6 @@ export default {
this.$message.error('请至少添加一组配置！') this.$message.error('请至少添加一组配置！')
} else { } else {
// 判断是否选择分组或填写分组 // 判断是否选择分组或填写分组
console.log(!!this.labelForm.getFieldValue('parentId'))
if(!!this.labelForm.getFieldValue('parentId')) { if(!!this.labelForm.getFieldValue('parentId')) {
this.verifyInput = false this.verifyInput = false
this.verifySelect = true this.verifySelect = true
...@@ -475,7 +474,6 @@ export default { ...@@ -475,7 +474,6 @@ export default {
this.infoSettingForm.validateFields((err1, values) => { this.infoSettingForm.validateFields((err1, values) => {
if(!err1) { if(!err1) {
let loopGroup = this.loopContent // 有多少组 let loopGroup = this.loopContent // 有多少组
console.log(loopGroup)
let innerResult = [] let innerResult = []
let formData = this.infoSettingForm.getFieldsValue() let formData = this.infoSettingForm.getFieldsValue()
...@@ -488,7 +486,7 @@ export default { ...@@ -488,7 +486,7 @@ export default {
rowList.push({ rowList.push({
key: formData['key-' + i + '-'+index ], key: formData['key-' + i + '-'+index ],
tableName: formData['tableName-' + i + '-'+index ], tableName: formData['tableName-' + i + '-'+index ],
val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index], val: !formData['inputTwo-' + i+'-'+index] ? this.checkAndConvertDate(formData['inputOne-' + i+'-'+index]) : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
codition: formData['codition-' + i + '-' +index], codition: formData['codition-' + i + '-' +index],
relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and', relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
randomNum: formData['randomNumInner-' + i + '-' +index], randomNum: formData['randomNumInner-' + i + '-' +index],
...@@ -524,6 +522,13 @@ export default { ...@@ -524,6 +522,13 @@ export default {
}) })
} }
}, },
checkAndConvertDate(val) {
if(this.$moment(val, 'YYYY-MM-DD', true).isValid()) {
return this.$moment(val).format('YYYY-MM-DD')
} else {
return val
}
},
addGroup() { addGroup() {
// 添加分组前，先查询当前有几个分组 // 添加分组前，先查询当前有几个分组
const groupTotal = Object.keys(this.loopContent.data).length const groupTotal = Object.keys(this.loopContent.data).length
...@@ -552,7 +557,7 @@ export default { ...@@ -552,7 +557,7 @@ export default {
rowList.push({ rowList.push({
key: formData['key-' + i + '-'+index ], key: formData['key-' + i + '-'+index ],
tableName: formData['tableName-' + i + '-'+index ], tableName: formData['tableName-' + i + '-'+index ],
val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index], val: !formData['inputTwo-' + i+'-'+index] ? this.checkAndConvertDate(formData['inputOne-' + i+'-'+index]) : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
codition: formData['codition-' + i + '-' +index], codition: formData['codition-' + i + '-' +index],
relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and', relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
randomNum: formData['randomNumInner-' + i + '-' +index], randomNum: formData['randomNumInner-' + i + '-' +index],
...@@ -625,6 +630,7 @@ export default { ...@@ -625,6 +630,7 @@ export default {
}) })
}, },
getInitialValueOne(val) { getInitialValueOne(val) {
console.log(val)
if(val.indexOf(',') > -1) { if(val.indexOf(',') > -1) {
return val.split(',')[0] return val.split(',')[0]
} else { } else {
...@@ -727,7 +733,6 @@ export default { ...@@ -727,7 +733,6 @@ export default {
this.infoSettingForm.validateFields((err1, values) => { this.infoSettingForm.validateFields((err1, values) => {
if(!err1) { if(!err1) {
let loopGroup = this.loopContent // 有多少组 let loopGroup = this.loopContent // 有多少组
console.log(loopGroup)
let innerResult = [] let innerResult = []
let formData = this.infoSettingForm.getFieldsValue() let formData = this.infoSettingForm.getFieldsValue()
...@@ -740,7 +745,7 @@ export default { ...@@ -740,7 +745,7 @@ export default {
rowList.push({ rowList.push({
key: formData['key-' + i + '-'+index ], key: formData['key-' + i + '-'+index ],
tableName: formData['tableName-' + i + '-'+index ], tableName: formData['tableName-' + i + '-'+index ],
val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index], val: !formData['inputTwo-' + i+'-'+index] ? this.checkAndConvertDate(formData['inputOne-' + i+'-'+index]) : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
codition: formData['codition-' + i + '-' +index], codition: formData['codition-' + i + '-' +index],
relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and', relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
randomNum: formData['randomNumInner-' + i + '-' +index], randomNum: formData['randomNumInner-' + i + '-' +index],
...@@ -810,7 +815,7 @@ export default { ...@@ -810,7 +815,7 @@ export default {
rowList.push({ rowList.push({
key: formData['key-' + i + '-'+index ], key: formData['key-' + i + '-'+index ],
tableName: formData['tableName-' + i + '-'+index ], tableName: formData['tableName-' + i + '-'+index ],
val: !formData['inputTwo-' + i+'-'+index] ? formData['inputOne-' + i+'-'+index] : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index], val: !formData['inputTwo-' + i+'-'+index] ? this.checkAndConvertDate(formData['inputOne-' + i+'-'+index]) : formData['inputOne-' + i+'-'+index] + ',' + formData['inputTwo-' + i+'-'+index],
codition: formData['codition-' + i + '-' +index], codition: formData['codition-' + i + '-' +index],
relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and', relation: !!formData['relation-' + i + '-' + index]? formData['relation-' + i + '-' + index]: 'and',
randomNum: formData['randomNumInner-' + i + '-' +index], randomNum: formData['randomNumInner-' + i + '-' +index],
......
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