Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-web into master

src/utils/utils.ts

@@ -803,7 +803,7 @@ export const getDefaultTime = (timeFormat, timeRangeInterval, format?) => {
 }
 
 // 图片地址转换 import.meta.env.VITE_APP_UPLOAD_URL
-const url = ''
+const url = import.meta.env.VITE_APP_UPLOAD_URL || ''
 export const changeAddress = (downloadLink) => {
   let newDownloadLink = ''
   if (downloadLink) {
@@ -817,7 +817,11 @@ export const changeAddress = (downloadLink) => {
       const staIndex = downloadLink.indexOf('sta-minio')
       const fullAddressIndex = downloadLink.indexOf('http')
       if (defaultIndex !== -1) {
-        newDownloadLink = url + downloadLink.substr(defaultIndex, downloadLink.length)
+        newDownloadLink=downloadLink
+        // newDownloadLink = url + downloadLink.substr(defaultIndex, downloadLink.length)
+        // console.log(downloadLink,'downloadLink')
+        // console.log(downloadLink.substr(defaultIndex, downloadLink.length), 'downloadLink.substr(defaultIndex, downloadLink.length)')
+        // console.log(newDownloadLink, 'newDownloadLink')
       } else if (settleIndex !== -1) {
         newDownloadLink = url + downloadLink.substr(settleIndex, downloadLink.length)
       } else if (staIndex !== -1) {

src/views/messagePush/pushManagement/components/common.ts

@@ -30,16 +30,16 @@ export const sendResultOption = [
 export function handleInit(
   searchForm,
   field,
-  ifcode = '/msgw/massagerecord/page'
+  ifcode = '/msgw/message/page'
 ) {
   const timeValue = ref() // 筛选时间
   function dateChangeHandle(val) {
     if (val) {
-      searchForm.value.startDate = val[0]
-      searchForm.value.endDate = val[1]
+      searchForm.value.startTime = val[0]
+      searchForm.value.endTime = val[1]
     } else {
-      searchForm.value.startDate = ''
-      searchForm.value.endDate = ''
+      searchForm.value.startTime = ''
+      searchForm.value.endTime = ''
     }
   }
   // 选择日期后的默认时间值
@@ -75,7 +75,7 @@ export function handleInit(
       crudRef.value.tableLoding = false
       if (res && res.statusCode === 0) {
         let bizContent = res.data
-        let data = bizContent.data || []
+        let data = bizContent.result || []
         tableData.value = data
         console.log(data)
         data.forEach((element) => {
@@ -91,7 +91,7 @@ export function handleInit(
   }
   const statisticsList = ref<any>({})
   function statistics() {
-    BaseService.post('/msgw/channel/messagestatistics', {
+    BaseService.post('/msgw/message/statistics', {
       messageType: searchForm.value.messageType,
       messageChannel: searchForm.value.messageChannel,
     }).then((res: any) => {

src/views/messagePush/pushManagement/components/commonCrudConfig.ts

@@ -36,8 +36,8 @@ export default function crudConfig(fields = {}) {
         { label: '成功消息总数:', key: 'specifiedSuccessTotalNum' ,unit:''},
         { label: '失败消息总数:', key: 'specifiedFailTotalNum' ,unit:''},
         { label: '待发送消息总数:', key: 'specifiedWaitTotalNum' ,unit:''},
-        { label: '过期消息总数:', key: 'specifiedExpiredTotalNum' ,unit:''},
-        { label: '取消消息总数:', key: 'specifiedCancelTotalNum' ,unit:''},
+        // { label: '过期消息总数:', key: 'specifiedExpiredTotalNum' ,unit:''},
+        // { label: '取消消息总数:', key: 'specifiedCancelTotalNum' ,unit:''},
       ],
     },
     searchOperation: {

src/views/messagePush/pushManagement/components/detailDialog/index.vue

@@ -158,7 +158,7 @@ const userInfo = ref<any>([])
 const getList = (id) => {
   isLoading.value = true
   failReason.value = ''
-  BaseService.post('/msgw/massagerecord/query', { id }).then(
+  BaseService.post('/msgw/message/view', { id }).then(
     (res: any) => {
       if (res && res.statusCode === 0) {
         let bizContent = res.data

src/views/messagePush/pushManagement/mailbox/components/addOrEditDialog copy.vue

@@ -206,7 +206,7 @@
   const isLoading = ref(false)
   const getList = () => {
     isLoading.value = true
-    BaseService.post('/msgw/massagerecord/query', {
+    BaseService.post('/msgw/message/view', {
       id: props.dataList.id,
     })
       .then((res: any) => {

src/views/messagePush/pushManagement/mailbox/components/addOrEditDialog.vue

@@ -243,7 +243,7 @@
 
   const getList = () => {
     isLoading.value = true
-    BaseService.post('/msgw/massagerecord/query', {
+    BaseService.post('/msgw/message/view', {
       id: props.dataList.id,
     })
       .then((res: any) => {

src/views/messagePush/pushManagement/mailbox/index.vue

@@ -9,7 +9,7 @@
         <el-input maxlength="60" v-trim clearable v-model="searchForm.title" style="width: 200px"
           placeholder="请输入消息标题" />
         <el-date-picker unlink-panels v-model="timeValue" type="datetimerange" range-separator="到"
-          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DDTHH:mm:ss"
+          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD HH:mm:ss" @change="dateChangeHandle" :default-time="defaultTime" />
         <el-select clearable v-model="searchForm.sendResult" placeholder="请选择发送状态" style="width: 200px">
           <el-option v-for="item in sendResultOption" :key="item.value" :label="item.label" :value="item.value" />

src/views/messagePush/pushManagement/sendingInformationApp/components/editDialog.vue

@@ -131,7 +131,7 @@
       userGroupInfo: [], //用户组信息
     }
     isLoading.value = true
-    BaseService.post('/msgw/massagerecord/query', {
+    BaseService.post('/msgw/message/view', {
       id: props.dataList.id,
     }).then((res: any) => {
       if (res && res.statusCode === 0) {

src/views/messagePush/pushManagement/sendingInformationApp/index.vue

@@ -9,7 +9,7 @@
         <el-input maxlength="60" v-trim clearable v-model="searchForm.title" style="width: 200px"
           placeholder="请输入消息标题" />
         <el-date-picker unlink-panels v-model="timeValue" type="datetimerange" range-separator="到"
-          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DDTHH:mm:ss"
+          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD HH:mm:ss" @change="dateChangeHandle" :default-time="defaultTime" />
         <el-select clearable v-model="searchForm.sendResult" placeholder="请选择发送状态" style="width: 200px">
           <el-option v-for="item in sendResultOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -79,8 +79,8 @@
 
   // 获取数据，查询条件
   const searchForm = ref({
-    startDate: '', //开始时间
-    endDate: '', //结束时间
+    startTime: '', //开始时间
+    endTime: '', //结束时间
     tradingDate: '', id: '',
     title: '', //标题
     messageType: 'APP', //消息类型
@@ -106,8 +106,8 @@
   function refreshLeft() {
     field.value.paging.currentPage = 1
     searchForm.value = {
-      id: '', startDate: '', //开始时间
-      endDate: '', //结束时间
+      id: '', startTime: '', //开始时间
+      endTime: '', //结束时间
       tradingDate: '',
       title: '', //标题
       messageType: 'APP', //消息类型

src/views/messagePush/pushManagement/sendingInformationWeb/components/editDialog.vue

@@ -77,7 +77,7 @@
 
   const getList = () => {
     isLoading.value = true
-    BaseService.post('/msgw/massagerecord/query', {
+    BaseService.post('/msgw/message/view', {
       id: props.dataList.id,
     }).then((res: any) => {
       if (res && res.statusCode === 0) {

src/views/messagePush/pushManagement/sendingInformationWeb/index.vue

@@ -9,7 +9,7 @@
         <el-input maxlength="60" v-trim clearable v-model="searchForm.title" style="width: 200px"
           placeholder="请输入消息标题" />
         <el-date-picker unlink-panels v-model="timeValue" type="datetimerange" range-separator="到"
-          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DDTHH:mm:ss"
+          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD HH:mm:ss" @change="dateChangeHandle" :default-time="defaultTime" />
         <el-select clearable v-model="searchForm.sendResult" placeholder="请选择发送状态" style="width: 200px">
           <el-option v-for="item in sendResultOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -75,8 +75,8 @@
   })
   // 获取数据，查询条件
   const searchForm = ref({
-    startDate: '', //开始时间
-    endDate: '', //结束时间
+    startTime: '', //开始时间
+    endTime: '', //结束时间
     tradingDate: '', id: '',
     title: '', //标题
     messageType: 'WEB', //消息类型
@@ -88,8 +88,9 @@
   function refreshLeft() {
     field.value.paging.currentPage = 1
     searchForm.value = {
-      id: '', startDate: '', //开始时间
-      endDate: '', //结束时间
+      id: '',
+      startTime: '', //开始时间
+      endTime: '', //结束时间
       tradingDate: '',
       title: '', //标题
       messageType: 'WEB', //消息类型

src/views/messagePush/pushManagement/shortMessage/components copy/addOrEditDialog.vue

@@ -178,7 +178,7 @@
   const isLoading = ref(false)
   const getList = () => {
     isLoading.value = true
-    BaseService.post('/msgw/massagerecord/query', {
+    BaseService.post('/msgw/message/view', {
       id: props.dataList.id,
     })
       .then((res: any) => {

src/views/messagePush/pushManagement/shortMessage/components copy/editDialog.vue

@@ -74,8 +74,8 @@
 
   const getList = () => {
     isLoading.value = true
-    BaseService.post('/msgw/massagerecord/query', {
-      id: props.dataList.id,
+    BaseService.post('/msgw/message/view', {
+      sendDetailsId: props.dataList.id,
     }).then((res: any) => {
       if (res && res.statusCode === 0) {
         let bizContent = res.data

src/views/messagePush/pushManagement/shortMessage/components/addOrEditDialog.vue

@@ -212,7 +212,7 @@
   const isLoading = ref(false)
   const getList = () => {
     isLoading.value = true
-    BaseService.post('/msgw/massagerecord/query', {
+    BaseService.post('/msgw/message/view', {
       id: props.dataList.id,
     })
       .then((res: any) => {

src/views/messagePush/pushManagement/shortMessage/index.vue

@@ -9,7 +9,7 @@
         <el-input maxlength="60" v-trim clearable v-model="searchForm.title" style="width: 200px"
           placeholder="请输入消息标题" />
         <el-date-picker unlink-panels v-model="timeValue" type="datetimerange" range-separator="到"
-          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DDTHH:mm:ss"
+          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD HH:mm:ss" @change="dateChangeHandle" :default-time="defaultTime" />
         <el-select clearable v-model="searchForm.sendResult" placeholder="请选择发送状态" style="width: 200px">
           <el-option v-for="item in sendResultOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -74,8 +74,8 @@
 
   // 获取数据，查询条件
   const searchForm = ref({
-    startDate: '', //开始时间
-    endDate: '', //结束时间
+    startTime: '', //开始时间
+    endTime: '', //结束时间
     tradingDate: '', id: '',
     title: '', //标题
     messageType: 'SHORT', //消息类型
@@ -87,8 +87,9 @@
   function refreshLeft() {
     field.value.paging.currentPage = 1
     searchForm.value = {
-      id: '', startDate: '', //开始时间
-      endDate: '', //结束时间
+      id: '',
+      startTime: '', //开始时间
+      endTime: '', //结束时间
       tradingDate: '',
       title: '', //标题
       messageType: 'SHORT', //消息类型

src/views/messagePush/pushManagement/wechatApplet/components/addOrEditDialog.vue

@@ -150,7 +150,7 @@ const isLoading = ref(false)
 const currentData = ref<any>({})
 const getList = () => {
   isLoading.value = true
-  BaseService.post('/msgw/massagerecord/query', {
+  BaseService.post('/msgw/message/view', {
     id: props.dataList.id,
   }).then((res: any) => {
     if (res && res.statusCode === 0) {

src/views/messagePush/pushManagement/wechatApplet/index.vue

@@ -9,7 +9,7 @@
         <el-input maxlength="60" v-trim clearable v-model="searchForm.title" style="width: 200px"
           placeholder="请输入消息标题" />
         <el-date-picker unlink-panels v-model="timeValue" type="datetimerange" range-separator="到"
-          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DDTHH:mm:ss"
+          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD HH:mm:ss" @change="dateChangeHandle" :default-time="defaultTime" />
         <el-select clearable v-model="searchForm.sendResult" placeholder="请选择发送状态" style="width: 200px">
           <el-option v-for="item in sendResultOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -73,8 +73,8 @@
 
   // 获取数据，查询条件
   const searchForm = ref({
-    startDate: '', //开始时间
-    endDate: '', //结束时间
+    startTime: '', //开始时间
+    endTime: '', //结束时间
     tradingDate: '', id: '',
     title: '', //标题
     messageType: 'MINI_PROGRAM', //消息类型
@@ -86,8 +86,9 @@
   function refreshLeft() {
     field.value.paging.currentPage = 1
     searchForm.value = {
-      id: '', startDate: '', //开始时间
-      endDate: '', //结束时间
+      id: '',
+      startTime: '', //开始时间
+      endTime: '', //结束时间
       tradingDate: '',
       title: '', //标题
       messageType: 'MINI_PROGRAM', //消息类型

src/views/messagePush/pushManagement/wechatOfficialAccounts/components/addOrEditDialog.vue

@@ -141,7 +141,7 @@ const isLoading = ref(false)
 const currentData = ref<any>({})
 const getList = () => {
   isLoading.value = true
-  BaseService.post('/msgw/massagerecord/query', {
+  BaseService.post('/msgw/message/view', {
     id: props.dataList.id,
   }).then((res: any) => {
     if (res && res.statusCode === 0) {

src/views/messagePush/pushManagement/wechatOfficialAccounts/index copy.vue

@@ -9,7 +9,7 @@
         <el-input maxlength="60" v-trim clearable v-model="searchForm.title" style="width: 200px"
           placeholder="请输入消息标题" />
         <el-date-picker unlink-panels v-model="timeValue" type="datetimerange" range-separator="到"
-          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DDTHH:mm:ss"
+          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD HH:mm:ss" @change="dateChangeHandle" :default-time="defaultTime" />
         <el-select clearable v-model="searchForm.sendResult" placeholder="请选择发送状态" style="width: 200px">
           <el-option v-for="item in sendResultOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -57,8 +57,8 @@
 
   // 获取数据，查询条件
   const searchForm = ref({
-    startDate: '', //开始时间
-    endDate: '', //结束时间
+    startTime: '', //开始时间
+    endTime: '', //结束时间
     tradingDate: '', id: '',
     title: '', //标题
     messageType: 'OFFICIAL_ACCOUNTS', //消息类型
@@ -70,8 +70,9 @@
   function refreshLeft() {
     field.value.paging.currentPage = 1
     searchForm.value = {
-      id: '', startDate: '', //开始时间
-      endDate: '', //结束时间
+      id: '',
+      startTime: '', //开始时间
+      endTime: '', //结束时间
       tradingDate: '',
       title: '', //标题
       messageType: 'OFFICIAL_ACCOUNTSS', //消息类型

src/views/messagePush/pushManagement/wechatOfficialAccounts/index.vue

@@ -9,7 +9,7 @@
         <el-input maxlength="60" v-trim clearable v-model="searchForm.title" style="width: 200px"
           placeholder="请输入消息标题" />
         <el-date-picker unlink-panels v-model="timeValue" type="datetimerange" range-separator="到"
-          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DDTHH:mm:ss"
+          start-placeholder="查询开始日期" end-placeholder="查询结束日期" value-format="YYYY-MM-DD HH:mm:ss"
           format="YYYY-MM-DD HH:mm:ss" @change="dateChangeHandle" :default-time="defaultTime" />
         <el-select clearable v-model="searchForm.sendResult" placeholder="请选择发送状态" style="width: 200px">
           <el-option v-for="item in sendResultOption" :key="item.value" :label="item.label" :value="item.value" />
@@ -72,8 +72,8 @@
 
   // 获取数据，查询条件
   const searchForm = ref({
-    startDate: '', //开始时间
-    endDate: '', //结束时间
+    startTime: '', //开始时间
+    endTime: '', //结束时间
     tradingDate: '',
     id: '',
     title: '', //标题
@@ -87,8 +87,8 @@
     field.value.paging.currentPage = 1
     searchForm.value = {
       id: '',
-      startDate: '', //开始时间
-      endDate: '', //结束时间
+      startTime: '', //开始时间
+      endTime: '', //结束时间
       tradingDate: '',
       title: '', //标题
       messageType: 'OFFICIAL_ACCOUNTS', //消息类型

src/views/messagePush/workbenches/index.vue

@@ -48,12 +48,6 @@
               <el-descriptions-item label="待发送消息总数">
                 {{ dataList.specifiedWaitTotalNum }}
               </el-descriptions-item>
-              <el-descriptions-item label="过期消息总数">
-                {{ dataList.specifiedExpiredTotalNum }}
-              </el-descriptions-item>
-              <el-descriptions-item label="取消消息总数">
-                {{ dataList.specifiedCancelTotalNum }}
-              </el-descriptions-item>
             </el-descriptions>
           </el-card>
           <el-card class="box-card" style="margin-top: 20px">
@@ -70,12 +64,6 @@
               <el-descriptions-item label="待发送消息总数">
                 {{ dataList.waitTotalNum }}
               </el-descriptions-item>
-              <el-descriptions-item label="过期消息总数">
-                {{ dataList.expiredTotalNum }}
-              </el-descriptions-item>
-              <el-descriptions-item label="取消消息总数">
-                {{ dataList.cancelTotalNum }}
-              </el-descriptions-item>
             </el-descriptions>
           </el-card>
         </div>
@@ -150,8 +138,8 @@
   const timeValue = ref<any>(defaultTime)
   // 获取数据，查询条件
   const searchForm = ref({
-    startDate: '', //开始时间
-    endDate: '', //结束时间
+    startTime: '', //开始时间
+    endTime: '', //结束时间
     messageType: '', //消息类型
     messageChannel: '', //消息渠道
   })
@@ -159,11 +147,11 @@
   // 处理请求参数
   const handleParams = () => {
     if (timeValue.value.length) {
-      searchForm.value.startDate = timeValue.value[0]
-      searchForm.value.endDate = timeValue.value[1]
+      searchForm.value.startTime = timeValue.value[0]
+      searchForm.value.endTime = timeValue.value[1]
     } else {
-      searchForm.value.startDate = defaultTime[0]
-      searchForm.value.endDate = defaultTime[1]
+      searchForm.value.startTime = defaultTime[0]
+      searchForm.value.endTime = defaultTime[1]
     }
     let data: any = {
       ...searchForm.value,
@@ -185,10 +173,10 @@
     const params = handleParams()
     console.log(params)
     loading.value = true
-    BaseService.post('/msgw/channel/messagestatistics', params)
+    BaseService.post('/msgw/message/page', params)
       .then((res: any) => {
         if (res && res.statusCode === 0) {
-          let bizContent = res.data
+          let bizContent = res.data.result
           console.log(bizContent)
 
           // bizContent.everyDayData = [
@@ -392,8 +380,8 @@
   }
   function refreshLeft() {
     searchForm.value = {
-      startDate: defaultTime[0], //开始时间
-      endDate: defaultTime[1], //结束时间
+      startTime: defaultTime[0], //开始时间
+      endTime: defaultTime[1], //结束时间
       messageType: '', //消息类型
       messageChannel: '', //消息渠道
     }