修改浙江无线bug
This commit is contained in:
@@ -90,7 +90,7 @@ const initChart = () => {
|
|||||||
itemStyle: {},
|
itemStyle: {},
|
||||||
// textStyle: {
|
// textStyle: {
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
padding: [2, 0, 0, 0], //[上、右、下、左]
|
// padding: [2, 0, 0, 0], //[上、右、下、左]
|
||||||
// },
|
// },
|
||||||
itemWidth: 15,
|
itemWidth: 15,
|
||||||
itemHeight: 10,
|
itemHeight: 10,
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export const useConfig = defineStore(
|
|||||||
// 后台布局方式,可选值<Default|Classic|Streamline|Double>
|
// 后台布局方式,可选值<Default|Classic|Streamline|Double>
|
||||||
layoutMode: 'Classic',
|
layoutMode: 'Classic',
|
||||||
// 后台主页面切换动画,可选值<slide-right|slide-left|el-fade-in-linear|el-fade-in|el-zoom-in-center|el-zoom-in-top|el-zoom-in-bottom>
|
// 后台主页面切换动画,可选值<slide-right|slide-left|el-fade-in-linear|el-fade-in|el-zoom-in-center|el-zoom-in-top|el-zoom-in-bottom>
|
||||||
mainAnimation: 'slide-right',
|
mainAnimation: 'el-fade-in',
|
||||||
// 是否暗黑模式
|
// 是否暗黑模式
|
||||||
isDark: false,
|
isDark: false,
|
||||||
elementUiPrimary: ['#002B6A', '#002B6A'],
|
elementUiPrimary: ['#002B6A', '#002B6A'],
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ const deviceData = ref({})
|
|||||||
const { push, options, currentRoute } = useRouter()
|
const { push, options, currentRoute } = useRouter()
|
||||||
const tableStore: any = new TableStore({
|
const tableStore: any = new TableStore({
|
||||||
url: '/cs-device-boot/portableOfflLog/queryMainLogPage',
|
url: '/cs-device-boot/portableOfflLog/queryMainLogPage',
|
||||||
publicHeight: 400,
|
publicHeight: 420,
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
column: [
|
column: [
|
||||||
// { width: '60', type: 'checkbox', fixed: 'left' },
|
// { width: '60', type: 'checkbox', fixed: 'left' },
|
||||||
|
|||||||
@@ -7,10 +7,7 @@
|
|||||||
<el-button :loading="loading" style="margin-left: 10px" type="primary" @click="submitUpload">
|
<el-button :loading="loading" style="margin-left: 10px" type="primary" @click="submitUpload">
|
||||||
上传离线数据
|
上传离线数据
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button type="primary" @click="handleUpload" :loading="loading"
|
|
||||||
:disabled="offLineFileList.length == 0 || disableHandleUpload">
|
|
||||||
开始上传
|
|
||||||
</el-button>
|
|
||||||
<el-button type="primary" @click="removeAllFile" :loading="loading"
|
<el-button type="primary" @click="removeAllFile" :loading="loading"
|
||||||
:disabled="offLineFileList.length == 0">
|
:disabled="offLineFileList.length == 0">
|
||||||
重置上传文件
|
重置上传文件
|
||||||
@@ -45,7 +42,11 @@
|
|||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<!-- <el-button @click="close">取消</el-button> -->
|
<!-- <el-button @click="close">取消</el-button> -->
|
||||||
<el-button type="primary" @click="close">确定</el-button>
|
<!-- <el-button type="primary" @click="close">确定</el-button> -->
|
||||||
|
<el-button type="primary" @click="handleUpload" :loading="loading"
|
||||||
|
:disabled="offLineFileList.length == 0 || disableHandleUpload">
|
||||||
|
开始上传
|
||||||
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|||||||
@@ -245,15 +245,14 @@ const init = async () => {
|
|||||||
echartsData.value = {
|
echartsData.value = {
|
||||||
legend: {
|
legend: {
|
||||||
itemWidth: 20,
|
itemWidth: 20,
|
||||||
itemHeight: 10,
|
itemHeight: 20,
|
||||||
itemGap: 10,
|
itemStyle: { opacity: 0 },//去圆点
|
||||||
type: 'scroll', // 开启滚动分页
|
type: 'scroll', // 开启滚动分页
|
||||||
// orient: 'vertical', // 垂直排列
|
// orient: 'vertical', // 垂直排列
|
||||||
top: 5,
|
top: 5,
|
||||||
right: 70,
|
right: 70,
|
||||||
|
|
||||||
width: 550,
|
width: 550,
|
||||||
height: 50
|
// height: 50
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
top: '80px',
|
top: '80px',
|
||||||
|
|||||||
@@ -501,14 +501,13 @@ const init = (flag: boolean) => {
|
|||||||
},
|
},
|
||||||
legend: {
|
legend: {
|
||||||
itemWidth: 20,
|
itemWidth: 20,
|
||||||
itemHeight: 10,
|
itemHeight: 20,
|
||||||
itemGap: 15,
|
itemStyle: { opacity: 0 },//去圆点
|
||||||
type: 'scroll', // 开启滚动分页
|
type: 'scroll', // 开启滚动分页
|
||||||
// orient: 'vertical', // 垂直排列
|
|
||||||
top: 5,
|
|
||||||
right: 70,
|
right: 70,
|
||||||
width: 550,
|
width: 550,
|
||||||
height: 50
|
|
||||||
|
// height: 50
|
||||||
},
|
},
|
||||||
grid: {
|
grid: {
|
||||||
top: '80px',
|
top: '80px',
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标"
|
<el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标"
|
||||||
style="width: 1040px">
|
style="width: 1040px" @closed="close">
|
||||||
<el-scrollbar style="padding-right: 0">
|
<el-scrollbar style="padding-right: 0">
|
||||||
<div class="box">
|
<div class="box">
|
||||||
<div class="box-left">
|
<div class="box-left">
|
||||||
@@ -66,7 +66,7 @@
|
|||||||
|
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<span class="dialog-footer">
|
<span class="dialog-footer">
|
||||||
<el-button @click="dialogVisible = false">取消</el-button>
|
<el-button @click="close">取消</el-button>
|
||||||
<el-button type="primary" @click="submit">确认</el-button>
|
<el-button type="primary" @click="submit">确认</el-button>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
@@ -393,6 +393,11 @@ const submit = async () => {
|
|||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
const close = () => {
|
||||||
|
searchKey.value = ''
|
||||||
|
searchKey1.value = ''
|
||||||
|
dialogVisible.value = false
|
||||||
|
}
|
||||||
|
|
||||||
defineExpose({ open })
|
defineExpose({ open })
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
Reference in New Issue
Block a user