测试问题整改

This commit is contained in:
GGJ
2024-11-07 15:23:04 +08:00
parent 6e9dd840db
commit a4b6bb111b
26 changed files with 33153 additions and 4358 deletions

View File

@@ -24,7 +24,7 @@ const { push, options, currentRoute } = useRouter()
const url = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
console.log("🚀 ~ url:", url)
const excelOptions = ref({
xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : true
xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
})
onMounted(() => {
console.log()

View File

@@ -65,7 +65,7 @@ const initChart = () => {
},
backgroundColor: 'rgba(0,0,0,0.35)',
borderWidth: 0,
confine:true,
confine: true,
...(props.options?.tooltip || null)
},
toolbox: {
@@ -75,9 +75,15 @@ const initChart = () => {
saveAsImage: {
title: '保存图片',
},
...(props.options?.toolbox?.featureProps || null),
...(props.options?.toolbox?.featureProps || null)
},
emphasis: {
iconStyle: {
borderColor: config.layout.elementUiPrimary[0], // 鼠标悬停时的边框颜色
color: config.layout.elementUiPrimary[0] // 鼠标悬停时的图标颜色
}
},
// },
...(props.options?.toolbox || null)
},
@@ -123,9 +129,10 @@ const initChart = () => {
series: props.options?.series,
...props.options?.options
}
// console.log(options.series,"获取x轴");
handlerBar(options)
// 处理柱状图
chart.setOption(options,true)
chart.setOption(options, true)
setTimeout(() => {
chart.resize()
@@ -205,6 +212,9 @@ const handlerXAxis = () => {
let temp = {
type: 'category',
axisTick: { show: false },
nameTextStyle: {
color: '#000'
},
axisLine: {
// lineStyle: {
color: '#000'
@@ -214,9 +224,10 @@ const handlerXAxis = () => {
// textStyle: {
fontFamily: 'dinproRegular',
color: '#000',
fontSize: '12'
fontSize: '12',
// }
}
},
// boundaryGap: false,
}
// props.options?.xAxis 是数组还是对象
if (Array.isArray(props.options?.xAxis)) {
@@ -234,9 +245,6 @@ const handlerXAxis = () => {
}
}
let throttle: ReturnType<typeof setTimeout>
// 动态计算table高度
const resizeObserver = new ResizeObserver(entries => {

View File

@@ -187,6 +187,7 @@ const GetEchar = async (name: string) => {
}
}
})
}
const MapReturn = (name: string) => {

View File

@@ -22,6 +22,8 @@ const options:any = dictData.state.area
const areaName = ref(dictData.state.area[0].name)
const jbName = ref(dictData.state.area[0].name)
const change = (e: any) => {
console.log("🚀 ~ change ~ cascader.value.getCheckedNodes()[0]?.pathLabels.length:", cascader.value.getCheckedNodes()[0]?.pathLabels.length)
if (cascader.value.getCheckedNodes()[0]?.pathLabels.length == 1) {
areaName.value = cascader.value.getCheckedNodes()[0].pathLabels[0]
} else if (cascader.value.getCheckedNodes()[0]?.pathLabels.length >= 2) {

View File

@@ -31,7 +31,7 @@
</template>
<script setup lang="ts">
import { inject, ref, onMounted, nextTick, onUnmounted } from 'vue'
import { inject, ref, onMounted, nextTick, onUnmounted,watch } from 'vue'
import type TableStore from '@/utils/tableStore'
import DatePicker from '@/components/form/datePicker/index.vue'
import Area from '@/components/form/area/index.vue'
@@ -81,6 +81,14 @@ const headerFormSecondStyleClose = {
height: '0',
padding: '0'
}
watch(
() => tableStore.table.params.deptIndex,
(newVal) => {
setTimeout(() => {
areaRef.value.change()
}, 0);
}
)
onMounted(() => {
if (props.datePicker) {
tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]

View File

@@ -3,7 +3,7 @@
<Toolbar style="border-bottom: 1px solid #e4e4e4; border-top: 1px solid #e4e4e4" :editor="editorRef"
:defaultConfig="toolbarConfig" mode="default" />
<Editor v-bind="$attrs" :defaultConfig="editorConfig" mode="default" @onCreated="handleCreated"
style="height: calc(100% - 42px)" />
style="height: 300px;overflow-y: auto" />
</div>
</template>
<script lang="ts" setup>