修改测试问题

This commit is contained in:
guanj
2026-05-28 20:36:49 +08:00
parent 9466141bff
commit c2f23aa957
9 changed files with 79 additions and 28 deletions

View File

@@ -1,15 +1,37 @@
<template> <template>
<div> <div>
<!--治理效果报表 --> <!--治理效果报表 -->
<TableHeader :showReset="false" :timeKeyList="prop.timeKey" ref="TableHeaderRef" datePicker @selectChange="selectChange" v-if="fullscreen"> <TableHeader
:showReset="false"
:timeKeyList="prop.timeKey"
ref="TableHeaderRef"
datePicker
@selectChange="selectChange"
v-if="fullscreen"
>
<template v-slot:select> <template v-slot:select>
<el-form-item label="模板策略"> <el-form-item label="模板策略">
<el-select filterable v-model="tableStore.table.params.tempId" placeholder="请选择模板策略" clearable> <el-select
<el-option v-for="item in templateList" :key="item.id" :label="item.excelName" :value="item.id" /> filterable
v-model="tableStore.table.params.tempId"
placeholder="请选择模板策略"
clearable
>
<el-option
v-for="item in templateList"
:key="item.id"
:label="item.excelName"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="监测对象"> <el-form-item label="监测对象">
<el-select filterable v-model="tableStore.table.params.sensitiveUserId" placeholder="请选择监测对象" clearable> <el-select
filterable
v-model="tableStore.table.params.sensitiveUserId"
placeholder="请选择监测对象"
clearable
>
<el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" /> <el-option v-for="item in idList" :key="item.id" :label="item.name" :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
@@ -43,7 +65,7 @@ const prop = defineProps({
h: { type: [String, Number] }, h: { type: [String, Number] },
width: { type: [String, Number] }, width: { type: [String, Number] },
height: { type: [String, Number] }, height: { type: [String, Number] },
timeKey: { type: Array as () => string[] }, timeKey: { type: Array as () => string[] },
timeValue: { type: Object }, timeValue: { type: Object },
interval: { type: Number } interval: { type: Number }
}) })
@@ -59,13 +81,21 @@ const idList = ref()
// 监测对象 // 监测对象
const initListByIds = () => { const initListByIds = () => {
getListByIds({}).then((res: any) => { getListByIds({}).then((res: any) => {
if (res.data.length > 0) { if (res.data?.length > 0) {
idList.value = res.data idList.value = res.data
if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) { if (!tableStore.table.params.sensitiveUserId && idList.value?.length > 0) {
tableStore.table.params.sensitiveUserId = idList.value[0].id tableStore.table.params.sensitiveUserId = idList.value[0].id
} }
templateListData() templateListData()
} else {
querySysExcel({}).then(res => {
templateList.value = res.data.filter(item => item.excelType == 4)
if (!tableStore.table.params.tempId && templateList.value?.length > 0) {
tableStore.table.params.tempId = templateList.value[0].id
}
})
tableStore.table.loading = false
} }
}) })
} }

View File

