diff --git a/web/src/views/system/storage/index.vue b/web/src/views/system/storage/index.vue index 05c34f0..94d830d 100644 --- a/web/src/views/system/storage/index.vue +++ b/web/src/views/system/storage/index.vue @@ -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) {
- 确定 - 取消 + 确定 + 取消
diff --git a/web/src/views/testdata/testtask/index.vue b/web/src/views/testdata/testtask/index.vue index e912351..5d2bf73 100644 --- a/web/src/views/testdata/testtask/index.vue +++ b/web/src/views/testdata/testtask/index.vue @@ -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() +} + + + + + +