From f22707cc667d94c44f753fe5f842a64e4f5c1ad8 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Wed, 31 Jan 2024 17:33:54 +0800
Subject: [PATCH] 提交改成保存
---
src/views/cGovernance/taskECall.vue | 2
src/views/resource/oss.vue | 2
src/views/property/companyManage.vue | 11
src/views/resource/distapch.vue | 224 ++++++++--------
src/views/system/email.vue | 601 ++++++++++++++++++++----------------------
5 files changed, 410 insertions(+), 430 deletions(-)
diff --git a/src/views/cGovernance/taskECall.vue b/src/views/cGovernance/taskECall.vue
index 7fde9dc..2508504 100644
--- a/src/views/cGovernance/taskECall.vue
+++ b/src/views/cGovernance/taskECall.vue
@@ -215,7 +215,7 @@
{
label: "事发位置",
prop: "location",
- submitBtn: "提交",
+ submitBtn: "保存",
hide: true,
type: 'map',
dataType: "string",
diff --git a/src/views/property/companyManage.vue b/src/views/property/companyManage.vue
index 7cbf8a6..4b80a99 100644
--- a/src/views/property/companyManage.vue
+++ b/src/views/property/companyManage.vue
@@ -142,10 +142,7 @@
created () {
this.initBasicInfo()
- let param = {
- subclassName: '基础信息'
- }
- this.questionBankOnLoad(this.page, param)
+ this.questionBankOnLoad(this.page)
},
methods: {
@@ -165,7 +162,6 @@
message: "操作成功!",
})
this.initBasicInfo()
- done()
},
(error) => {
window.console.log(error)
@@ -175,7 +171,7 @@
},
// 获取题目
- questionBankOnLoad (page, params = {}) {
+ questionBankOnLoad (page, params = { subclassName: '基础信息' }) {
getList(
page.currentPage,
page.pageSize,
@@ -198,6 +194,7 @@
type: "success",
message: "操作成功!",
})
+ this.questionBankOnLoad(this.page)
},
(error) => {
window.console.log(error)
@@ -213,7 +210,7 @@
this.questionBankOnLoad(this.page, param)
},
- // 提交按钮
+ // 保存按钮
handleSubmit () {
// 保存基本信息
this.saveBasicInfo()
diff --git a/src/views/resource/distapch.vue b/src/views/resource/distapch.vue
index 5b7f8a8..a7ab315 100644
--- a/src/views/resource/distapch.vue
+++ b/src/views/resource/distapch.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container v-if="false">
+ <basic-container v-if="false">
<avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
:before-open="beforeOpen" @search-change="searchChange" @search-reset="searchReset"
@@ -31,9 +31,9 @@
</template>
<template slot-scope="{type,disabled}" slot="cronForm">
- <el-input placeholder="请选择cron">
- <el-button slot="append" icon="el-icon-s-tools" @click="handlerClick()"></el-button>
- </el-input>
+ <el-input placeholder="请选择cron">
+ <el-button slot="append" icon="el-icon-s-tools" @click="handlerClick()"></el-button>
+ </el-input>
</template>
@@ -45,20 +45,20 @@
-
+
<el-dialog title="Cron" append-to-body :visible.sync="cronPopover" width="550px">
- <!-- <el-popover v-model="cronPopover"> -->
+ <!-- <el-popover v-model="cronPopover"> -->
<!-- <div> 测试 </div> -->
- <vueCron @change="changeCron" @close="cronPopover=false" i18n="cn"/>
- <!-- <el-input
+ <vueCron @change="changeCron" @close="cronPopover = false" i18n="cn" />
+ <!-- <el-input
slot="reference"
v-model="ruleForm.execTime"
placeholder="定时策略"
@click="cronPopover=true"
/> -->
- <!-- </el-popover> -->
- </el-dialog>
+ <!-- </el-popover> -->
+ </el-dialog>
</basic-container>
</template>
@@ -69,7 +69,7 @@
import func from "@/util/func"
import vueCron from 'vue-cron'
export default {
- components:{
+ components: {
vueCron
},
data () {
@@ -78,7 +78,7 @@
query: {},
loading: true,
box: false,
- cronPopover:false,
+ cronPopover: false,
page: {
pageSize: 10,
currentPage: 1,
@@ -224,101 +224,101 @@
display: false
},
],
- group:[
- {
- label: '基础配置',
- prop: 'jbxx',
- column: [
- {
- label: '执行器',
- prop: '',
- type: 'select',
- },
- {
- label: '任务描述',
- prop: ''
- },
- {
- label: '负责人',
- prop: '',
-
- },
- {
- label: '报警邮件',
- prop: ''
- }
- ]
- },
- {
- label: '调度配置',
- prop: 'jbxx',
- column: [
- {
- label: '调度类型',
- prop: '',
- type: 'select',
- },
- {
- label: 'Cron',
- prop: 'cron',
- formslot:true,
- }
- ]
- },
- {
- label: '任务配置',
- prop: 'jbxx',
- column: [
- {
- label: '运行模式',
- prop: '',
- type: 'select',
- },
- {
- label: 'JobHandler',
- prop: ''
- },
- {
- label: '任务参数',
- prop: '',
- type: 'textarea',
- span:24
- }
- ]
- },
- {
- label: '高级配置',
- prop: 'jbxx',
- column: [
- {
- label: '调度类型',
- prop: '',
- type: 'select',
- },
- {
- label: '子任务ID',
- prop: ''
- },
- {
- label: '调度类型',
- prop: '',
- type: 'select',
- },
- {
- label: '任务参数',
- prop: '',
- type: 'select',
- },
- {
- label: '任务超时时间',
- prop: '',
- },
- {
- label: '失败重试次数',
- prop: '',
- }
- ]
- },
+ group: [
+ {
+ label: '基础配置',
+ prop: 'jbxx',
+ column: [
+ {
+ label: '执行器',
+ prop: '',
+ type: 'select',
+ },
+ {
+ label: '任务描述',
+ prop: ''
+ },
+ {
+ label: '负责人',
+ prop: '',
+
+ },
+ {
+ label: '报警邮件',
+ prop: ''
+ }
+ ]
+ },
+ {
+ label: '调度配置',
+ prop: 'jbxx',
+ column: [
+ {
+ label: '调度类型',
+ prop: '',
+ type: 'select',
+ },
+ {
+ label: 'Cron',
+ prop: 'cron',
+ formslot: true,
+ }
+ ]
+ },
+ {
+ label: '任务配置',
+ prop: 'jbxx',
+ column: [
+ {
+ label: '运行模式',
+ prop: '',
+ type: 'select',
+ },
+ {
+ label: 'JobHandler',
+ prop: ''
+ },
+ {
+ label: '任务参数',
+ prop: '',
+ type: 'textarea',
+ span: 24
+ }
+ ]
+ },
+ {
+ label: '高级配置',
+ prop: 'jbxx',
+ column: [
+ {
+ label: '调度类型',
+ prop: '',
+ type: 'select',
+ },
+ {
+ label: '子任务ID',
+ prop: ''
+ },
+ {
+ label: '调度类型',
+ prop: '',
+ type: 'select',
+ },
+ {
+ label: '任务参数',
+ prop: '',
+ type: 'select',
+ },
+ {
+ label: '任务超时时间',
+ prop: '',
+ },
+ {
+ label: '失败重试次数',
+ prop: '',
+ }
+ ]
+ },
]
},
data: [],
@@ -326,7 +326,7 @@
code: '',
},
debugOption: {
- submitText: "提交",
+ submitText: "保存",
column: [
{
label: "资源编号",
@@ -388,8 +388,8 @@
},
methods: {
- changeCron(val){
- console.log("===>",val);
+ changeCron (val) {
+ console.log("===>", val)
},
rowSave (row, done, loading) {
@@ -531,9 +531,9 @@
this.selectionClear()
})
},
- handlerClick(){
+ handlerClick () {
console.log("111")
- this.cronPopover = true;
+ this.cronPopover = true
}
}
}
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index 9ea5700..e6cd156 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -188,7 +188,7 @@
code: '',
},
debugOption: {
- submitText: "提交",
+ submitText: "保存",
column: [
{
label: "资源编号",
diff --git a/src/views/system/email.vue b/src/views/system/email.vue
index 1a40c96..c3a8751 100644
--- a/src/views/system/email.vue
+++ b/src/views/system/email.vue
@@ -1,339 +1,322 @@
<template>
- <basic-container>
- <avue-crud :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad">
- <template slot="menuLeft">
- <el-button type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.email_delete"
- @click="handleDelete">删 除
- </el-button>
- </template>
+ <basic-container>
+ <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
+ :before-open="beforeOpen" v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave"
+ @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
+ @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+ <template slot="menuLeft">
+ <el-button type="danger" size="small" icon="el-icon-delete" plain v-if="permission.email_delete"
+ @click="handleDelete">删 除
+ </el-button>
+ </template>
- <template slot-scope="{row, size}" slot="status">
- <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
- </template>
+ <template slot-scope="{row, size}" slot="status">
+ <el-tag :size="size" :type="row.statusName == '是' ? 'success' : 'info'">{{ row.statusName }}</el-tag>
+ </template>
- <template slot-scope="{ row, size, index }" slot="menu">
- <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.email_enable"
- @click.stop="handleEnable(row)">启用
- </el-button>
- <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
- @click="handleDebug(row)">调试
- </el-button>
- </template>
+ <template slot-scope="{ row, size, index }" slot="menu">
+ <el-button :size="size" type="text" icon="el-icon-circle-check" v-if="permission.email_enable"
+ @click.stop="handleEnable(row)">启用
+ </el-button>
+ <el-button :size="size" type="text" icon="el-icon-video-play" v-if="userInfo.role_name.includes('admin')"
+ @click="handleDebug(row)">调试
+ </el-button>
+ </template>
- </avue-crud>
+ </avue-crud>
- <el-dialog title="短信发送调试" append-to-body :visible.sync="box" width="550px">
- <avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
- </el-dialog>
+ <el-dialog title="短信发送调试" append-to-body :visible.sync="box" width="550px">
+ <avue-form ref="form" :option="debugOption" v-model="debugForm" @submit="handleSubmit" />
+ </el-dialog>
- </basic-container>
+ </basic-container>
</template>
<script>
-import {getList, getDetail, add, update, remove, enable, sendEmail} from "@/api/system/email";
- import {mapGetters} from "vuex";
+import { getList, getDetail, add, update, remove, enable, sendEmail } from "@/api/system/email"
+import { mapGetters } from "vuex"
- export default {
- data() {
- return {
- box:false,
- form: {},
- query: {},
- loading: true,
- page: {
- pageSize: 10,
- currentPage: 1,
- total: 0
- },
- selectionList: [],
- option: {height:'auto',
- calcHeight: 30,
- tip: false,
- searchShow: true,
- searchMenuSpan: 6,
- border: true,
- index: true,
- viewBtn: true,
- selection: true,
- dialogClickModal: false,
- menuWidth: 350,
- column: [
- {
- label: "主键",
- prop: "id",
- type: "input",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- hide: true,
+export default {
+ data () {
+ return {
+ box: false,
+ form: {},
+ query: {},
+ loading: true,
+ page: {
+ pageSize: 10,
+ currentPage: 1,
+ total: 0
},
- {
- label: "发送者邮箱",
- prop: "username",
- type: "input",
+ selectionList: [],
+ option: {
+ height: 'auto',
+ calcHeight: 30,
+ tip: false,
+ searchShow: true,
+ searchMenuSpan: 6,
+ border: true,
+ index: true,
+ viewBtn: true,
+ selection: true,
+ dialogClickModal: false,
+ menuWidth: 350,
+ column: [
+ {
+ label: "主键",
+ prop: "id",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ hide: true,
+ },
+ {
+ label: "发送者邮箱",
+ prop: "username",
+ type: "input",
+ },
+ {
+ label: "授权码",
+ prop: "password",
+ type: "input",
+ },
+ {
+ label: "服务器地址",
+ prop: "host",
+ type: "input",
+ },
+ {
+ label: "端口号",
+ prop: "port",
+ type: "input",
+ value: 465
+ },
+ {
+ label: "默认编码",
+ prop: "defaultEncoding",
+ type: "input",
+ value: "UTF-8"
+ },
+ {
+ label: "协议",
+ prop: "protocol",
+ type: "input",
+ value: "smtps"
+ },
+ {
+ label: "备注",
+ prop: "remark",
+ type: "input",
+ },
+ {
+ label: "是否启用",
+ prop: "status",
+ type: "input",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ },
+ ]
},
- {
- label: "授权码",
- prop: "password",
- type: "input",
- },
- {
- label: "服务器地址",
- prop: "host",
- type: "input",
- },
- {
- label: "端口号",
- prop: "port",
- type: "input",
- value:465
- },
- {
- label: "默认编码",
- prop: "defaultEncoding",
- type: "input",
- value:"UTF-8"
- },
- {
- label: "协议",
- prop: "protocol",
- type: "input",
- value: "smtps"
- },
- {
- label: "备注",
- prop: "remark",
- type: "input",
- },
- {
- label: "是否启用",
- prop: "status",
- type: "input",
- addDisplay: false,
- editDisplay: false,
- viewDisplay: false,
- },
- ]},
- data: [],
+ data: [],
- debugForm: {},
- debugOption: {
- submitText: "提交",
- column: [
- {
- label: "收件人",
- prop: "emails",
- placeholder:"多个收件人请用英文逗号进行分隔",
- span: 24,
- },
- {
- label: "主题",
- prop: "subject",
- span: 24,
- },
- {
- label: "内容",
- prop: "content",
- type:"textarea",
- minRow:5,
- span: 24,
- },
- ]
+ debugForm: {},
+ debugOption: {
+ submitText: "保存",
+ column: [
+ {
+ label: "收件人",
+ prop: "emails",
+ placeholder: "多个收件人请用英文逗号进行分隔",
+ span: 24,
+ },
+ {
+ label: "主题",
+ prop: "subject",
+ span: 24,
+ },
+ {
+ label: "内容",
+ prop: "content",
+ type: "textarea",
+ minRow: 5,
+ span: 24,
+ },
+ ]
+ }
+
}
-
- };
},
computed: {
- ...mapGetters(["permission","userInfo"]),
- permissionList() {
- return {
- addBtn: this.vaildData(this.permission.email_add, false),
- viewBtn: this.vaildData(this.permission.email_view, false),
- delBtn: this.vaildData(this.permission.email_delete, false),
- editBtn: this.vaildData(this.permission.email_edit, false)
- };
- },
- ids() {
- let ids = [];
- this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(",");
- }
+ ...mapGetters(["permission", "userInfo"]),
+ permissionList () {
+ return {
+ addBtn: this.vaildData(this.permission.email_add, false),
+ viewBtn: this.vaildData(this.permission.email_view, false),
+ delBtn: this.vaildData(this.permission.email_delete, false),
+ editBtn: this.vaildData(this.permission.email_edit, false)
+ }
+ },
+ ids () {
+ let ids = []
+ this.selectionList.forEach(ele => {
+ ids.push(ele.id)
+ })
+ return ids.join(",")
+ }
},
methods: {
- handleSubmit (form, done) {
- console.log(form,"+++++++++")
+ handleSubmit (form, done) {
+ console.log(form, "+++++++++")
- form.emails = form.emails.split(",")
+ form.emails = form.emails.split(",")
- sendEmail(form).then(res=>{
- this.$message({
- type: "success",
- message: "发送成功!"
- });
- })
- done()
- },
- rowSave(row, done, loading) {
- add(row).then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- done();
- }, error => {
- loading();
- window.console.log(error);
- });
- },
- rowUpdate(row, index, done, loading) {
- update(row).then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- done();
- }, error => {
- loading();
- console.log(error);
- });
- },
- rowDel(row) {
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(row.id);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- });
- },
- handleDebug (row) {
- console.log(row,"++++++++++")
- this.box = true
- },
- handleEnable (row) {
- this.$confirm("是否确定启用这条配置?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return enable(row.id)
- })
- .then(() => {
- this.onLoad(this.page)
- this.$message({
- type: "success",
- message: "操作成功!"
+ sendEmail(form).then(res => {
+ this.$message({
+ type: "success",
+ message: "发送成功!"
+ })
})
+ done()
+ },
+ rowSave (row, done, loading) {
+ add(row).then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ done()
+ }, error => {
+ loading()
+ window.console.log(error)
+ })
+ },
+ rowUpdate (row, index, done, loading) {
+ update(row).then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ done()
+ }, error => {
+ loading()
+ console.log(error)
+ })
+ },
+ rowDel (row) {
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ })
+ },
+ handleDebug (row) {
+ console.log(row, "++++++++++")
+ this.box = true
+ },
+ handleEnable (row) {
+ this.$confirm("是否确定启用这条配置?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return enable(row.id)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ handleDelete () {
+ if (this.selectionList.length === 0) {
+ this.$message.warning("请选择至少一条数据")
+ return
+ }
+ this.$confirm("确定将选择数据删除?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
+ .then(() => {
+ return remove(this.ids)
+ })
+ .then(() => {
+ this.onLoad(this.page)
+ this.$message({
+ type: "success",
+ message: "操作成功!"
+ })
+ this.$refs.crud.toggleSelection()
+ })
+ },
+ beforeOpen (done, type) {
+ if (["edit", "view"].includes(type)) {
+ getDetail(this.form.id).then(res => {
+ this.form = res.data.data
+ })
+ }
+ done()
+ },
+ searchReset () {
+ this.query = {}
+ this.onLoad(this.page)
+ },
+ searchChange (params, done) {
+ this.query = params
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
+ },
+ selectionChange (list) {
+ this.selectionList = list
+ },
+ selectionClear () {
+ this.selectionList = []
this.$refs.crud.toggleSelection()
- })
- },
- handleDelete() {
- if (this.selectionList.length === 0) {
- this.$message.warning("请选择至少一条数据");
- return;
+ },
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ },
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ },
+ refreshChange () {
+ this.onLoad(this.page, this.query)
+ },
+ onLoad (page, params = {}) {
+ this.loading = true
+ getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+ const data = res.data.data
+ this.page.total = data.total
+ this.data = data.records
+ this.loading = false
+ this.selectionClear()
+ })
}
- this.$confirm("确定将选择数据删除?", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- })
- .then(() => {
- return remove(this.ids);
- })
- .then(() => {
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "操作成功!"
- });
- this.$refs.crud.toggleSelection();
- });
- },
- beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then(res => {
- this.form = res.data.data;
- });
- }
- done();
- },
- searchReset() {
- this.query = {};
- this.onLoad(this.page);
- },
- searchChange(params, done) {
- this.query = params;
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
- },
- selectionChange(list) {
- this.selectionList = list;
- },
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
- },
- currentChange(currentPage){
- this.page.currentPage = currentPage;
- },
- sizeChange(pageSize){
- this.page.pageSize = pageSize;
- },
- refreshChange() {
- this.onLoad(this.page, this.query);
- },
- onLoad(page, params = {}) {
- this.loading = true;
- getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- });
- }
}
- };
+}
</script>
-<style>
-</style>
+<style></style>
--
Gitblit v1.9.3