sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

弹出框按钮调整

Browse Source
This commit is contained in:
高云鹏 2024-11-07 11:18:03 +08:00
parent 5bd381559f
commit b11fd75bf0
19 changed files with 64 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/dasadmin/src/views/backend/WindBlower/index.vue
View File

@ -20,7 +20,7 @@
<template #footer>
<div class="dialog-footer">
<el-button type="primary">导出</el-button>
<el-button @click="visible = false">关闭</el-button>
<el-button @click="visible = false">取消</el-button>
</div>
</template>
</el-dialog>

24
ui/dasadmin/src/views/backend/auth/menu/index.vue
View File

@ -89,8 +89,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="onSubmit">保存</el-button>
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="onSubmit">提交</el-button>
</div>
</template>
</el-dialog>
@ -139,8 +139,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="addOnSubmit">保存</el-button>
<el-button @click="visibleAdd = false">取消</el-button>
<el-button type="primary" @click="addOnSubmit">提交</el-button>
</div>
</template>
</el-dialog>
@ -149,8 +149,8 @@
<span>确定是否删除?</span>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="dialogVisibleDelete1">保存</el-button>
<el-button @click="dialogVisibleDelete = false">取消</el-button>
<el-button type="primary" @click="dialogVisibleDelete1">提交</el-button>
</div>
</template>
</el-dialog>
@ -264,7 +264,10 @@ const clickQuery = () => {
const queryMenuMethod = (data: any) => {
menusQuery(data).then((res) => {
if (res.code == 200) {
console.log(res)
tableData.value = res.rows
console.log(tableData.value)
} else {
ElMessage.error({
message: res.msg,
@ -357,7 +360,7 @@ const rules = reactive<FormRules<RuleForm>>({
message: '菜单描述不能为空',
trigger: 'blur',
},
]
],
})
// 动作参数
@ -372,7 +375,7 @@ interface RyReplaceFields {
const fromUpDate = reactive({
id: '',
menuName: '',
menuDesc:'',
menuDesc: '',
menuOrder: 0,
menuIcon: '',
funType: 0,
@ -386,6 +389,8 @@ interface menusUpdate {
// rows?: any[]
}
const onSubmit = () => {
console.log(fromUpDate);
formRef.value.validate((valid: any) => {
if (valid) {
menusUpdate(fromUpDate).then((res) => {
@ -416,7 +421,6 @@ const allPermissionData = ref()
// 菜单权限
const allPermission = () => {
allPermissionQuery().then((res) => {
allPermissionData.value = res.data
})
}
@ -491,7 +495,7 @@ const formInlineAdd = reactive<RuleForm>({
const fromAdd = () => {
visibleAdd.value = true
formInlineAdd.menuName = ''
formInlineAdd.menuDesc =''
formInlineAdd.menuDesc = ''
formInlineAdd.menuOrder = 0
formInlineAdd.menuIcon = ''
formInlineAdd.funType = 1
@ -536,10 +540,8 @@ const addOnSubmit = () => {
const currentPage4 = ref(4)
const pageSize4 = ref(100)
const handleSizeChange = (val: number) => {
}
const handleCurrentChange = (val: number) => {
}
const handleSizeChange = (val: number) => {}
const handleCurrentChange = (val: number) => {}
</script>
<style scoped lang="scss">

6
ui/dasadmin/src/views/backend/auth/model/index.vue
View File

@ -32,8 +32,8 @@
</el-form-item>
</el-form>
<template #footer v-if="modelDialogState !== ModelDialogTitleStateType['detail']">
<el-button type="primary" @click="submitModelForm">保存</el-button>
<el-button @click="cancelModelForm">取消</el-button>
<el-button type="primary" @click="submitModelForm">提交</el-button>
</template>
</el-dialog>
<el-container class="containerPart">
@ -263,8 +263,8 @@
</el-form-item>
</el-form>
<template #footer>
<el-button type="primary" @click="submitAttributeForm">保存</el-button>
<el-button @click="closeAttributeForm">取消</el-button>
<el-button type="primary" @click="submitAttributeForm">提交</el-button>
</template>
</el-dialog>
<el-dialog v-model="serviceVisible" :title="serviceFormTitle" @close="closeServiceForm" :width="600">
@ -286,8 +286,8 @@
</el-form-item>
</el-form>
<template #footer>
<el-button type="primary" @click="submitServiceForm">保存</el-button>
<el-button @click="closeServiceForm">取消</el-button>
<el-button type="primary" @click="submitServiceForm">提交</el-button>
</template>
</el-dialog>
</div>

2
ui/dasadmin/src/views/backend/auth/org/index.vue
View File

@ -51,8 +51,8 @@
</template>
</el-form>
<template #footer>
<el-button type="primary" @click="submitAddForm" :disabled="formDisabled">保存</el-button>
<el-button @click="closeAddForm">取消</el-button>
<el-button type="primary" @click="submitAddForm" :disabled="formDisabled">提交</el-button>
</template>
</el-dialog>
<el-container class="defaultContainer">

2
ui/dasadmin/src/views/backend/auth/role/index.vue
View File

@ -23,8 +23,8 @@
</template>
</el-form>
<template #footer>
<el-button type="primary" @click="submitForm">保存</el-button>
<el-button @click="cancelSubmitForm">取消</el-button>
<el-button type="primary" @click="submitForm">提交</el-button>
</template>
</el-dialog>
<el-container class="container">

2
ui/dasadmin/src/views/backend/auth/rule/popupForm.vue
View File

@ -169,10 +169,10 @@
</el-scrollbar>
<template #footer>
<div :style="'width: calc(100% - ' + baTable.form.labelWidth! / 1.8 + 'px)'">
<el-button @click="baTable.toggleForm('')">{{ t('Cancel') }}</el-button>
<el-button v-blur :loading="baTable.form.submitLoading" @click="baTable.onSubmit(formRef)" type="primary">
{{ baTable.form.operateIds && baTable.form.operateIds.length > 1 ? t('Save and edit next item') : t('Save') }}
</el-button>
<el-button @click="baTable.toggleForm('')">{{ t('Cancel') }}</el-button>
</div>
</template>
</el-dialog>

10
ui/dasadmin/src/views/backend/auth/user/index.vue
View File

@ -95,8 +95,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="addOnSubmit">保存</el-button>
<el-button @click="visibleParam = false">取消</el-button>
<el-button type="primary" @click="addOnSubmit">提交</el-button>
</div>
</template>
</el-dialog>
@ -144,8 +144,8 @@
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="upDataOnSubmit">保存</el-button>
<el-button @click="visibleParamUpData = false">取消</el-button>
<el-button type="primary" @click="upDataOnSubmit">提交</el-button>
</div>
</template>
</el-dialog>
@ -154,8 +154,8 @@
<span>确定是否删除?</span>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="userDeleteDialog1">保存</el-button>
<el-button @click="userDeleteDialog = false">取消</el-button>
<el-button type="primary" @click="userDeleteDialog1">提交</el-button>
</div>
</template>
</el-dialog>
@ -179,8 +179,8 @@
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="passWordDialog = false">取消</el-button>
<el-button @click="passWordUpdata">提交</el-button>
<el-button type="primary" @click="passWordUpdata">保存</el-button>
<el-button @click="passWordDialog = false">取消</el-button>
</div>
</template>
</el-dialog>

31
ui/dasadmin/src/views/backend/equipment/airBlower/index.vue
View File

@ -311,22 +311,29 @@ const airBlowerOperate = async (type: 'setTurbineFastStart' | 'setTurbineStop' |
}
}
const runTask = (data: any, index: number) => {
const runTask = async (data: any, index: number) => {
console.log(data)
return sendCommandReq(data)
.then((res: any) => {
console.log(res)
if (res.success) {
console.log(data, 'success')
try {
let resp = await sendCommandReq(data)
if (resp.success) {
mutiTaskList.value[index].loading = 2
} else {
}
} catch (error) {
mutiTaskList.value[index].loading = 3
}
})
.catch(() => {
mutiTaskList.value[index].loading = 3
})
// .then((res: any) => {
// console.log(res)
// if (res.success) {
// console.log(data, 'success')
// mutiTaskList.value[index].loading = 2
// } else {
// mutiTaskList.value[index].loading = 3
// }
// })
// .catch(() => {
// mutiTaskList.value[index].loading = 3
// })
}
const tableHaderStyle = {

10
ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue
View File

@ -240,8 +240,8 @@
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="editDeviceDialog = false">取消</el-button>
<el-button @click="saveData">提交</el-button>
<el-button type="primary" @click="saveData">保存</el-button>
<el-button @click="editDeviceDialog = false">取消</el-button>
</div>
</template>
</el-dialog>
@ -411,8 +411,8 @@
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="editAddDeviceDialog = false">取消</el-button>
<el-button @click="saveAddData">提交</el-button>
<el-button type="primary" @click="saveAddData">保存</el-button>
<el-button @click="editAddDeviceDialog = false">取消</el-button>
</div>
</template>
</el-dialog>
@ -421,8 +421,8 @@
<span>确定是否删除?</span>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="dialogDeviceDeletion1">保存</el-button>
<el-button @click="dialogDeviceDeletion = false">取消</el-button>
<el-button type="primary" @click="dialogDeviceDeletion1">提交</el-button>
</div>
</template>
</el-dialog>

4
ui/dasadmin/src/views/backend/node/index.vue
View File

@ -20,8 +20,8 @@
</el-form-item>
</el-form>
<template #footer>
<el-button type="primary" @click="submitNodeForm" :disabled="nodeFormDisabled">保存</el-button>
<el-button @click="closeNodeForm">取消</el-button>
<el-button type="primary" @click="submitNodeForm" :disabled="nodeFormDisabled">提交</el-button>
</template>
</el-dialog>
<el-dialog v-model="linkVisible" :title="linkTitle" width="600" @close="closeLinkForm">
@ -40,8 +40,8 @@
</el-form-item>
</el-form>
<template #footer>
<el-button type="primary" @click="submitLinkForm">保存</el-button>
<el-button @click="closeLinkForm">取消</el-button>
<el-button type="primary" @click="submitLinkForm">提交</el-button>
</template>
</el-dialog>
<Container :has-aside="true">

4
ui/dasadmin/src/views/backend/node/protocol.vue
View File

@ -52,8 +52,8 @@
</template>
</el-form>
<template #footer>
<el-button type="primary" @click="submitForm" :disabled="props.disabled">提交</el-button>
<el-button @click="closeForm">关闭</el-button>
<el-button type="primary" @click="submitForm" :disabled="props.disabled">保存</el-button>
<el-button @click="closeForm">取消</el-button>
</template>
</el-dialog>
</template>

2
ui/dasadmin/src/views/backend/node/univer.vue
View File

@ -89,7 +89,7 @@
</el-col>
</el-row>
<template #footer>
<el-button type="primary" @click="submitcorrectionDevice">提交</el-button>
<el-button type="primary" @click="submitcorrectionDevice">保存</el-button>
<el-button @click="closecorrectionDevice">关闭</el-button>
</template>
</el-dialog>

4
ui/dasadmin/src/views/backend/realData/index.vue
View File

@ -79,8 +79,8 @@
</el-row>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="sureBtn">确定</el-button>
<el-button @click="visible = false">关闭</el-button>
<el-button type="primary" @click="sureBtn">保存</el-button>
<el-button @click="visible = false">取消</el-button>
</div>
</template>

2
ui/dasadmin/src/views/backend/report/MulipleReport.vue
View File

@ -118,8 +118,8 @@
</div>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="selectMeasurePoint"> 保存 </el-button>
<el-button @click="showMeasure = false">取消</el-button>
<el-button type="primary" @click="selectMeasurePoint"> 确认 </el-button>
</span>
</template>
</el-dialog>

2
ui/dasadmin/src/views/backend/report/SingleReport.vue
View File

@ -115,8 +115,8 @@
</div>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="selectMeasurePoint"> 保存 </el-button>
<el-button @click="showMeasure = false">取消</el-button>
<el-button type="primary" @click="selectMeasurePoint"> 确认 </el-button>
</span>
</template>
</el-dialog>

2
ui/dasadmin/src/views/backend/routine/attachment/popupForm.vue
View File

@ -120,10 +120,10 @@
</el-scrollbar>
<template #footer>
<div :style="'width: calc(100% - ' + baTable.form.labelWidth! / 1.8 + 'px)'">
<el-button @click="baTable.toggleForm('')">{{ t('Cancel') }}</el-button>
<el-button v-blur :loading="baTable.form.submitLoading" @click="baTable.onSubmit()" type="primary">
{{ baTable.form.operateIds!.length > 1 ? t('Save and edit next item') : t('Save') }}
</el-button>
<el-button @click="baTable.toggleForm('')">{{ t('Cancel') }}</el-button>
</div>
</template>
</el-dialog>

2
ui/dasadmin/src/views/backend/routine/config/add.vue
View File

@ -29,8 +29,8 @@
</el-scrollbar>
<template #footer>
<div :style="'width: calc(100% - ' + state.labelWidth / 1.8 + 'px)'">
<el-button @click="closeForm">{{ t('Cancel') }}</el-button>
<el-button v-blur :loading="state.submitLoading" @click="onAddSubmit()" type="primary"> {{ t('Add') }} </el-button>
<el-button @click="closeForm">{{ t('Cancel') }}</el-button>
</div>
</template>
</el-dialog>

2
ui/dasadmin/src/views/backend/statAnalysis/trendAnalysis.vue
View File

@ -91,8 +91,8 @@
</div>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="selectstatAnalysisAttributes"> 保存 </el-button>
<el-button @click="showMeasure = false">取消</el-button>
<el-button type="primary" @click="selectstatAnalysisAttributes"> 确认 </el-button>
</span>
</template>
</el-dialog>

2
ui/dasadmin/src/views/backend/statAnalysis/trendComparison.vue
View File

@ -97,8 +97,8 @@
</div>
<template #footer>
<span class="dialog-footer">
<el-button type="primary" @click="selectstatAnalysisAttributes"> 保存 </el-button>
<el-button @click="showMeasure = false">取消</el-button>
<el-button type="primary" @click="selectstatAnalysisAttributes"> 确认 </el-button>
</span>
</template>
</el-dialog>