Merge remote-tracking branch 'origin/dev_2nd_period_test' into dev_2nd_period_test

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java

@@ -213,7 +213,8 @@ public class SysAnnouncementSendController {
 	@GetMapping(value = "/getMyAnnouncementSend")
 	public Result<IPage<AnnouncementSendModel>> getMyAnnouncementSend(AnnouncementSendModel announcementSendModel,
 			@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-			  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+			  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																	  String cut) {
 		Result<IPage<AnnouncementSendModel>> result = new Result<IPage<AnnouncementSendModel>>();
 		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
 		String userId = sysUser.getId();
@@ -221,7 +222,7 @@ public class SysAnnouncementSendController {
 		announcementSendModel.setPageNo((pageNo-1)*pageSize);
 		announcementSendModel.setPageSize(pageSize);
 		Page<AnnouncementSendModel> pageList = new Page<AnnouncementSendModel>(pageNo,pageSize);
-		pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel);
+		pageList = sysAnnouncementSendService.getMyAnnouncementSendPage(pageList, announcementSendModel,cut);
 		result.setResult(pageList);
 		result.setSuccess(true);
 		return result;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -72,6 +72,9 @@
         </if>
         <if test="announcementSendModel.msgContent !=null and announcementSendModel.msgContent != ''">
             and sa.msg_content LIKE concat(concat('%',#{announcementSendModel.msgContent}),'%')
+        </if>
+        <if test="announcementSendModel.msgContentCn !=null and announcementSendModel.msgContentCn != ''">
+            and sa.msg_content_cn LIKE concat(concat('%',#{announcementSendModel.msgContentCn}),'%')
         </if>
 	   order by sas.read_flag,sa.send_time desc
 	</select>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysAnnouncementSendService.java

@@ -23,7 +23,7 @@ public interface ISysAnnouncementSendService extends IService<SysAnnouncementSen
 	 * @param announcementSendModel
 	 * @return
 	 */
-	public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel);
+	public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,AnnouncementSendModel announcementSendModel,String cut);
 
 	List<AnnouncementSendModel> getMessageUnreadList();
 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysAnnouncementSendServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.system.entity.SysAnnouncementSend;
 import com.jero.modules.system.mapper.SysAnnouncementSendMapper;
@@ -34,7 +35,11 @@ public class SysAnnouncementSendServiceImpl extends ServiceImpl<SysAnnouncementS
 
 	@Override
 	public Page<AnnouncementSendModel> getMyAnnouncementSendPage(Page<AnnouncementSendModel> page,
-			AnnouncementSendModel announcementSendModel) {
+			AnnouncementSendModel announcementSendModel,String cut) {
+		if(CutEnum.CN.getValue().equals(cut)){
+			announcementSendModel.setMsgContentCn(announcementSendModel.getMsgContent());
+			announcementSendModel.setMsgContent(null);
+		}
 		 return page.setRecords(sysAnnouncementSendMapper.getMyAnnouncementSendList(page, announcementSendModel));
 	}
 

jero-web/src/components/tools/HeaderNotice.vue

@@ -15,9 +15,9 @@
               <a-list-item :key="index" v-for="(record, index) in announcement1" v-if="index <= 4">
                 <div style="margin-left: 5%;width: 80%;">
                   <p style="overflow: hidden; text-overflow: ellipsis;white-space: nowrap;color:#00B3BE">
-                    <a :title="language == 'zh-cn'?record.msgContentCn:record.msgContent"
+                    <a :title="language == 'zh-cn'&& record.msgContentCn?record.msgContentCn:record.msgContent"
                        @click="showAnnouncement(record)">
-                      {{ language == 'zh-cn'?record.msgContentCn:record.msgContent }}
+                      {{ language == 'zh-cn'&& record.msgContentCn?record.msgContentCn:record.msgContent }}
                     </a>
                   </p>
                 </div>

jero-web/src/views/businessSupport/problemKnowledgeBase/index.vue

@@ -4,7 +4,7 @@
       <a-tab-pane :key="$t('problemKnowledgeBase')" :tab="$t('problemKnowledgeBase')">
         <problemKnowledgeBaseList v-if="tabModel == $t('problemKnowledgeBase')" ref="problemKnowledgeBaseListRef"/>
       </a-tab-pane>
-      <a-tab-pane key="Country Card" tab="Country Card">
+      <a-tab-pane v-if="isTrue" key="Country Card" tab="Country Card">
         <countryCardList v-if="tabModel == 'Country Card'" ref="countryCardListRef"/>
       </a-tab-pane>
     </a-tabs>
@@ -13,6 +13,7 @@
 <script>
   import problemKnowledgeBaseList from './components/problemKnowledgeBaseList'
   import countryCardList from './components/countryCardList'
+  import { USER_AUTH, SYS_BUTTON_AUTH } from '@/store/mutation-types'
 
   export default {
     name: 'index',
@@ -22,10 +23,18 @@
     },
     data() {
       return {
-        tabModel: this.$t('problemKnowledgeBase')
+        tabModel: this.$t('problemKnowledgeBase'),
+        isTrue:false,
       }
     },
     mounted() {
+      let userAuthList = JSON.parse(sessionStorage.getItem(USER_AUTH) || '[]')
+      this.isTrue = false
+      userAuthList.map(res => {
+        if (res.action == 'countryCard:list') {
+             this.isTrue = true
+        }
+      })
     },
     methods: {
       callback(key) {

jero-web/src/views/dashboard/components/myNews.vue

@@ -11,8 +11,8 @@
       <div class="myNews-box-content-box" v-for="(item,index) in dataSource" :key="index" @click="magClick(item)">
         <img src="../../../assets/wdxx.png" alt="">
         <div class="content-box">
-          <div class="top" :title="language == 'zh-cn'?item.msgContentCn:item.msgContent">
-            {{language == 'zh-cn'?item.msgContentCn:item.msgContent}}
+          <div class="top" :title="language == 'zh-cn' && item.msgContentCn?item.msgContentCn:item.msgContent">
+            {{language == 'zh-cn' && item.msgContentCn?item.msgContentCn:item.msgContent}}
           </div>
           <div class="botton">
             {{item.sendTime}}

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -38,6 +38,9 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+        <span slot="serial_number" slot-scope="text,result">
+            <a @click="standClick(result)" :title="text">{{text}}</a>
+        </span>
         <span slot="vehicleInProductionDate" slot-scope="text,result">
               <span v-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'yellow'">
                    {{text}}
@@ -164,7 +167,7 @@
             dataIndex: 'title',
             ellipsis: true,
             width: 170,
-            scopedSlots: { customRender: 'titleName' }
+            scopedSlots: { customRender: 'serial_number' }
           },
           {
             title: this.$t('status'),
@@ -244,6 +247,15 @@
       eventBUs.$off('searchQuery')
     },
     methods: {
+      standClick(val){
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: val.id
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
       callback(tab) {
         this.selectedRowKeys = []
         this.activeTab = tab

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

@@ -73,8 +73,8 @@
       <span slot="msgTitile" slot-scope="text,scope">
 <!--         @click="msgContentClick(scope)"-->
            <a :style="{'color':scope.readFlag == 0 ? 'red':'#00A0E9'}"
-              :title="language == 'zh-cn' ? scope.msgContentCn : scope.msgContent">
-             {{language == 'zh-cn' ? scope.msgContentCn : scope.msgContent}}
+              :title="language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent">
+             {{language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent}}
            </a>
       </span>
       <span slot="msgCategory" slot-scope="text,scope">
@@ -84,7 +84,7 @@
            </span>
       </span>
       <p slot="expandedRowRender" slot-scope="record" style="margin: 0;padding-left: 58px;">
-        <span v-html="language == 'zh-cn' ? record.msgContentInfoCn : record.msgContentInfo">
+        <span v-html="language == 'zh-cn' && record.msgContentInfoCn? record.msgContentInfoCn : record.msgContentInfo">
         </span>
       </p>
     </a-table>