合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!57

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -128,10 +128,6 @@
               <a-icon type="delete"/>
               {{ $t('BatchDelete') }}
             </div>
-            <div class="operator-text-title" @click="bringInRelevantPersonnelClick">
-              <a-icon type="user"/>
-              {{ $t('bringInRelevantPersonnel') }}
-            </div>
             <div class="operator-text-title" @click="ExportReportClick">
               <a-icon type="export"/>
               {{ $t('ExportReport') }}
@@ -149,6 +145,10 @@
             <span style="position: absolute;left: -13px;top: -4px">...</span>{{ $t('more') }}
           </div>
         </a-popconfirm>
+        <div class="operator-text" @click="bringInRelevantPersonnelClick">
+          <a-icon type="user"/>
+          {{ $t('bringInRelevantPersonnel') }}
+        </div>
         <div @click="transferClick" class="operator-text">
           <a-icon type="profile"/>
           {{ $t('Transfer') }}

jero-web/src/views/system/MessageDetails.vue

@@ -75,11 +75,11 @@
   }
 
   .box-content {
-    padding: 40px 120px;
+    padding: 40px 70px;
     box-sizing: border-box;
     color: #040B29;
     font-size: 16px;
-    text-indent: 30px;
-    letter-spacing: 3px
+    text-indent: 24px;
+    /*letter-spacing: 1px*/
   }
 </style>

jero-web/src/views/system/UserAnnouncementList.vue

@@ -105,7 +105,17 @@
           '2': this.$t('warningInformation'),
           '3': this.$t('ForwardPush'),
           '4': this.$t('authenticationMessage'),
-          '5': this.$t('taskRegulationComplianceTask')
+          '5': this.$t('taskRegulationComplianceTask'),
+          '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'),
         },
         columns: [
           {