From cb21c08fea159f44935d88c39e3e64282fe70a35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=91=E6=96=87=E5=8F=AF?= <1041367524@qq.com>
Date: Thu, 28 Apr 2022 14:48:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=B3=BB=E7=BB=9F=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                              |   2 +-
 src/views/system/notify/index.vue | 101 +++++++++++++++---------------
 vite.config.js                    |   4 +-
 3 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/.env b/.env
index b0b3475..6aa2094 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
 VITE_BASE_URL=/api
-VITE_REQUEST_TIMEOUT=5000
+VITE_REQUEST_TIMEOUT=10000
diff --git a/src/views/system/notify/index.vue b/src/views/system/notify/index.vue
index 05dcc84..cdd9986 100644
--- a/src/views/system/notify/index.vue
+++ b/src/views/system/notify/index.vue
@@ -1,53 +1,55 @@
 <template>
-    <TableList
-        v-loading="loading"
-        :code="code"
-        :config="config"
-        :data="list"
-        :operation="['create', 'search']"
-        :reset="handleReset"
-        title="消息通知"
-        :total="total"
-        @create="handleCreate"
-        @remove="handleRemove"
-        @search="handleSearch"
-    >
-        <template #search>
-            <el-form inline>
+    <div class="list-container">
+        <TableList
+            v-loading="loading"
+            :code="code"
+            :config="config"
+            :data="list"
+            :operation="['create', 'search']"
+            :reset="handleReset"
+            title="消息通知"
+            :total="total"
+            @create="handleCreate"
+            @remove="handleRemove"
+            @search="handleSearch"
+        >
+            <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-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 label="发布时间" prop="dateRange">
-                    <el-input v-model="state.condition.dateRange" />
+                <el-form-item label="链接跳转" prop="linkJump">
+                    <el-input v-model="formState.form.linkJump" />
                 </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-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 #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>
+    </div>
 </template>
 
 <script setup lang="jsx">
@@ -120,10 +122,7 @@
         try {
             await unref(refsForm).validate();
             let data = _.cloneDeep(formState.form);
-            data.activityStartTime = data.time[0];
-            data.activityEndTime = data.time[1];
-            delete data.time;
-            await store.dispatch('limitActivity/save', data);
+            await store.dispatch('notify/save', data);
             formState.formVisible = false;
         } catch (e) {
             console.info('取消保存', e);
@@ -131,12 +130,10 @@
         formState.submitting = false;
     };
     const handleRemove = async (rows) => {
-        loading.value = true;
-        await store.dispatch(
+        store.dispatch(
             'notify/remove',
             rows.map((item) => item.id)
         );
-        loading.value = false;
     };
     const config = reactive({
         // 表格列配置
diff --git a/vite.config.js b/vite.config.js
index 803dfae..b9f7f34 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,9 +23,9 @@ export default (configEnv) => {
                     // target: 'http://192.168.10.109:8090/', // 显雨
                     // target: 'http://192.168.10.251: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://like-gateway.mashibing.com', // 生产环境
+                    // target: 'https://like-gateway.mashibing.com', // 生产环境
                     changeOrigin: true,
                     rewrite: (path) => path.replace(/^\/api/, ''),
                 },