20250711会议更改补充

This commit is contained in:
wangxk 2025-07-15 17:58:48 +08:00
parent 32b34fa755
commit 430eede254
2 changed files with 55 additions and 12 deletions

View File

@ -66,10 +66,10 @@ function addproject() {
//
const storeContent = ref('')
function editproject(row: any) {
if (row.storeContent) {
ElMessage.warning('已有项目绑定该存储空间,请先解除关联!')
return
}
// if (row.storeContent) {
// ElMessage.warning('')
// return
// }
if (row.storeContent) {
storeContent.value = row.storeContent
} else {
@ -396,8 +396,8 @@ function comparePercentage(percentStr: any) {
</el-form-item>
<el-form-item>
<div style="width: 100%;display: flex;justify-content: end;margin-top: 20px;">
<el-button type="primary" @click="submitForm(ruleFormRef)">确定</el-button>
<el-button @click="handleClose(ruleFormRef)">取消</el-button>
<el-button v-if="!storeContent" type="primary" @click="submitForm(ruleFormRef)">确定</el-button>
<el-button v-if="!storeContent" @click="handleClose(ruleFormRef)">取消</el-button>
</div>
</el-form-item>
</el-form>

View File

@ -18,8 +18,8 @@ let result1 = ref([
{ name: '任务名称', code: 'task_name' },
{ name: '任务地点', code: 'task_place' },
{ name: '任务人员', code: 'task_person' },
{ name: '载名称', code: 'carrier_name' },
{ name: '设备编号', code: 'device_code' },
{ name: '载名称', code: 'carrier_name' },
{ name: '设备代号_编号', code: 'device_code' },
{ name: '任务类型', code: 'task_type' },
{ name: '试验描述', code: 'test_describe' },
{ name: '传感器描述', code: 'sensor_describe' },
@ -54,7 +54,7 @@ function zhuandata(dateString: any) {
const loading = ref(false)
//
function getdata() {
loading.value = true
if (dataduan.value && dataduan.value.length > 0) {
const dataArr = []
@ -337,6 +337,15 @@ function typeName(arr: any, itemCode: any) {
});
return nameone
}
function typeName1(arr: any, itemCode: any) {
let nameone: any
arr.forEach((item: any) => {
if (item.id == itemCode) {
nameone = item.name
}
});
return nameone
}
const logqing = ref(false)
const logTxt = ref('')
function Loglist(row: any, title1: any) {
@ -388,7 +397,15 @@ function dellable(index: any) {
}
const checkList1 = ref([])
const checkList2 = ref([])
const visible:any = ref(false)
const visible: any = ref(false)
function reset() {
checkList1.value.length = 0
checkList2.value.length = 0
queryParams.value.keyword = ''
dataduan.value.length = 0
visible.vlaue = false
getdata()
}
</script>
<template>
@ -403,10 +420,18 @@ const visible:any = ref(false)
<template #reference>
<el-button @click="visible = true" type="primary">高级</el-button>
</template>
<div>
<div style="display: flex;width: 100%;justify-content: space-between;margin: 0px 0px 10px 0px;">
<div class="shuxingtitle" style="margin: 0px;padding: 0px;font-size: 18px;">
<div class="kuai" style="height: 16px;"></div>
<div class="txt"> 高级搜索</div>
</div>
<div class="glose" @click="visible = false">x</div>
</div>
<div style="display: flex;align-items: center;">
<el-input style="margin-right: 10px;width:240px;" v-model="queryParams.keyword" clearable
placeholder=""></el-input>
placeholder="全属性搜索"></el-input>
<el-button type="primary" @click="getdata()">搜索</el-button>
<el-button type="primary" @click="reset()">重置</el-button>
</div>
<div class="shuxingtitle" v-if="result1.length > 0">
<div class="kuai"></div>
@ -478,6 +503,16 @@ const visible:any = ref(false)
</div>
</template>
</el-table-column>
<el-table-column prop="localStorageId" label="本地存储空间" width="180">
<template #default="scope">
<span>{{ typeName1(localarr, scope.row.localStorageId) }}</span>
</template>
</el-table-column>
<el-table-column prop="backupStorageId" label="备份存储空间" width="180">
<template #default="scope">
<span>{{ typeName1(minioarr, scope.row.backupStorageId) }}</span>
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="80" align="center">
<template #default="scope">
<span
@ -695,4 +730,12 @@ const visible:any = ref(false)
padding: 0px 0px 0px 5px;
}
}
.glose {
cursor: pointer;
}
.glose:hover {
color: #409eff;
}
</style>