fanzhen1219

This commit is contained in:
fanzhen123
2019-12-19 18:33:31 +08:00
parent 84e10c524e
commit 607c4e792c
20 changed files with 2354 additions and 375 deletions

View File

@@ -102,10 +102,36 @@ export default {
},
watch: {
radioValue (newValue, oldValue) {
console.log(newValue)
if (newValue === 'hang') {
// 行列新增渲染
if (this.$route.query.type === 'area') {
this.labelData = this.$store.state.transBefore.areaName
switch (this.$store.state.SelecttDimension.col) {
case 'dq':
this.labelData = this.$store.state.transBefore.areaName.map((item, index) => {
return {
text: item,
state: false
}
})
break
case 'sj':
this.labelData = this.$store.state.transBefore.timeArr.map((item, index) => {
return {
text: item,
state: false
}
})
break
case 'zb':
this.labelData = this.$store.state.transBefore.termsName.map((item, index) => {
return {
text: item,
state: false
}
})
break
}
} else {
this.labelData = this.$store.state.transBefore.termsName.map((item, index) => {
return {
@@ -116,12 +142,42 @@ export default {
}
} else if (newValue === 'lie') {
// 行列新增渲染
this.labelData = this.$store.state.transBefore.timeArr.map((item, index) => {
return {
text: item,
state: false
if (this.$route.query.type === 'area') {
console.log(this.$store.state.SelecttDimension.row, this.$store.state.SelecttDimension.col)
switch (this.$store.state.SelecttDimension.row) {
case 'dq':
this.labelData = this.$store.state.transBefore.areaName.map((item, index) => {
return {
text: item,
state: false
}
})
break
case 'sj':
this.labelData = this.$store.state.transBefore.timeArr.map((item, index) => {
return {
text: item,
state: false
}
})
break
case 'zb':
this.labelData = this.$store.state.transBefore.termsName.map((item, index) => {
return {
text: item,
state: false
}
})
break
}
})
} else {
this.labelData = this.$store.state.transBefore.timeArr.map((item, index) => {
return {
text: item,
state: false
}
})
}
}
}
},
@@ -219,27 +275,72 @@ export default {
this.closeX()
this.$emit('emitState', true)
} else {
// 循环地区名称 回调一个计算后的数组
let dataStrArr = this.$store.state.transBefore.termsName.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeTermsData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.termsName.indexOf(list) !== -1) {
comStr += this.$store.state.transBefore.transBeforeTermsData[index][this.$store.state.transBefore.termsName.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
let dataStrArr = null
switch (this.$store.state.SelecttDimension.col) {
case 'dq':
// 循环地区名称 回调一个计算后的数组
dataStrArr = this.$store.state.transBefore.areaName.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeAreaData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.areaName.indexOf(list) !== -1) {
comStr += this.$store.state.transBefore.transBeforeAreaData[index][this.$store.state.transBefore.areaName.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.areaName.push(this.insertName)
break
case 'sj':
// 循环地区名称 回调一个计算后的数组
dataStrArr = this.$store.state.transBefore.timeArr.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeAreaData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.timeArr.indexOf(list) !== -1) {
comStr += this.$store.state.transBefore.transBeforeAreaData[index][this.$store.state.transBefore.timeArr.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.timeArr.push(this.insertName)
break
case 'zb':
// 循环地区名称 回调一个计算后的数组
dataStrArr = this.$store.state.transBefore.termsName.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeAreaData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.termsName.indexOf(list) !== -1) {
comStr += this.$store.state.transBefore.transBeforeAreaData[index][this.$store.state.transBefore.termsName.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.termsName.push(this.insertName)
this.$store.state.transBefore.termsExplain.push('')
break
}
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.termsName.push(this.insertName)
this.$store.state.transBefore.termsExplain.push('')
this.$store.state.transBefore.transBeforeTermsData.push(dataStrArr)
this.$store.state.transBefore.transBeforeAreaData.push(dataStrArr)
this.closeX()
this.$emit('emitState', true)
}
@@ -285,8 +386,8 @@ export default {
this.closeX()
this.$emit('emitState', true)
} else {
// console.log(this.$store.state.transBefore.transBeforeTermsData)
let bsfyu = this.$store.state.transBefore.transBeforeTermsData
// console.log(this.$store.state.transBefore.transBeforeAreaData)
let bsfyu = this.$store.state.transBefore.transBeforeAreaData
// 将数据进行转置
let datarts = bsfyu[0].map(function (col, index) {
return bsfyu.map((row, key) => {
@@ -294,33 +395,98 @@ export default {
})
})
console.log(datarts)
// 循环年
let dataStrArr = this.$store.state.transBefore.timeArr.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeTermsData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.timeArr.indexOf(list) !== -1) {
comStr += datarts[index][this.$store.state.transBefore.timeArr.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
console.log(dataStrArr, '101025')
datarts.push(dataStrArr)
// 将数据转置回来
let newZz = datarts[0].map(function (col, index) {
return datarts.map((row, key) => {
return row[index]
})
})
let dataStrArr = null
let newZz = null
switch (this.$store.state.SelecttDimension.row) {
case 'dq':
// 循环年
dataStrArr = this.$store.state.transBefore.areaName.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeAreaData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.areaName.indexOf(list) !== -1) {
comStr += datarts[index][this.$store.state.transBefore.areaName.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
console.log(dataStrArr, '101025')
datarts.push(dataStrArr)
// 将数据转置回来
newZz = datarts[0].map(function (col, index) {
return datarts.map((row, key) => {
return row[index]
})
})
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.areaName.push(this.insertName)
break
case 'sj':
// 循环年
dataStrArr = this.$store.state.transBefore.timeArr.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeAreaData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.timeArr.indexOf(list) !== -1) {
comStr += datarts[index][this.$store.state.transBefore.timeArr.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
console.log(dataStrArr, '101025')
datarts.push(dataStrArr)
// 将数据转置回来
newZz = datarts[0].map(function (col, index) {
return datarts.map((row, key) => {
return row[index]
})
})
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.timeArr.push(this.insertName)
break
case 'zb':
// 循环年
dataStrArr = this.$store.state.transBefore.termsName.map((item, index) => {//外层
// console.log(this.$store.state.transBefore.transBeforeAreaData[index])
// 定义拼接计算的字符串
let comStr = ''
newArrat.forEach((list, key) => {
if (this.$store.state.transBefore.termsName.indexOf(list) !== -1) {
comStr += datarts[index][this.$store.state.transBefore.termsName.indexOf(list)]
} else {
comStr += list
}
})
// console.log(comStr)
// console.log(eval(comStr))
return eval(comStr).toString()
})
console.log(dataStrArr, '101025')
datarts.push(dataStrArr)
// 将数据转置回来
newZz = datarts[0].map(function (col, index) {
return datarts.map((row, key) => {
return row[index]
})
})
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.termsName.push(this.insertName)
this.$store.state.transBefore.termsExplain.push('')
break
}
// 将处理完的数据放到全局变量中
this.$store.state.transBefore.timeArr.push(this.insertName)
this.$store.state.transBefore.transBeforeTermsData = newZz
// this.$store.state.transBefore.timeArr.push(this.insertName)
this.$store.state.transBefore.transBeforeAreaData = newZz
this.closeX()
this.$emit('emitState', true)
}
@@ -335,7 +501,49 @@ export default {
mounted() {
// 行列新增渲染
if (this.$route.query.type === 'area') {
this.labelData = this.$store.state.transBefore.areaName
if (this.$store.state.SelecttDimension.row === 'sj' && this.$store.state.SelecttDimension.col === 'dq') {
this.labelData = this.$store.state.transBefore.areaName.map((item, index) => {
return {
text: item,
state: false
}
})
} else if (this.$store.state.SelecttDimension.row === 'dq' && this.$store.state.SelecttDimension.col === 'sj') {
this.labelData = this.$store.state.transBefore.timeArr.map((item, index) => {
return {
text: item,
state: false
}
})
} else if (this.$store.state.SelecttDimension.row === 'sj' && this.$store.state.SelecttDimension.col === 'zb') {
this.labelData = this.$store.state.transBefore.termsName.map((item, index) => {
return {
text: item,
state: false
}
})
} else if (this.$store.state.SelecttDimension.row === 'zb' && this.$store.state.SelecttDimension.col === 'sj') {
this.labelData = this.$store.state.transBefore.timeArr.map((item, index) => {
return {
text: item,
state: false
}
})
} else if (this.$store.state.SelecttDimension.row === 'zb' && this.$store.state.SelecttDimension.col === 'dq') {
this.labelData = this.$store.state.transBefore.areaName.map((item, index) => {
return {
text: item,
state: false
}
})
} else if (this.$store.state.SelecttDimension.row === 'dq' && this.$store.state.SelecttDimension.col === 'zb') {
this.labelData = this.$store.state.transBefore.termsName.map((item, index) => {
return {
text: item,
state: false
}
})
}
} else {
this.labelData = this.$store.state.transBefore.termsName.map((item, index) => {
return {