Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

public/locales/en-US.json

@@ -303,7 +303,9 @@
         "add1": "Add",
         "refuse": "Review Rejected",
         "agree": "Review Approved",
-        "modifypwd": "Change password"
+        "modifypwd": "Modify password",
+        "loginout": "系统登出",
+        "record": "暂存"
     },
     "investor": {
         "custom": {
@@ -1723,6 +1725,116 @@
             "content": "Message content",
             "userid": "Receiving dealer",
             "isforcedisplay": "Is it mandatory to pop up?"
+        },
+        "news": {
+            "columnname": "资讯类型",
+            "title": "标题",
+            "srcname": "来源",
+            "author": "作者",
+            "istop": "是否置顶",
+            "isshow": "是否展示",
+            "publishdate": "发布日期",
+            "status": "状态",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columnid": "类型",
+            "audit": {
+                "title": "提示",
+                "tips1": "审核通过",
+                "tips2": "审核不通过",
+                "tips3": "确认审核通过？",
+                "tips4": "确认审核拒绝？"
+            },
+            "details": {
+                "title1": "详情",
+                "columnname": "所属栏目",
+                "author": "作者",
+                "srcname": "来源",
+                "hits": "点击量",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "publishdate": "发布日期",
+                "coverimage": "缩略图",
+                "title": "标题",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "delete": {
+                "tips": "确认删除？"
+            },
+            "edit": {
+                "title1": "标题",
+                "columnid": "所属栏目",
+                "author": "作者",
+                "srcid": "来源",
+                "hits": "点击量",
+                "publishdate": "发布日期",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "coverimage": "缩略图",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "status1": {
+                "tips1": "确认设置为不展示？",
+                "tips2": "确认设置为展示？"
+            }
+        },
+        "newssource": {
+            "imageurl": "来源LOGO",
+            "membername": "来源名称",
+            "membertags": "来源网址",
+            "smembername": "来源名称",
+            "delete": {
+                "tips": "您确定要删除该数据吗？"
+            },
+            "details": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO",
+                "updatetime": "更新时间"
+            },
+            "edit": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO"
+            }
+        },
+        "newscolumn": {
+            "columnname": "栏目名称",
+            "sort": "排序",
+            "isshow": "是否展示",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columntype": "栏目类型",
+            "delete": {
+                "tips1": "确认删除栏目？",
+                "tips2": "栏目下明细将同步删除且不可恢复！"
+            },
+            "details": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "isshow": "是否展示",
+                "creatoruser": "创建人",
+                "creaedate": "创建时间",
+                "modifieruser": "操作人",
+                "updatedate": "修改时间"
+            },
+            "edit": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "sort": "排序",
+                "isshow": "是否展示"
+            }
+        },
+        "sms": {
+            "columnname": "接收手机号",
+            "title": "消息模板",
+            "srcname": "发送状态",
+            "author": "错误信息",
+            "istop": "发送时间",
+            "status": "发送状态",
+            "recvphone": "接收手机号"
         }
     },
     "performance": {

public/locales/th-TH.json

@@ -303,7 +303,9 @@
         "add1": "เพิ่ม",
         "refuse": "ตรวจสอบแล้วปฏิเสธ",
         "agree": "ตรวจสอบแล้วอนุมัติ",
-        "modifypwd": "เปลี่ยนรหัสผ่าน"
+        "modifypwd": "เปลี่ยนรหัสผ่าน",
+        "loginout": "系统登出",
+        "record": "暂存"
     },
     "investor": {
         "custom": {
@@ -1723,6 +1725,116 @@
             "content": "เนื้อหาข่าวสาร",
             "userid": "พันธุ์หุ้นที่รับ",
             "isforcedisplay": "ต้องการให้ปรากฏขึ้นโดยบังคับหรือไม่"
+        },
+        "news": {
+            "columnname": "资讯类型",
+            "title": "标题",
+            "srcname": "来源",
+            "author": "作者",
+            "istop": "是否置顶",
+            "isshow": "是否展示",
+            "publishdate": "发布日期",
+            "status": "状态",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columnid": "类型",
+            "audit": {
+                "title": "提示",
+                "tips1": "审核通过",
+                "tips2": "审核不通过",
+                "tips3": "确认审核通过？",
+                "tips4": "确认审核拒绝？"
+            },
+            "details": {
+                "title1": "详情",
+                "columnname": "所属栏目",
+                "author": "作者",
+                "srcname": "来源",
+                "hits": "点击量",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "publishdate": "发布日期",
+                "coverimage": "缩略图",
+                "title": "标题",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "delete": {
+                "tips": "确认删除？"
+            },
+            "edit": {
+                "title1": "标题",
+                "columnid": "所属栏目",
+                "author": "作者",
+                "srcid": "来源",
+                "hits": "点击量",
+                "publishdate": "发布日期",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "coverimage": "缩略图",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "status1": {
+                "tips1": "确认设置为不展示？",
+                "tips2": "确认设置为展示？"
+            }
+        },
+        "newssource": {
+            "imageurl": "来源LOGO",
+            "membername": "来源名称",
+            "membertags": "来源网址",
+            "smembername": "来源名称",
+            "delete": {
+                "tips": "您确定要删除该数据吗？"
+            },
+            "details": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO",
+                "updatetime": "更新时间"
+            },
+            "edit": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO"
+            }
+        },
+        "newscolumn": {
+            "columnname": "栏目名称",
+            "sort": "排序",
+            "isshow": "是否展示",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columntype": "栏目类型",
+            "delete": {
+                "tips1": "确认删除栏目？",
+                "tips2": "栏目下明细将同步删除且不可恢复！"
+            },
+            "details": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "isshow": "是否展示",
+                "creatoruser": "创建人",
+                "creaedate": "创建时间",
+                "modifieruser": "操作人",
+                "updatedate": "修改时间"
+            },
+            "edit": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "sort": "排序",
+                "isshow": "是否展示"
+            }
+        },
+        "sms": {
+            "columnname": "接收手机号",
+            "title": "消息模板",
+            "srcname": "发送状态",
+            "author": "错误信息",
+            "istop": "发送时间",
+            "status": "发送状态",
+            "recvphone": "接收手机号"
         }
     },
     "performance": {

public/locales/vi-VN.json

@@ -303,7 +303,9 @@
         "add1": "Tăng",
         "refuse": "Từ chối xét duỵêt",
         "agree": "Xét duyệt thành công",
-        "modifypwd": "Đổi mật khẩu"
+        "modifypwd": "Đổi mật khẩu",
+        "loginout": "系统登出",
+        "record": "暂存"
     },
     "investor": {
         "custom": {
@@ -1723,6 +1725,116 @@
             "content": "Nội dung tin nhắn",
             "userid": "Thương gia giao dịch nhận",
             "isforcedisplay": "Bắt buộc hiển thị?"
+        },
+        "news": {
+            "columnname": "资讯类型",
+            "title": "标题",
+            "srcname": "来源",
+            "author": "作者",
+            "istop": "是否置顶",
+            "isshow": "是否展示",
+            "publishdate": "发布日期",
+            "status": "状态",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columnid": "类型",
+            "audit": {
+                "title": "提示",
+                "tips1": "审核通过",
+                "tips2": "审核不通过",
+                "tips3": "确认审核通过？",
+                "tips4": "确认审核拒绝？"
+            },
+            "details": {
+                "title1": "详情",
+                "columnname": "所属栏目",
+                "author": "作者",
+                "srcname": "来源",
+                "hits": "点击量",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "publishdate": "发布日期",
+                "coverimage": "缩略图",
+                "title": "标题",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "delete": {
+                "tips": "确认删除？"
+            },
+            "edit": {
+                "title1": "标题",
+                "columnid": "所属栏目",
+                "author": "作者",
+                "srcid": "来源",
+                "hits": "点击量",
+                "publishdate": "发布日期",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "coverimage": "缩略图",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "status1": {
+                "tips1": "确认设置为不展示？",
+                "tips2": "确认设置为展示？"
+            }
+        },
+        "newssource": {
+            "imageurl": "来源LOGO",
+            "membername": "来源名称",
+            "membertags": "来源网址",
+            "smembername": "来源名称",
+            "delete": {
+                "tips": "您确定要删除该数据吗？"
+            },
+            "details": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO",
+                "updatetime": "更新时间"
+            },
+            "edit": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO"
+            }
+        },
+        "newscolumn": {
+            "columnname": "栏目名称",
+            "sort": "排序",
+            "isshow": "是否展示",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columntype": "栏目类型",
+            "delete": {
+                "tips1": "确认删除栏目？",
+                "tips2": "栏目下明细将同步删除且不可恢复！"
+            },
+            "details": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "isshow": "是否展示",
+                "creatoruser": "创建人",
+                "creaedate": "创建时间",
+                "modifieruser": "操作人",
+                "updatedate": "修改时间"
+            },
+            "edit": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "sort": "排序",
+                "isshow": "是否展示"
+            }
+        },
+        "sms": {
+            "columnname": "接收手机号",
+            "title": "消息模板",
+            "srcname": "发送状态",
+            "author": "错误信息",
+            "istop": "发送时间",
+            "status": "发送状态",
+            "recvphone": "接收手机号"
         }
     },
     "performance": {

public/locales/zh-CN.json

@@ -303,7 +303,9 @@
         "add1": "增加",
         "refuse": "审核拒绝",
         "agree": "审核通过",
-        "modifypwd": "修改密码"
+        "modifypwd": "修改密码",
+        "loginout": "系统登出",
+        "record": "暂存"
     },
     "investor": {
         "custom": {
@@ -1723,6 +1725,116 @@
             "content": "消息内容",
             "userid": "接收交易商",
             "isforcedisplay": "是否强制弹出"
+        },
+        "news": {
+            "columnname": "资讯类型",
+            "title": "标题",
+            "srcname": "来源",
+            "author": "作者",
+            "istop": "是否置顶",
+            "isshow": "是否展示",
+            "publishdate": "发布日期",
+            "status": "状态",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columnid": "类型",
+            "audit": {
+                "title": "提示",
+                "tips1": "审核通过",
+                "tips2": "审核不通过",
+                "tips3": "确认审核通过？",
+                "tips4": "确认审核拒绝？"
+            },
+            "details": {
+                "title1": "详情",
+                "columnname": "所属栏目",
+                "author": "作者",
+                "srcname": "来源",
+                "hits": "点击量",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "publishdate": "发布日期",
+                "coverimage": "缩略图",
+                "title": "标题",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "delete": {
+                "tips": "确认删除？"
+            },
+            "edit": {
+                "title1": "标题",
+                "columnid": "所属栏目",
+                "author": "作者",
+                "srcid": "来源",
+                "hits": "点击量",
+                "publishdate": "发布日期",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "coverimage": "缩略图",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "status1": {
+                "tips1": "确认设置为不展示？",
+                "tips2": "确认设置为展示？"
+            }
+        },
+        "newssource": {
+            "imageurl": "来源LOGO",
+            "membername": "来源名称",
+            "membertags": "来源网址",
+            "smembername": "来源名称",
+            "delete": {
+                "tips": "您确定要删除该数据吗？"
+            },
+            "details": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO",
+                "updatetime": "更新时间"
+            },
+            "edit": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO"
+            }
+        },
+        "newscolumn": {
+            "columnname": "栏目名称",
+            "sort": "排序",
+            "isshow": "是否展示",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columntype": "栏目类型",
+            "delete": {
+                "tips1": "确认删除栏目？",
+                "tips2": "栏目下明细将同步删除且不可恢复！"
+            },
+            "details": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "isshow": "是否展示",
+                "creatoruser": "创建人",
+                "creaedate": "创建时间",
+                "modifieruser": "操作人",
+                "updatedate": "修改时间"
+            },
+            "edit": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "sort": "排序",
+                "isshow": "是否展示"
+            }
+        },
+        "sms": {
+            "columnname": "接收手机号",
+            "title": "消息模板",
+            "srcname": "发送状态",
+            "author": "错误信息",
+            "istop": "发送时间",
+            "status": "发送状态",
+            "recvphone": "接收手机号"
         }
     },
     "performance": {

public/locales/zh-TW.json

@@ -303,7 +303,9 @@
         "add1": "增加",
         "refuse": "審核拒絕",
         "agree": "審核通過",
-        "modifypwd": "修改密碼"
+        "modifypwd": "修改密碼",
+        "loginout": "系统登出",
+        "record": "暂存"
     },
     "investor": {
         "custom": {
@@ -1723,6 +1725,116 @@
             "content": "消息內容",
             "userid": "接收交易商",
             "isforcedisplay": "是否強制彈出"
+        },
+        "news": {
+            "columnname": "资讯类型",
+            "title": "标题",
+            "srcname": "来源",
+            "author": "作者",
+            "istop": "是否置顶",
+            "isshow": "是否展示",
+            "publishdate": "发布日期",
+            "status": "状态",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columnid": "类型",
+            "audit": {
+                "title": "提示",
+                "tips1": "审核通过",
+                "tips2": "审核不通过",
+                "tips3": "确认审核通过？",
+                "tips4": "确认审核拒绝？"
+            },
+            "details": {
+                "title1": "详情",
+                "columnname": "所属栏目",
+                "author": "作者",
+                "srcname": "来源",
+                "hits": "点击量",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "publishdate": "发布日期",
+                "coverimage": "缩略图",
+                "title": "标题",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "delete": {
+                "tips": "确认删除？"
+            },
+            "edit": {
+                "title1": "标题",
+                "columnid": "所属栏目",
+                "author": "作者",
+                "srcid": "来源",
+                "hits": "点击量",
+                "publishdate": "发布日期",
+                "istop": "是否置顶",
+                "isshow": "是否展示",
+                "coverimage": "缩略图",
+                "brief": "简介",
+                "context": "内容"
+            },
+            "status1": {
+                "tips1": "确认设置为不展示？",
+                "tips2": "确认设置为展示？"
+            }
+        },
+        "newssource": {
+            "imageurl": "来源LOGO",
+            "membername": "来源名称",
+            "membertags": "来源网址",
+            "smembername": "来源名称",
+            "delete": {
+                "tips": "您确定要删除该数据吗？"
+            },
+            "details": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO",
+                "updatetime": "更新时间"
+            },
+            "edit": {
+                "membername": "来源名称",
+                "membertags": "来源网址",
+                "imageurl": "来源LOGO"
+            }
+        },
+        "newscolumn": {
+            "columnname": "栏目名称",
+            "sort": "排序",
+            "isshow": "是否展示",
+            "creatoruser": "创建人",
+            "creaedate": "创建时间",
+            "columntype": "栏目类型",
+            "delete": {
+                "tips1": "确认删除栏目？",
+                "tips2": "栏目下明细将同步删除且不可恢复！"
+            },
+            "details": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "isshow": "是否展示",
+                "creatoruser": "创建人",
+                "creaedate": "创建时间",
+                "modifieruser": "操作人",
+                "updatedate": "修改时间"
+            },
+            "edit": {
+                "columntype": "栏目类型",
+                "columnname": "栏目名称",
+                "sort": "排序",
+                "isshow": "是否展示"
+            }
+        },
+        "sms": {
+            "columnname": "接收手机号",
+            "title": "消息模板",
+            "srcname": "发送状态",
+            "author": "错误信息",
+            "istop": "发送时间",
+            "status": "发送状态",
+            "recvphone": "接收手机号"
         }
     },
     "performance": {

src/packages/pc/components/layouts/header/index.vue

@@ -40,8 +40,8 @@
                 </span>
                 <template #dropdown>
                     <el-dropdown-menu>
-                        <el-dropdown-item :icon="Key">修改密码</el-dropdown-item>
-                        <el-dropdown-item :icon="SwitchButton" @click="eventBus.$emit('Logout')">退出登录</el-dropdown-item>
+                        <el-dropdown-item :icon="Key">{{ t('operation.modifypwd') }}</el-dropdown-item>
+                        <el-dropdown-item :icon="SwitchButton" @click="eventBus.$emit('Logout')">{{ t('operation.loginout') }}</el-dropdown-item>
                     </el-dropdown-menu>
                 </template>
             </el-dropdown>
@@ -61,6 +61,8 @@ const globalStore = useGlobalStore()
 const userStore = useUserStore()
 const fullScreen = ref(false)
 
+const { global: { t } } = i18n
+
 // 全屏
 const setFullSreen = () => {
     document.documentElement.requestFullscreen();

src/packages/pc/views/notice/news/components/audit/index.vue

@@ -1,8 +1,8 @@
 <!-- 通知公告-资讯管理-审核 -->
 <template>
     <DetailsView ref="detailsRef" v-bind="{ record }" :loading="loading">
-        <el-button type="primary" @click="onSubmit(1)">审核通过</el-button>
-        <el-button type="primary" @click="onSubmit(0)">审核不通过</el-button>
+        <el-button type="primary" @click="onSubmit(1)">{{ t('notice.news.audit.tips1') }}</el-button>
+        <el-button type="primary" @click="onSubmit(0)">{{ t('notice.news.audit.tips2') }}</el-button>
     </DetailsView>
 </template>
 
@@ -11,6 +11,7 @@ import { reactive, shallowRef, PropType } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { auditinform } from '@/services/api/notice'
 import DetailsView from '../details/index.vue'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     record: {
@@ -19,6 +20,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const detailsRef = shallowRef()
 const loading = shallowRef(false)
 
@@ -29,8 +31,8 @@ const formData = reactive<Notice.AuditInformReq>({
 
 const onSubmit = (flag: number) => {
     ElMessageBox.confirm(
-        flag === 1 ? '确认审核通过？' : '确认审核拒绝？',
-        '提示'
+        flag === 1 ? t('notice.news.audit.tips3') : t('notice.news.audit.tips4'),
+        t('notice.news.audit.title')
     ).then(() => {
         formData.flag = flag
         loading.value = true
@@ -38,10 +40,10 @@ const onSubmit = (flag: number) => {
         auditinform({
             data: formData
         }).then(() => {
-            ElMessage.success('提交成功')
+            ElMessage.success(t('common.tips1'))
             detailsRef.value?.close(true)
         }).catch((err) => {
-            ElMessage.error('提交失败：' + err)
+            ElMessage.error(t('common.tips2') + err)
             detailsRef.value?.close()
         }).finally(() => {
             loading.value = false

src/packages/pc/views/notice/news/components/delete/index.vue

@@ -1,7 +1,7 @@
 <!-- 通知公告-资讯管理-删除 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认删除？</div>
+        <div class="g-text-message">{{ t('notice.news.delete.tips') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>

src/packages/pc/views/notice/news/components/details/index.vue

@@ -1,6 +1,6 @@
 <!-- 通知公告-资讯管理-详情 -->
 <template>
-    <app-drawer title="详情" width="900" v-model:show="show" :refresh="refresh">
+    <app-drawer :title="t('notice.news.details.title1')" width="900" v-model:show="show" :refresh="refresh">
         <app-table-details :data="data" :label-width="120" :cell-props="detailProps" :column="2">
             <!-- 缩略图 -->
             <template #coverimage="{ value }">
@@ -53,17 +53,17 @@ const { data } = useRequest(informDetail, {
 })
 
 const detailProps = computed<CellProp[]>(() => [
-    { prop: 'columnname', label: '所属栏目' },
-    { prop: 'author', label: '作者' },
-    { prop: 'srcname: string;', label: '来源' },
-    { prop: 'hits', label: '点击量' },
-    { prop: 'istop', label: '是否置顶', formatValue: (val) => flagEnum.getEnumTypeName(val) },
-    { prop: 'isshow', label: '是否展示', formatValue: (val) => flagEnum.getEnumTypeName(val) },
-    { prop: 'publishdate', label: '发布日期', formatValue: (val) => formatDate(val, 'YYYY-MM-DD') },
-    { prop: 'coverimage', label: '缩略图', entireRow: true },
-    { prop: 'title', label: '标题', entireRow: true },
-    { prop: 'brief', label: '简介', entireRow: true },
-    { prop: 'context', label: '内容', entireRow: true }
+    { prop: 'columnname', label: 'notice.news.details.columnname' },
+    { prop: 'author', label: 'notice.news.details.author' },
+    { prop: 'srcname: string;', label: 'notice.news.details.srcname' },
+    { prop: 'hits', label: 'notice.news.details.hits' },
+    { prop: 'istop', label: 'notice.news.details.istop', formatValue: (val) => flagEnum.getEnumTypeName(val) },
+    { prop: 'isshow', label: 'notice.news.details.isshow', formatValue: (val) => flagEnum.getEnumTypeName(val) },
+    { prop: 'publishdate', label: 'notice.news.details.publishdate', formatValue: (val) => formatDate(val, 'YYYY-MM-DD') },
+    { prop: 'coverimage', label: 'notice.news.details.coverimage', entireRow: true },
+    { prop: 'title', label: 'notice.news.details.title', entireRow: true },
+    { prop: 'brief', label: 'notice.news.details.brief', entireRow: true },
+    { prop: 'context', label: 'notice.news.details.context', entireRow: true }
 ])
 
 const close = (isRefresh = false) => {

src/packages/pc/views/notice/news/components/edit/index.vue

@@ -4,53 +4,53 @@
         :loading="loading">
         <el-form ref="formRef" class="el-form--horizontal" label-width="100px" :model="formData" :rules="formRules"
             :show-message="false">
-            <el-form-item label="标题" prop="title">
+            <el-form-item :label="t('notice.news.edit.title1')" prop="title">
                 <el-input v-model="formData.title" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="所属栏目" prop="columnid">
+            <el-form-item :label="t('notice.news.edit.columnid')" prop="columnid">
                 <el-select v-model="formData.columnid">
                     <el-option v-for="item in data?.siteColumnconfig" :key="item.id" :label="item.columnname"
                         :value="item.id" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="作者" prop="author">
+            <el-form-item :label="t('notice.news.edit.author')" prop="author">
                 <el-input v-model="formData.author" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="来源" prop="srcid">
+            <el-form-item :label="t('notice.news.edit.srcid')" prop="srcid">
                 <el-select v-model="formData.srcid">
                     <el-option v-for="item in data?.gzMemberinfo" :key="item.memberid" :label="item.membername"
                         :value="item.memberid" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="点击量" prop="hits">
+            <el-form-item :label="t('notice.news.edit.hits')" prop="hits">
                 <el-input-number v-model="formData.hits" :placeholder="t('common.pleaseenter')" :min="0" />
             </el-form-item>
-            <el-form-item label="发布日期" prop="publishdate">
+            <el-form-item :label="t('notice.news.edit.publishdate')" prop="publishdate">
                 <el-date-picker v-model="formData.publishdate" value-format="YYYY-MM-DD"
                     :disabled-date="(date: Date) => date.getTime() < Date.now() - 8.64e7"
                     :placeholder="t('common.pleasechoice')" />
             </el-form-item>
-            <el-form-item label="是否置顶" prop="istop">
+            <el-form-item :label="t('notice.news.edit.istop')" prop="istop">
                 <el-switch v-model="formData.istop" :active-value="1" :inactive-value="0" />
             </el-form-item>
-            <el-form-item label="是否展示" prop="isshow">
+            <el-form-item :label="t('notice.news.edit.isshow')" prop="isshow">
                 <el-switch v-model="formData.isshow" :active-value="1" :inactive-value="0" />
             </el-form-item>
-            <el-form-item label="缩略图" prop="coverimage">
+            <el-form-item :label="t('notice.news.edit.coverimage')" prop="coverimage">
                 <app-upload v-model="uploadFiles" :file-types="['image']" />
             </el-form-item>
-            <el-form-item class="el-form-item--row" label="简介" prop="brief">
+            <el-form-item class="el-form-item--row" :label="t('notice.news.edit.brief')" prop="brief">
                 <el-input type="textarea" v-model="formData.brief" maxlength="200" :rows="3"
                     :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item class="el-form-item--row" label="内容" prop="context">
+            <el-form-item class="el-form-item--row" :label="t('notice.news.edit.context')" prop="context">
                 <app-editor v-model="formData.context" />
             </el-form-item>
         </el-form>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit(10)">提交</el-button>
-            <el-button type="primary" @click="onSubmit(1)" v-if="!record?.id">暂存</el-button>
+            <el-button type="primary" @click="onSubmit(10)">{{ t('operation.submit') }}</el-button>
+            <el-button type="primary" @click="onSubmit(1)" v-if="!record?.id">{{ t('operation.record') }}</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/notice/news/components/status/index.vue

@@ -1,8 +1,8 @@
 <!-- 通知公告-资讯管理-展示/不展示 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message" v-if="record.isshow">确认设置为不展示？</div>
-        <div class="g-text-message" v-else>确认设置为展示？</div>
+        <div class="g-text-message" v-if="record.isshow">{{ t('notice.news.status1.tips1') }}</div>
+        <div class="g-text-message" v-else>{{ t('notice.news.status1.tips2') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>
@@ -41,10 +41,10 @@ const onSubmit = () => {
             id: props.record.id,
         }
     }).then(() => {
-        ElMessage.success('保存成功')
+        ElMessage.success(t('common.tips3'))
         onCancel(true)
     }).catch((err) => {
-        ElMessage.error('保存失败：' + err)
+        ElMessage.error(t('common.tips4') + err)
         onCancel()
     }).finally(() => {
         loading.value = false

src/packages/pc/views/notice/news/index.vue

@@ -67,16 +67,16 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(inform
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'columnname', label: '资讯类型' },
-    { field: 'title', label: '标题' },
-    { field: 'srcname', label: '来源' },
-    { field: 'author', label: '作者' },
-    { field: 'istop', label: '是否置顶', formatValue: (val) => flagEnum.getEnumTypeName(val) },
-    { field: 'isshow', label: '是否展示', formatValue: (val) => flagEnum.getEnumTypeName(val) },
-    { field: 'publishdate', label: '发布日期', formatValue: (val) => formatDate(val, 'YYYY-MM-DD') },
-    { field: 'status', label: '状态', formatValue: (val) => columnDetailStatusEnum.getEnumTypeName(val) },
-    { field: 'creatoruser', label: '创建人' },
-    { field: 'creaedate', label: '创建时间', formatValue: (val) => formatDate(val) },
+    { field: 'columnname', label: 'notice.news.columnname' },
+    { field: 'title', label: 'notice.news.title' },
+    { field: 'srcname', label: 'notice.news.srcname' },
+    { field: 'author', label: 'notice.news.author' },
+    { field: 'istop', label: 'notice.news.istop', formatValue: (val) => flagEnum.getEnumTypeName(val) },
+    { field: 'isshow', label: 'notice.news.isshow', formatValue: (val) => flagEnum.getEnumTypeName(val) },
+    { field: 'publishdate', label: 'notice.news.publishdate', formatValue: (val) => formatDate(val, 'YYYY-MM-DD') },
+    { field: 'status', label: 'notice.news.status', formatValue: (val) => columnDetailStatusEnum.getEnumTypeName(val) },
+    { field: 'creatoruser', label: 'notice.news.creatoruser' },
+    { field: 'creaedate', label: 'notice.news.creaedate', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right', width: 180 }
 ])
 
@@ -84,7 +84,7 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Notice.Info
     filters: [
         {
             field: 'columnid',
-            label: '类型',
+            label: t('notice.news.columnid'),
             options: () => data.value?.siteColumnconfig.map((e) => ({
                 label: e.columnname,
                 value: e.id
@@ -92,16 +92,16 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Notice.Info
         },
         {
             field: 'status',
-            label: '状态',
+            label: t('notice.news.status'),
             options: () => columnDetailStatusEnum.getEnumOptions()
         },
         {
             field: 'title',
-            label: '标题'
+            label: t('notice.news.title')
         },
         {
             field: 'isshow',
-            label: '是否展示',
+            label: t('notice.news.isshow'),
             options: () => flagEnum.getEnumOptions()
         },
     ],

src/packages/pc/views/notice/newscolumn/components/delete/index.vue

@@ -2,8 +2,8 @@
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
         <div class="g-text-message">
-            <span>确认删除栏目？</span>
-            <span>栏目下明细将同步删除且不可恢复！</span>
+            <span>{{ t('notice.newscolumn.delete.tips1') }}</span>
+            <span>{{ t('notice.newscolumn.delete.tips2') }}</span>
         </div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>

src/packages/pc/views/notice/newscolumn/components/details/index.vue

@@ -43,13 +43,13 @@ const { data } = useRequest(columnDetail, {
 })
 
 const detailProps = computed<CellProp[]>(() => [
-    { prop: 'columntype', label: '栏目类型', formatValue: (val) => columntypeEnum.getEnumTypeName(val) },
-    { prop: 'columnname', label: '栏目名称' },
-    { prop: 'isshow', label: '是否展示', formatValue: (val) => flagEnum.getEnumTypeName(val) },
-    { prop: 'creatoruser', label: '创建人' },
-    { prop: 'creaedate', label: '创建时间', formatValue: (val) => formatDate(val) },
-    { prop: 'modifieruser', label: '操作人' },
-    { prop: 'updatedate', label: '修改时间', formatValue: (val) => formatDate(val) }
+    { prop: 'columntype', label: 'notice.newscolumn.details.columntype', formatValue: (val) => columntypeEnum.getEnumTypeName(val) },
+    { prop: 'columnname', label: 'notice.newscolumn.details.columnname' },
+    { prop: 'isshow', label: 'notice.newscolumn.details.isshow', formatValue: (val) => flagEnum.getEnumTypeName(val) },
+    { prop: 'creatoruser', label: 'notice.newscolumn.details.creatoruser' },
+    { prop: 'creaedate', label: 'notice.newscolumn.details.creaedate', formatValue: (val) => formatDate(val) },
+    { prop: 'modifieruser', label: 'notice.newscolumn.details.modifieruser' },
+    { prop: 'updatedate', label: 'notice.newscolumn.details.updatedate', formatValue: (val) => formatDate(val) }
 ])
 
 const close = () => {

src/packages/pc/views/notice/newscolumn/components/edit/index.vue

@@ -4,19 +4,19 @@
         :loading="loading">
         <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules"
             :show-message="false">
-            <el-form-item label="栏目类型" prop="columntype">
+            <el-form-item :label="t('notice.newscolumn.edit.columntype')" prop="columntype">
                 <el-select v-model="formData.columntype">
                     <el-option v-for="item in columntypeEnum.getEnumOptions()" :key="item.value" :label="item.label"
                         :value="item.value" />
                 </el-select>
             </el-form-item>
-            <el-form-item label="栏目名称" prop="columnname">
+            <el-form-item :label="t('notice.newscolumn.edit.columnname')" prop="columnname">
                 <el-input v-model="formData.columnname" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="排序" prop="sort">
+            <el-form-item :label="t('notice.newscolumn.edit.sort')" prop="sort">
                 <el-input-number v-model="formData.sort" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="是否展示" prop="isshow">
+            <el-form-item :label="t('notice.newscolumn.edit.isshow')" prop="isshow">
                 <el-radio-group v-model="formData.isshow">
                     <el-radio v-for="item in flagEnum.getEnumOptions()" :key="item.value" :value="item.value"
                         :label="item.label" />
@@ -25,7 +25,7 @@
         </el-form>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit">提交</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('operation.submit') }}</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/notice/newscolumn/index.vue

@@ -59,11 +59,11 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(column
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'columnname', label: '栏目名称' },
-    { field: 'sort', label: '排序' },
-    { field: 'isshow', label: '是否展示', formatValue: (val) => flagEnum.getEnumTypeName(val) },
-    { field: 'creatoruser', label: '创建人' },
-    { field: 'creaedate', label: '创建时间', formatValue: (val) => formatDate(val) },
+    { field: 'columnname', label: 'notice.newscolumn.columnname' },
+    { field: 'sort', label: 'notice.newscolumn.sort' },
+    { field: 'isshow', label: 'notice.newscolumn.isshow', formatValue: (val) => flagEnum.getEnumTypeName(val) },
+    { field: 'creatoruser', label: 'notice.newscolumn.creatoruser' },
+    { field: 'creaedate', label: 'notice.newscolumn.creaedate', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -71,16 +71,16 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Notice.Colu
     filters: [
         {
             field: 'columntype',
-            label: '栏目类型',
+            label: t('notice.newscolumn.columntype'),
             options: () => columntypeEnum.getEnumOptions()
         },
         {
             field: 'columnname',
-            label: '栏目名称'
+            label: t('notice.newscolumn.columnname'),
         },
         {
             field: 'isshow',
-            label: '是否展示',
+            label: t('notice.newscolumn.isshow'),
             options: () => flagEnum.getEnumOptions()
         },
     ],

src/packages/pc/views/notice/newssource/components/delete/index.vue

@@ -1,7 +1,7 @@
 <!-- 通知公告-资讯来源-删除 -->
 <template>
     <app-drawer :title="t('common.alert')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">您确定要删除该数据吗？</div>
+        <div class="g-text-message">{{ t('notice.newssource.delete.tips') }}</div>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onSubmit">{{ t('operation.confirm') }}</el-button>

src/packages/pc/views/notice/newssource/components/details/index.vue

@@ -44,10 +44,10 @@ const { data } = useRequest(columnsourceDetail, {
 })
 
 const detailProps = computed<CellProp[]>(() => [
-    { prop: 'membername', label: '来源名称' },
-    { prop: 'membertags', label: '来源网址' },
-    { prop: 'imageurl', label: '来源LOGO' },
-    { prop: 'updatetime', label: '更新时间', formatValue: (val) => formatDate(val) }
+    { prop: 'membername', label: 'notice.newssource.details.membername' },
+    { prop: 'membertags', label: 'notice.newssource.details.membertags' },
+    { prop: 'imageurl', label: 'notice.newssource.details.imageurl' },
+    { prop: 'updatetime', label: 'notice.newssource.details.updatetime', formatValue: (val) => formatDate(val) }
 ])
 
 const close = () => {

src/packages/pc/views/notice/newssource/components/edit/index.vue

@@ -4,19 +4,19 @@
         :loading="loading">
         <el-form ref="formRef" class="el-form--vertical" label-width="100px" :model="formData" :rules="formRules"
             :show-message="false">
-            <el-form-item label="来源名称" prop="membername">
+            <el-form-item :label="t('notice.newssource.edit.membername')" prop="membername">
                 <el-input v-model="formData.membername" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="来源网址" prop="membertags">
+            <el-form-item :label="t('notice.newssource.edit.membertags')" prop="membertags">
                 <el-input v-model="formData.membertags" :placeholder="t('common.pleaseenter')" />
             </el-form-item>
-            <el-form-item label="来源LOGO" prop="imageurl">
+            <el-form-item :label="t('notice.newssource.edit.imageurl')" prop="imageurl">
                 <app-upload v-model="uploadFiles" :file-types="['image']" />
             </el-form-item>
         </el-form>
         <template #footer>
             <el-button @click="onCancel(false)">{{ t('operation.close') }}</el-button>
-            <el-button type="primary" @click="onSubmit">提交</el-button>
+            <el-button type="primary" @click="onSubmit">{{ t('operation.submit') }}</el-button>
         </template>
     </app-drawer>
 </template>

src/packages/pc/views/notice/newssource/index.vue

@@ -60,9 +60,9 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(column
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'imageurl', label: '来源LOGO' },
-    { field: 'membername', label: '来源名称' },
-    { field: 'membertags', label: '来源网址' },
+    { field: 'imageurl', label: 'notice.newssource.imageurl' },
+    { field: 'membername', label: 'notice.newssource.membername' },
+    { field: 'membertags', label: 'notice.newssource.membertags' },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -70,7 +70,7 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Notice.Colu
     filters: [
         {
             field: 'smembername',
-            label: '来源名称'
+            label: t('notice.newssource.smembername')
         },
     ],
     buttons: [

src/packages/pc/views/notice/sms/index.vue

@@ -51,11 +51,11 @@ const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(smsque
 })
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { field: 'columnname', label: '接收手机号' },
-    { field: 'title', label: '消息模板' },
-    { field: 'srcname', label: '发送状态' },
-    { field: 'author', label: '错误信息' },
-    { field: 'istop', label: '发送时间', formatValue: (val) => formatDate(val) },
+    { field: 'columnname', label: 'notice.sms.columnname' },
+    { field: 'title', label: 'notice.sms.title' },
+    { field: 'srcname', label: 'notice.sms.srcname' },
+    { field: 'author', label: 'notice.sms.author' },
+    { field: 'istop', label: 'notice.sms.istop', formatValue: (val) => formatDate(val) },
     { field: 'operate', label: 'common.operate', fixed: 'right' }
 ])
 
@@ -63,12 +63,12 @@ const { filterOption, getQueryParams, resetFilters } = useDataFilter<Notice.SmsQ
     filters: [
         {
             field: 'status',
-            label: '发送状态',
+            label: t('notice.sms.status'),
             options: () => []
         },
         {
             field: 'recvphone',
-            label: '接收手机号'
+            label: t('notice.sms.recvphone')
         },
     ],
     buttons: [