微调弹出框
This commit is contained in:
@@ -131,7 +131,7 @@ const reSize = (widthValue: number,heightValue: number,silentValue: boolean) =>
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
const resizeCharts = () => {
|
const resizeCharts = () => {
|
||||||
console.log(chart.value,111111);
|
//console.log(chart.value,111111);
|
||||||
|
|
||||||
if (chart.value) {
|
if (chart.value) {
|
||||||
chart.value.resize();
|
chart.value.resize();
|
||||||
|
|||||||
@@ -444,7 +444,7 @@
|
|||||||
|
|
||||||
.dialog-small {
|
.dialog-small {
|
||||||
.el-dialog__body {
|
.el-dialog__body {
|
||||||
max-height: 320px;
|
max-height: 340px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -144,6 +144,7 @@ const save = () => {
|
|||||||
|
|
||||||
// 打开弹窗,可能是新增,也可能是编辑
|
// 打开弹窗,可能是新增,也可能是编辑
|
||||||
const open = async (sign: string, data: TestSource.ResTestSource, currentMode: string) => {
|
const open = async (sign: string, data: TestSource.ResTestSource, currentMode: string) => {
|
||||||
|
console.log('打开弹窗', sign, data)
|
||||||
titleType.value = sign
|
titleType.value = sign
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
mode.value = currentMode
|
mode.value = currentMode
|
||||||
|
|||||||
@@ -89,6 +89,7 @@
|
|||||||
|
|
||||||
// 打开 drawer(新增、编辑)
|
// 打开 drawer(新增、编辑)
|
||||||
const openDialog = (titleType: string, row: Partial<TestSource.ResTestSource> = {}) => {
|
const openDialog = (titleType: string, row: Partial<TestSource.ResTestSource> = {}) => {
|
||||||
|
|
||||||
testSourcePopup.value?.open(titleType, row,modeStore.currentMode)
|
testSourcePopup.value?.open(titleType, row,modeStore.currentMode)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ import type { ErrorSystem } from '@/api/error/interface'
|
|||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
isShow: boolean;
|
isShow: boolean;
|
||||||
}>();
|
}>();
|
||||||
console.log(props.isShow,1111)
|
//console.log(props.isShow,1111)
|
||||||
const handleCommand = (command: string | number | object) => {
|
const handleCommand = (command: string | number | object) => {
|
||||||
detail_dialogTitle.value = command as string;
|
detail_dialogTitle.value = command as string;
|
||||||
detail_dialogFormVisible.value = true // 显示对话框
|
detail_dialogFormVisible.value = true // 显示对话框
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
:dialogTitle="dialogTitle"
|
:dialogTitle="dialogTitle"
|
||||||
:is-read-only="isReadOnly"
|
:is-read-only="isReadOnly"
|
||||||
@update:visible="dialogFormVisible = $event"
|
@update:visible="dialogFormVisible = $event"
|
||||||
ref='testSourcePopup'
|
|
||||||
/>
|
/>
|
||||||
<!-- 查看误差体系详细信息 -->
|
<!-- 查看误差体系详细信息 -->
|
||||||
<ErrorStandardDialog
|
<ErrorStandardDialog
|
||||||
@@ -65,6 +65,8 @@
|
|||||||
@update:visible='detail_dialogFormVisible = $event'
|
@update:visible='detail_dialogFormVisible = $event'
|
||||||
ref="errorStandardPopup"
|
ref="errorStandardPopup"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<!-- <TestSourcePopup :refresh-table='proTable?.getTableList' ref='testSourcePopup' /> -->
|
||||||
</div>
|
</div>
|
||||||
<devTransfer
|
<devTransfer
|
||||||
:dialogVisible=devTransferVisible
|
:dialogVisible=devTransferVisible
|
||||||
@@ -110,8 +112,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
|
|||||||
import type { Action } from 'element-plus'
|
import type { Action } from 'element-plus'
|
||||||
import type { ErrorSystem } from '@/api/error/interface'
|
import type { ErrorSystem } from '@/api/error/interface'
|
||||||
import ErrorStandardDialog from '@/views/machine/errorSystem/components/errorStandardPopup.vue' // 导入子组件
|
import ErrorStandardDialog from '@/views/machine/errorSystem/components/errorStandardPopup.vue' // 导入子组件
|
||||||
|
import TestSourcePopup from '@/views/machine/testSource/components/testSourcePopup.vue' // 导入子组件
|
||||||
|
import { type TestSource } from '@/api/device/interface/testSource'
|
||||||
const dictStore = useDictStore()
|
const dictStore = useDictStore()
|
||||||
// 定义包含和排除的单位
|
// 定义包含和排除的单位
|
||||||
const includedUnits = ['日', '周', '月', '自定义'] // 可以根据需要包含的单位
|
const includedUnits = ['日', '周', '月', '自定义'] // 可以根据需要包含的单位
|
||||||
@@ -129,6 +131,7 @@ const dialogFormVisible = ref(false)
|
|||||||
const dialogTitle = ref('')
|
const dialogTitle = ref('')
|
||||||
const isReadOnly = ref(false)
|
const isReadOnly = ref(false)
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const dialogForm = ref<Plan.PlanBO>({
|
const dialogForm = ref<Plan.PlanBO>({
|
||||||
id: '',
|
id: '',
|
||||||
name: '',
|
name: '',
|
||||||
@@ -272,7 +275,7 @@ function openFileDialog() {
|
|||||||
|
|
||||||
function isVisible(row: Plan.PlanAndSourceBO) {
|
function isVisible(row: Plan.PlanAndSourceBO) {
|
||||||
|
|
||||||
console.log(row)
|
//console.log(row)
|
||||||
if(!row.hasOwnProperty('testSourceList') || !Array.isArray(row.testSourceList))
|
if(!row.hasOwnProperty('testSourceList') || !Array.isArray(row.testSourceList))
|
||||||
return false
|
return false
|
||||||
else if(row.testSourceList.length <= 1)
|
else if(row.testSourceList.length <= 1)
|
||||||
@@ -292,7 +295,6 @@ function showData(row: string) {
|
|||||||
}
|
}
|
||||||
const testSourcePopup = ref()
|
const testSourcePopup = ref()
|
||||||
function showTestSource(row: string) {
|
function showTestSource(row: string) {
|
||||||
|
|
||||||
//testSourcePopup.value?.open('view', row,'模拟式')
|
//testSourcePopup.value?.open('view', row,'模拟式')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user