修改测试问题
This commit is contained in:
@@ -201,7 +201,7 @@ const tableStore = new TableStore({
|
||||
render: 'basicButton',
|
||||
disabled: row => {
|
||||
let code = DeviceType.value.filter((item: any) => item.id == row.devType)[0]?.code
|
||||
return !(code == 'Direct_Connected_Device' || code == 'Gateway')
|
||||
return !((code == 'Direct_Connected_Device' || code == 'Gateway') && row.wavePath == null)
|
||||
},
|
||||
|
||||
},
|
||||
@@ -213,7 +213,8 @@ const tableStore = new TableStore({
|
||||
render: 'basicButton',
|
||||
loading: 'loading2',
|
||||
disabled: row => {
|
||||
return row.wavePath
|
||||
let code = DeviceType.value.filter((item: any) => item.id == row.devType)[0]?.code
|
||||
return !((code == 'Portable' || code == 'DEV_CLD') && row.wavePath == null)
|
||||
},
|
||||
click: row => {
|
||||
let code = DeviceType.value.filter((item: any) => item.id == row.devType)[0]?.code
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
@closed="handleClosed">
|
||||
<el-form ref="formRef" :model="form" :rules="rules" label-width="auto" class="form-one">
|
||||
<el-form-item label="方案名称" prop="name">
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入方案名称" clearable />
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.name" placeholder="请输入方案名称" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="在线率阈值" prop="onlineRateLimit">
|
||||
<el-input-number v-model="form.onlineRateLimit" :min="0" :max="100" :precision="0" style="width: 100%"
|
||||
@@ -22,7 +22,7 @@
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="handleCancel">取消</el-button>
|
||||
<el-button type="primary" @click="onSubmit">确定</el-button>
|
||||
<el-button type="primary" @click="onSubmit" :loading="loading">确定</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
@@ -38,7 +38,7 @@ const emit = defineEmits(['Cancels'])
|
||||
const dialogVisible = ref(false)
|
||||
const title = ref('')
|
||||
const formRef = ref()
|
||||
|
||||
const loading = ref(false)
|
||||
const defaultForm = () => ({
|
||||
id: '',
|
||||
name: '',
|
||||
@@ -109,6 +109,7 @@ const onSubmit = () => {
|
||||
integrityLimit: form.integrityLimit,
|
||||
active: form.active
|
||||
}
|
||||
loading.value = true
|
||||
try {
|
||||
if (isEdit()) {
|
||||
await update(payload)
|
||||
@@ -121,6 +122,8 @@ const onSubmit = () => {
|
||||
emit('Cancels')
|
||||
} catch {
|
||||
/* 请求层一般会统一提示 */
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div>
|
||||
<el-button type="primary" @click="onConfirm">确认</el-button>
|
||||
<el-button type="primary" @click="onConfirm">确定</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
@@ -4,19 +4,23 @@
|
||||
<el-scrollbar max-height="60vh">
|
||||
<el-form ref="formRef" :model="form" :rules="rules" label-width="auto" class="form-two">
|
||||
<el-form-item label="指标名称" prop="indexName">
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.indexName" placeholder="请输入指标名称" clearable/>
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.indexName" placeholder="请输入指标名称"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="指标Code" prop="indexCode">
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.indexCode" placeholder="请输入指标Code" clearable />
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.indexCode" placeholder="请输入指标Code"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="表名" prop="influxdbTableName">
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.influxdbTableName" placeholder="请输入表名" clearable />
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.influxdbTableName" placeholder="请输入表名"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="列属性" prop="influxdbColumnName">
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.influxdbColumnName" placeholder="实体类属性名" clearable />
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.influxdbColumnName" placeholder="实体类属性名"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="谐波次数">
|
||||
<el-slider v-model.trim="form.harmSlider" range :max="50" style="width: 90%" />
|
||||
@@ -60,10 +64,10 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="单位" prop="unit">
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.unit" placeholder="请输入单位" clearable />
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="form.unit" placeholder="请输入单位" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<el-input-number v-model="form.sort" :min="0" style="width: 100%;" :precision="0" />
|
||||
<el-input-number v-model="form.sort" :min="0" style="width: 100%;" :precision="0" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="状态" prop="state">
|
||||
<el-select v-model="form.state" placeholder="请选择" style="width: 100%">
|
||||
@@ -72,18 +76,18 @@
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="条件描述" prop="otherAlgorithm" class="form-item-full">
|
||||
<el-input show-word-limit v-model.trim="form.otherAlgorithm" type="textarea" :rows="2" placeholder="无具体范围时的判断条件描述"
|
||||
maxlength="300" />
|
||||
<el-input show-word-limit v-model.trim="form.otherAlgorithm" type="textarea" :rows="2"
|
||||
placeholder="无具体范围时的判断条件描述" maxlength="300" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark" class="form-item-full">
|
||||
<el-input show-word-limit v-model.trim="form.remark" type="textarea" :rows="2" placeholder="备注" maxlength="300"
|
||||
/>
|
||||
<el-input show-word-limit v-model.trim="form.remark" type="textarea" :rows="2" placeholder="备注"
|
||||
maxlength="300" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-scrollbar>
|
||||
<template #footer>
|
||||
<el-button @click="handleCancel">取消</el-button>
|
||||
<el-button type="primary" @click="onSubmit">确定</el-button>
|
||||
<el-button type="primary" @click="onSubmit" :loading="loading">确定</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
@@ -97,6 +101,7 @@ const emit = defineEmits(['Cancels'])
|
||||
const dialogVisible = ref(false)
|
||||
const title = ref('')
|
||||
const formRef = ref()
|
||||
const loading = ref(false)
|
||||
const phaseSelect = [
|
||||
{
|
||||
name: 'A相',
|
||||
@@ -240,6 +245,7 @@ const handleClosed = () => {
|
||||
const onSubmit = () => {
|
||||
formRef.value?.validate(async (valid: boolean) => {
|
||||
if (!valid) return
|
||||
loading.value = true
|
||||
form.harmStart = form.harmSlider[0]
|
||||
form.harmEnd = form.harmSlider[1]
|
||||
form.phaseType = form.phaseList.join(',')
|
||||
@@ -256,6 +262,8 @@ const onSubmit = () => {
|
||||
emit('Cancels')
|
||||
} catch {
|
||||
/* 统一错误提示 */
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -138,16 +138,17 @@
|
||||
<el-dialog v-model="dialogVisible" :title="dialogTitle" width="500px" :before-close="handleClose">
|
||||
<el-form :model="formData" :rules="formRules" ref="formRef" class="form-one" label-width="100px">
|
||||
<el-form-item label="方案名称" prop="name">
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="formData.name" placeholder="请输入方案名称" clearable />
|
||||
<el-input maxlength="32" show-word-limit v-model.trim="formData.name" placeholder="请输入方案名称"
|
||||
clearable />
|
||||
</el-form-item>
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<el-input-number v-model.number="formData.sort" :min="0" style="width: 100%;" />
|
||||
<el-input-number v-model.number="formData.sort" :min="0" style="width: 100%;" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<span class="dialog-footer">
|
||||
<el-button @click="dialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" @click="submitForm">确定</el-button>
|
||||
<el-button type="primary" @click="submitForm" :loading="loading1">确定</el-button>
|
||||
</span>
|
||||
</template>
|
||||
</el-dialog>
|
||||
@@ -184,6 +185,7 @@ const lineList: any = ref([])
|
||||
const copyRow: any = ref({})
|
||||
const treeRef = ref()
|
||||
const loading = ref(false)
|
||||
const loading1 = ref(false)
|
||||
// 弹框相关
|
||||
const dialogVisible = ref(false)
|
||||
const dialogTitle = ref('新增方案')
|
||||
@@ -384,6 +386,7 @@ const handleClose = () => {
|
||||
// 提交表单
|
||||
const submitForm = async () => {
|
||||
await formRef.value?.validate()
|
||||
loading1.value = true
|
||||
if (dialogTitle.value == '新增方案') {
|
||||
await save({
|
||||
harmonicTarget: '',
|
||||
@@ -395,6 +398,8 @@ const submitForm = async () => {
|
||||
ElMessage.success(`${dialogTitle.value}成功`)
|
||||
dialogVisible.value = false
|
||||
tableStore.index() // 刷新列表
|
||||
}).finally(() => {
|
||||
loading1.value = false
|
||||
})
|
||||
} else {
|
||||
await update({
|
||||
@@ -407,6 +412,8 @@ const submitForm = async () => {
|
||||
ElMessage.success(`${dialogTitle.value}成功`)
|
||||
dialogVisible.value = false
|
||||
tableStore.index() // 刷新列表
|
||||
}).finally(() => {
|
||||
loading1.value = false
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user