fix: 系统通知

feature/task1.0.0__0514__ch
向文可 3 years ago
parent 02160b4de4
commit cb21c08fea

@ -1,2 +1,2 @@
VITE_BASE_URL=/api VITE_BASE_URL=/api
VITE_REQUEST_TIMEOUT=5000 VITE_REQUEST_TIMEOUT=10000

@ -1,53 +1,55 @@
<template> <template>
<TableList <div class="list-container">
v-loading="loading" <TableList
:code="code" v-loading="loading"
:config="config" :code="code"
:data="list" :config="config"
:operation="['create', 'search']" :data="list"
:reset="handleReset" :operation="['create', 'search']"
title="消息通知" :reset="handleReset"
:total="total" title="消息通知"
@create="handleCreate" :total="total"
@remove="handleRemove" @create="handleCreate"
@search="handleSearch" @remove="handleRemove"
> @search="handleSearch"
<template #search> >
<el-form inline> <template #search>
<el-form inline>
<el-form-item label="消息标题" prop="title">
<el-input v-model="state.condition.title" />
</el-form-item>
<el-form-item label="发布时间" prop="dateRange">
<el-input v-model="state.condition.dateRange" />
</el-form-item>
</el-form>
</template>
</TableList>
<el-dialog v-model="formState.formVisible" :title="formState.form.id ? '查看' : '添加' + '通知'">
<el-form
ref="refsForm"
:disabled="!!formState.form.id"
label-width="100px"
:model="formState.form"
:rules="formState.rules"
>
<el-form-item label="消息标题" prop="title"> <el-form-item label="消息标题" prop="title">
<el-input v-model="state.condition.title" /> <el-input v-model="formState.form.title" />
</el-form-item>
<el-form-item label="消息内容" prop="content">
<el-input v-model="formState.form.content" :autosize="{ minRows: 3, maxRows: 5 }" type="textarea" />
</el-form-item> </el-form-item>
<el-form-item label="发布时间" prop="dateRange"> <el-form-item label="链接跳转" prop="linkJump">
<el-input v-model="state.condition.dateRange" /> <el-input v-model="formState.form.linkJump" />
</el-form-item> </el-form-item>
</el-form> </el-form>
</template> <template #footer>
</TableList> <el-button @click="formState.formVisible = false">取消</el-button>
<el-dialog v-model="formState.formVisible" :title="formState.form.id ? '查看' : '添加' + '通知'"> <el-button v-if="!formState.form.id" :loading="formState.submitting" type="primary" @click="handleSave">
<el-form 保存
ref="refsForm" </el-button>
:disabled="!!formState.form.id" </template>
label-width="100px" </el-dialog>
:model="formState.form" </div>
:rules="formState.rules"
>
<el-form-item label="消息标题" prop="title">
<el-input v-model="formState.form.title" />
</el-form-item>
<el-form-item label="消息内容" prop="content">
<el-input v-model="formState.form.content" :autosize="{ minRows: 3, maxRows: 5 }" type="textarea" />
</el-form-item>
<el-form-item label="链接跳转" prop="linkJump">
<el-input v-model="formState.form.linkJump" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="formState.formVisible = false">取消</el-button>
<el-button v-if="!formState.form.id" :loading="formState.submitting" type="primary" @click="handleSave">
保存
</el-button>
</template>
</el-dialog>
</template> </template>
<script setup lang="jsx"> <script setup lang="jsx">
@ -120,10 +122,7 @@
try { try {
await unref(refsForm).validate(); await unref(refsForm).validate();
let data = _.cloneDeep(formState.form); let data = _.cloneDeep(formState.form);
data.activityStartTime = data.time[0]; await store.dispatch('notify/save', data);
data.activityEndTime = data.time[1];
delete data.time;
await store.dispatch('limitActivity/save', data);
formState.formVisible = false; formState.formVisible = false;
} catch (e) { } catch (e) {
console.info('取消保存', e); console.info('取消保存', e);
@ -131,12 +130,10 @@
formState.submitting = false; formState.submitting = false;
}; };
const handleRemove = async (rows) => { const handleRemove = async (rows) => {
loading.value = true; store.dispatch(
await store.dispatch(
'notify/remove', 'notify/remove',
rows.map((item) => item.id) rows.map((item) => item.id)
); );
loading.value = false;
}; };
const config = reactive({ const config = reactive({
// //

@ -23,9 +23,9 @@ export default (configEnv) => {
// target: 'http://192.168.10.109:8090/', // 显雨 // target: 'http://192.168.10.109:8090/', // 显雨
// target: 'http://192.168.10.251:8090', // 高玉 // target: 'http://192.168.10.251:8090', // 高玉
// target: 'http://192.168.10.67:8090', // 罗战 // target: 'http://192.168.10.67:8090', // 罗战
// target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址 target: 'https://k8s-horse-gateway.mashibing.cn/', // 测试地址
// target: 'https://gateway.mashibing.cn', // 预发地址 // target: 'https://gateway.mashibing.cn', // 预发地址
target: 'https://like-gateway.mashibing.com', // 生产环境 // target: 'https://like-gateway.mashibing.com', // 生产环境
changeOrigin: true, changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, ''), rewrite: (path) => path.replace(/^\/api/, ''),
}, },

Loading…
Cancel
Save