合并代码

2022-12-28 16:12:31 +08:00
parent 469265a730 44e9ead529
commit b05f2bf3c9
63 changed files with 3391 additions and 210 deletions
@@ -103,104 +103,105 @@ import DynamicNotice from '../../components/tools/DynamicNotice'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from '@/store/mutation-types'

-export default {
-  name: 'UserAnnouncementList',
-  mixins: [JeroListMixin],
-  components: {
-    DynamicNotice,
-    ShowAnnouncement
-  },
-  data() {
-    return {
-      description: '系统通告表管理页面',
-      queryParam: {},
-      selectedRowKeys: [],
-      // '5': this.$t('taskRegulationComplianceTask'),
-      msgCategoryQuery: {
-        '1': this.$t('SubscriptionNotification'),
-        '2': this.$t('warningInformation'),
-        '3': this.$t('ForwardPush')
-        // '4': this.$t('CollectinguthenticationParameters'),
-        // '6':this.$t('RegulationListConfirmationTask'),
-        // '7':this.$t('RegulationListConfirmationNotification'),
-        // '8':this.$t('RegulationTaskConfirmation'),
-        // '9':this.$t('DesignComplianceTask'),
-        // '10':this.$t('PreHomoTask'),
-        // '11':this.$t('ValidationTask'),
-        // '12':this.$t('DesignComplianceNotification'),
-        // '13':this.$t('PreHomoNotification'),
-        // '14':this.$t('ValidationComplianceNotification'),
-        // '15':this.$t('RegulationTaskConfirmationNotification'),
-        // '17':this.$t('listConfirmation'),
-        // '18':this.$t('taskAffirm'),
-        // '19':this.$t('complianceConfirmation'),
-        // '20':this.$t('collectionLegislativeComments'),
-        // '21':this.$t('regulatoryAndTechnicalAssessment'),
-      },
-      columns: [
-        {
-          title: this.$t('MessageContent'),
-          align: 'left',
-          dataIndex: 'msgContent',
-          ellipsis: true,
-          scopedSlots: { customRender: 'msgTitile' }
+  export default {
+    name: 'UserAnnouncementList',
+    mixins: [JeroListMixin],
+    components: {
+      DynamicNotice,
+      ShowAnnouncement
+    },
+    data() {
+      return {
+        description: '系统通告表管理页面',
+        queryParam: {},
+        selectedRowKeys: [],
+        // '5': this.$t('taskRegulationComplianceTask'),
+        msgCategoryQuery: {
+          '1': this.$t('SubscriptionNotification'),
+          '2': this.$t('warningInformation'),
+          '3': this.$t('ForwardPush')
+          // '4': this.$t('CollectinguthenticationParameters'),
+          // '6':this.$t('RegulationListConfirmationTask'),
+          // '7':this.$t('RegulationListConfirmationNotification'),
+          // '8':this.$t('RegulationTaskConfirmation'),
+          // '9':this.$t('DesignComplianceTask'),
+          // '10':this.$t('PreHomoTask'),
+          // '11':this.$t('ValidationTask'),
+          // '12':this.$t('DesignComplianceNotification'),
+          // '13':this.$t('PreHomoNotification'),
+          // '14':this.$t('ValidationComplianceNotification'),
+          // '15':this.$t('RegulationTaskConfirmationNotification'),
+          // '17':this.$t('listConfirmation'),
+          // '18':this.$t('taskAffirm'),
+          // '19':this.$t('complianceConfirmation'),
+          // '20':this.$t('collectionLegislativeComments'),
+          // '21':this.$t('regulatoryAndTechnicalAssessment'),
        },
-        {
-          title: this.$t('Sponsor'),
-          align: 'left',
-          ellipsis: true,
-          dataIndex: 'initiator',
-          width: 200
+        columns: [
+          {
+            title: this.$t('MessageContent'),
+            align: 'left',
+            dataIndex: 'msgContent',
+            ellipsis: true,
+            scopedSlots: { customRender: 'msgTitile' }
+          },
+          {
+            title: this.$t('Sponsor'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'initiator',
+            width: 200
+          },
+          {
+            title: this.$t('MessageType'),
+            align: 'left',
+            ellipsis: true,
+            dataIndex: 'msgCategory',
+            width: 200,
+            scopedSlots: { customRender: 'msgCategory' }
+          },
+          {
+            title: this.$t('NotificationTime'),
+            align: 'left',
+            ellipsis: true,
+            width: 200,
+            dataIndex: 'sendTime'
+          },
+          {
+            title: '',
+            align: 'left',
+            ellipsis: true,
+            width: 50
+          }
+        ],
+        url: {
+          list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
+          editCementSend: 'sys/sysAnnouncementSend/editByAnntIdAndUserId',
+          readAllMsg: 'sys/sysAnnouncementSend/read',
+          deleteUrl: 'sys/sysAnnouncementSend/deleteBatch'
        },
-        {
-          title: this.$t('MessageType'),
-          align: 'left',
-          ellipsis: true,
-          dataIndex: 'msgCategory',
-          width: 200,
-          scopedSlots: { customRender: 'msgCategory' }
-        },
-        {
-          title: this.$t('NotificationTime'),
-          align: 'left',
-          ellipsis: true,
-          width: 200,
-          dataIndex: 'sendTime'
-        },
-        {
-          title: '',
-          align: 'left',
-          ellipsis: true,
-          width: 50
-        }
-      ],
-      url: {
-        list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
-        editCementSend: 'sys/sysAnnouncementSend/editByAnntIdAndUserId',
-        readAllMsg: 'sys/sysAnnouncementSend/read',
-        deleteUrl: 'sys/sysAnnouncementSend/deleteBatch'
-      },
-      loading: false,
-      openPath: '',
-      formData: '',
-      language: ''
-    }
-  },
-  watch: {
-    $route: function(res) {
-      console.log(res)
-      this.loadData()
-    }
-  },
-  mounted() {
-    this.language = localStorage.getItem('language') || ''
-  },
-  methods: {
-    expandIcon(props) {
-      if (props.expanded) {
-        return <a-icon type="down" onClick={e => {
-          props.onExpand(props.record, e)
-        }
+        loading: false,
+        openPath: '',
+        formData: '',
+        language: ''
+      }
+    },
+    watch: {
+      $route: function(res) {
+        console.log(res)
+        this.loadData()
+      }
+    },
+    mounted() {
+      this.language = localStorage.getItem('language') || ''
+    },
+    methods: {
+      expandIcon(props) {
+        if (props.expanded) {
+          return <a-icon type = 'down'onClick = { e=>
+          {
+            props.onExpand(props.record, e)
+          }
        }
        />
      } else {