diff --git a/business-css/frontend/src/components/antvx6/index.vue b/business-css/frontend/src/components/antvx6/index.vue index f2083cd..f089d02 100644 --- a/business-css/frontend/src/components/antvx6/index.vue +++ b/business-css/frontend/src/components/antvx6/index.vue @@ -1470,11 +1470,11 @@ const boundaryClick = () => {
缩小
-
+
diff --git a/business-css/frontend/src/views/business/algorithmManagement/algorithm/index.vue b/business-css/frontend/src/views/business/algorithmManagement/algorithm/index.vue index bc561cd..b22b748 100644 --- a/business-css/frontend/src/views/business/algorithmManagement/algorithm/index.vue +++ b/business-css/frontend/src/views/business/algorithmManagement/algorithm/index.vue @@ -253,9 +253,9 @@ function changeStatus(row: any) { 搜索
- + 新增 - 删除
@@ -272,7 +272,7 @@ function changeStatus(row: any) { {{ dateFormat(scope.row.updatedAt) }} - + @@ -345,7 +345,7 @@ function changeStatus(row: any) { 取 消 - 确 定 + 确 定 diff --git a/business-css/frontend/src/views/business/algorithmManagement/algorithmModel/index.vue b/business-css/frontend/src/views/business/algorithmManagement/algorithmModel/index.vue index b2c5631..0f47564 100644 --- a/business-css/frontend/src/views/business/algorithmManagement/algorithmModel/index.vue +++ b/business-css/frontend/src/views/business/algorithmManagement/algorithmModel/index.vue @@ -187,7 +187,7 @@ function editClick(row: any) { //删除算法数据 function delAloneClick(row: any) { - ElMessageBox.confirm("确定删除此算法数据吗?", "删除提示", { + ElMessageBox.confirm("确定删除此算法版本吗?", "删除提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -252,7 +252,7 @@ onMounted(() => { gettableData(); }); function changeStatus(row: any) { - ElMessageBox.confirm("确定是否激活此算法数据吗?", "激活提示", { + ElMessageBox.confirm("确定是否激活此算法版本吗?", "激活提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -302,7 +302,7 @@ function changeShowResult(isShow:boolean){ // 切换显示结果模型 删除 + :disabled="multipleSelection.length <= 0" @click="delClick" v-hasPerm="['algorithmModel:delete']">删除 + @click="changeStatus(scope.row)" style="cursor: pointer; " v-hasPerm="['algorithmModel:activate']"> - + @click="delAloneClick(scope.row)" style="cursor: pointer; " v-hasPerm="['algorithmModel:delete']"> + diff --git a/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue index 1ad9cc5..36fcfeb 100644 --- a/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue +++ b/business-css/frontend/src/views/business/algorithmManagement/modelTrainTask/index.vue @@ -483,7 +483,7 @@ const objectSpanMethod = ({
查询 重置 - 新建训练任务 + 新建训练任务
@@ -522,13 +522,13 @@ const objectSpanMethod = ({ @click="viewClick(scope.row)" style="cursor: pointer; "> - + @click="releaseClick(scope.row)" style="cursor: pointer; " v-hasPerm="['modelTrainTask:release']"> + - + @click="delAloneClick(scope.row)" style="cursor: pointer; " v-hasPerm="['modelTrainTask:delete']"> + diff --git a/business-css/frontend/src/views/business/database/criticalData/index.vue b/business-css/frontend/src/views/business/database/criticalData/index.vue index be5c068..283a8ed 100644 --- a/business-css/frontend/src/views/business/database/criticalData/index.vue +++ b/business-css/frontend/src/views/business/database/criticalData/index.vue @@ -78,7 +78,7 @@ function handleMenu(row:any) { const infoForm = ref(); //搜索内容及点击搜索按钮 const input = ref(""); -//新建设备 +//新建临界数据 const title = ref(""); const info: any = ref({ @@ -92,7 +92,7 @@ const info: any = ref({ const dialogVisible = ref(false); function addClick() { - title.value = "新增设备"; + title.value = "新增临界数据"; info.value = { deviceType: queryParams.value.type, diameter: null, @@ -105,7 +105,7 @@ function addClick() { customAttrsData.value = [] dialogVisible.value = true; } -//新建设备-确认按钮/修改按钮 +//新建临界数据-确认按钮/修改按钮 function confirmClick(formEl: any) { formEl.validate((valid: any) => { if (valid) { @@ -160,21 +160,21 @@ function handleClose() { dialogVisible.value = false; if (infoForm.value != null) infoForm.value.resetFields(); } -//新建设备 +//新建临界数据 const rules = ref({ - name: [{ required: true, message: "请输入设备名称", trigger: "blur" }], - code: [{ required: true, message: "请输入设备编码", trigger: "blur" }], + name: [{ required: true, message: "请输入临界数据名称", trigger: "blur" }], + code: [{ required: true, message: "请输入临界数据编码", trigger: "blur" }], }); -//修改设备 +//修改临界数据 function editClick(row: any) { - title.value = "修改设备"; + title.value = "修改临界数据"; info.value = JSON.parse(JSON.stringify(row)); dialogVisible.value = true; } -//删除设备 +//删除临界数据 function delAloneClick(row: any) { - ElMessageBox.confirm("确定删除此设备吗?", "删除提示", { + ElMessageBox.confirm("确定删除此临界数据吗?", "删除提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -196,7 +196,7 @@ function delAloneClick(row: any) { // 多选删除? function delClick() { - ElMessageBox.confirm("确定删除已选择设备吗?", "删除提示", { + ElMessageBox.confirm("确定删除已选择临界数据吗?", "删除提示", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning", @@ -295,11 +295,11 @@ onMounted(() => {
-
- + 新增 { :before-upload="handlePreview" :on-success="handlesSuccess" :on-error="handleError"> - 导入 + 导入 删除 + :disabled="multipleSelection.length <= 0" @click="delClick" v-hasPerm="['criticalData:delete']">删除
{ + @click="editClick(scope.row)" style="cursor: pointer; " v-hasPerm="['criticalData:update']"> + @click="delAloneClick(scope.row)" style="cursor: pointer; " v-hasPerm="['criticalData:delete']"> diff --git a/business-css/frontend/src/views/business/database/device/index.vue b/business-css/frontend/src/views/business/database/device/index.vue index 51fe37d..3135e41 100644 --- a/business-css/frontend/src/views/business/database/device/index.vue +++ b/business-css/frontend/src/views/business/database/device/index.vue @@ -350,11 +350,11 @@ onMounted(() => { 搜索
- + 新增 { :on-error="handleError"> 导入 - 删除
@@ -436,10 +436,10 @@ onMounted(() => { diff --git a/business-css/frontend/src/views/business/database/material/index.vue b/business-css/frontend/src/views/business/database/material/index.vue index d84726c..0505d97 100644 --- a/business-css/frontend/src/views/business/database/material/index.vue +++ b/business-css/frontend/src/views/business/database/material/index.vue @@ -313,7 +313,7 @@ onMounted(() => { 搜索
- + 新增 { :before-upload="handlePreview" :on-success="handlesSuccess" :on-error="handleError"> - 导入 + 导入 删除 + :disabled="multipleSelection.length <= 0" @click="delClick" v-hasPerm="['material:delete']">删除
{ diff --git a/business-css/frontend/src/views/component/scenario/createscenario.vue b/business-css/frontend/src/views/component/scenario/createscenario.vue index 8ca03f5..de0bec1 100644 --- a/business-css/frontend/src/views/component/scenario/createscenario.vue +++ b/business-css/frontend/src/views/component/scenario/createscenario.vue @@ -70,7 +70,7 @@ function confirmClick(formEl: any) { }); return } - if( isSonAlgorithmType != deviceData.value.length){ + if( isSonAlgorithmType != deviceData.value.length && isAlgorithmType == true){ ElMessage({ type: "error", message: "设备算法配置映射没有填写完全",