@@ -150,6 +150,7 @@ const indicatorList = ref()
const initLineList = async () => { const initLineList = async () => {
cslineList({}).then(res => { cslineList({}).then(res => {
setTime()
if (res.data.length == 0) { if (res.data.length == 0) {
lineShow.value = false lineShow.value = false
return (tableStore.table.loading = false) return (tableStore.table.loading = false)

View File

@@ -140,7 +140,7 @@ const info = (type?: string) => {
if (type == '2') { if (type == '2') {
//初始化选中 //初始化选中
treRef.value?.treeRef4.setCurrentKey(arr4[0].id) treRef.value?.treeRef4.setCurrentKey(arr4[0]?.id)
// 注册父组件事件 // 注册父组件事件
emit('init', { emit('init', {
level: 2, level: 2,
@@ -150,7 +150,7 @@ const info = (type?: string) => {
return return
} }
if (arr.length > 0) { if (arr.length > 0) {
treRef.value.treeRef1.setCurrentKey(arr[0].id) treRef.value.treeRef1.setCurrentKey(arr[0]?.id)
// 注册父组件事件 // 注册父组件事件
emit('init', { emit('init', {
level: 2, level: 2,
@@ -158,7 +158,7 @@ const info = (type?: string) => {
}) })
return return
} else if (arr2.length > 0) { } else if (arr2.length > 0) {
treRef.value.treeRef2.setCurrentKey(arr2[0].id) treRef.value.treeRef2.setCurrentKey(arr2[0]?.id)
// 注册父组件事件 // 注册父组件事件
emit('init', { emit('init', {
level: 2, level: 2,

View File

@@ -19,9 +19,11 @@ getMarketList().then((res: any) => {
color: 'royalblue' color: 'royalblue'
} }
}) })
console.log("🚀 ~ royalblue:")
emit('selectUser', tree.value[0]) emit('selectUser', tree.value[0])
nextTick(() => { nextTick(() => {
treRef.value.treeRef.setCurrentKey(tree.value[0].id) treRef.value.treeRef.setCurrentKey(tree.value[0]?.id)
}) })
} }
}) })

View File

@@ -21,7 +21,7 @@ getFormalUserList().then((res: any) => {
}) })
emit('selectUser', tree.value[0]) emit('selectUser', tree.value[0])
nextTick(() => { nextTick(() => {
treRef.value.treeRef.setCurrentKey(tree.value[0].id) treRef.value.treeRef.setCurrentKey(tree.value[0]?.id)
}) })
} }
}) })

View File

@@ -7,15 +7,15 @@
<el-tab-pane label="前置告警" name="2"> <el-tab-pane label="前置告警" name="2">
<Front v-if="activeName == '2'" :deviceTree="deviceTree" :key="key" /> <Front v-if="activeName == '2'" :deviceTree="deviceTree" :key="key" />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="稳态越限告警" name="3"> <el-tab-pane label="稳态越限告警" name="3">
<Steady v-if="activeName == '3'" :deviceTree="deviceTree" :key="key" /> <Steady v-if="activeName == '3'" :deviceTree="deviceTree" :key="key" />
</el-tab-pane> --> </el-tab-pane>
<el-tab-pane label="暂态事件" name="4"> <el-tab-pane label="暂态事件" name="4">
<Transient v-if="activeName == '4'" :deviceTree="deviceTree" :key="key" /> <Transient v-if="activeName == '4'" :deviceTree="deviceTree" :key="key" />
</el-tab-pane> </el-tab-pane>
<!-- <el-tab-pane label="异常事件" name="5"> <el-tab-pane label="异常事件" name="5">
<Abnormal v-if="activeName == '5'" :deviceTree="deviceTree" :key="key" /> <Abnormal v-if="activeName == '5'" :deviceTree="deviceTree" :key="key" />
</el-tab-pane> --> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>

View File

@@ -1,12 +1,10 @@
<template> <template>
<div class=" device-manage" :style="{ height: pageHeight.height }" v-loading="loading"> <div class="device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
<GetMarketList @node-click="selectUser" @selectUser="selectUser"></GetMarketList> <GetMarketList @node-click="selectUser" @selectUser="selectUser"></GetMarketList>
<div class="device-manage-right" :style="{ height: pageHeight.height }"> <div class="device-manage-right" :style="{ height: pageHeight.height }">
<el-descriptions title="用户基本信息" class="mb10" :column="2" border> <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
<template #extra> <template #extra>
<el-button type="primary" icon="el-icon-Sort" @click="getMarketEnginner"> <el-button type="primary" icon="el-icon-Sort" @click="getMarketEnginner">绑定工程</el-button>
绑定工程
</el-button>
</template> </template>
<el-descriptions-item label="名称"> <el-descriptions-item label="名称">
{{ user.name }} {{ user.name }}
@@ -29,18 +27,36 @@
</vxe-table> </vxe-table>
</div> </div>
</div> </div>
<el-dialog v-model.trim="dialogVisible" title="绑定工程" class="cn-operate-dialog" :close-on-click-modal="false"> <el-dialog
<el-input maxlength="32" show-word-limit v-model.trim="filterText" icon="el-icon-Search" placeholder="请输入内容" v-model.trim="dialogVisible"
clearable style="margin-bottom: 10px"> title="绑定工程"
class="cn-operate-dialog"
:close-on-click-modal="false"
>
<el-input
maxlength="32"
show-word-limit
v-model.trim="filterText"
icon="el-icon-Search"
placeholder="请输入内容"
clearable
style="margin-bottom: 10px"
>
<template #prefix> <template #prefix>
<Icon name="el-icon-Search" style="font-size: 16px" /> <Icon name="el-icon-Search" style="font-size: 16px" />
</template> </template>
</el-input> </el-input>
<vxe-table ref="tableRef" v-bind="defaultAttribute" :data="tableData2.filter((item: any) => { <vxe-table
ref="tableRef"
v-bind="defaultAttribute"
:data="tableData2.filter((item: any) => {
return item.name.includes(filterText) return item.name.includes(filterText)
}) })
" height="500px" style="width: 100%"> "
height="500px"
style="width: 100%"
>
<vxe-column type="checkbox" width="60"></vxe-column> <vxe-column type="checkbox" width="60"></vxe-column>
<vxe-column field="name" title="工程名称"></vxe-column> <vxe-column field="name" title="工程名称"></vxe-column>
</vxe-table> </vxe-table>
@@ -77,6 +93,7 @@ const filterText = ref('')
const tableRef = ref() const tableRef = ref()
const selectUser = (e: any) => { const selectUser = (e: any) => {
if (e == undefined) return (loading.value = false)
user.value = e user.value = e
loading.value = true loading.value = true
queryByUseId({ queryByUseId({

View File

@@ -171,6 +171,7 @@ const defaultProps = {
label: 'name' label: 'name'
} }
const selectUser = (e: any) => { const selectUser = (e: any) => {
if (e == undefined) return (loading.value = false)
user.value = e user.value = e
loading.value = true loading.value = true

View File

@@ -28,7 +28,7 @@ import { mainHeight } from '@/utils/layout'
import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-device-boot/user' import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-device-boot/user'
import { ref, onMounted } from 'vue' import { ref, onMounted } from 'vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { debounce } from 'lodash-es' import { debounce } from 'lodash-es'
const pageHeight = mainHeight(60) const pageHeight = mainHeight(60)
const loading = ref(true) const loading = ref(true)
const defaultCheckedKeys: any = ref([]) const defaultCheckedKeys: any = ref([])
@@ -36,7 +36,7 @@ const tableData = ref([])
const treeRef = ref(null) const treeRef = ref(null)
const ignoreCheckChange = ref(false) const ignoreCheckChange = ref(false)
const checkChange = (data: any) => { const checkChange = (data: any) => {
console.log('🚀 ~ checkChange ~ data:', data) if (data == undefined) return (loading.value = false)
if (data.data.pName == '便携式设备') { if (data.data.pName == '便携式设备') {
if (ignoreCheckChange.value) { if (ignoreCheckChange.value) {
ignoreCheckChange.value = false // 清除标记,不影响后续正常触发 ignoreCheckChange.value = false // 清除标记,不影响后续正常触发
@@ -57,7 +57,7 @@ const checkChange = (data: any) => {
updateVisitorConfigs() updateVisitorConfigs()
} }
} }
const updateVisitorConfigs = debounce (() => { const updateVisitorConfigs = debounce(() => {
const result = Array.from(new Set(defaultCheckedKeys.value)) const result = Array.from(new Set(defaultCheckedKeys.value))
updateVisitorConfig( updateVisitorConfig(
result.map(item => { result.map(item => {
@@ -70,7 +70,7 @@ const updateVisitorConfigs = debounce (() => {
getVisitorConfigs() getVisitorConfigs()
} }
}) })
},500) }, 500)
const getVisitorConfigs = () => { const getVisitorConfigs = () => {
getVisitorConfig().then((res: any) => { getVisitorConfig().then((res: any) => {
if (res.code === 'A0000') { if (res.code === 'A0000') {