Merge branch 'need_pool434' into debug

src/components/tipsWrapper.vue

@@ -0,0 +1,40 @@
+<template>
+  <div class="gn-statement-wrap" v-text="text" :style="style"></div>
+</template>
+<script>
+export default {
+  props: {
+    text: {
+      type: String,
+      default: '话术内容：严禁在本系统处理、传输国家秘密、“内部”和核心商密！请确认！'
+    },
+    style: {
+      type:Object,
+      default: {}
+    }
+  },
+  data() {
+    return {
+
+    }
+  },
+  mounted(){
+
+  },
+  methods:{
+
+  },
+}
+</script>
+<style scoped lang='scss'>
+.gn-statement-wrap {
+  background-color: #FEF0F0;
+  color: #CB070A;
+  font-size: 12px;
+  position: sticky;
+  width: 100%;
+  height: fit-content;
+  z-index: 999;
+  padding: 2px 5px;
+}
+</style>

src/utils/registryComponents.js

@@ -58,3 +58,7 @@ Vue.component('cascader',cascader)
 //调用指标的搜索交互统一（选择收藏和全部）  不含预测指标
 import edbSelectSearch from '@/components/edb/edbSelectSearch.vue';
 Vue.component('edbSelectSearch',edbSelectSearch)
+
+//全局告警提示区
+import tipsWrap from '@/components/tipsWrapper.vue';
+Vue.component('tipsWrap',tipsWrap)

src/views/Home.vue

@@ -398,6 +398,9 @@
             </div>
           </div>
         </div>
+
+        <tipsWrap/>
+        
         <section class="content-container" id="displayMain" ref="displayMain">
           <el-row
             class="grid-content bg-purple-light contentc"

src/views/report_manage/reportV2/list.vue

@@ -203,7 +203,7 @@
           >
             <template slot-scope="scope">{{
               scope.row.MsgSendTime 
-                ? $moment(scope.row.MsgSendTime).format('YYYY-MM-DD HH:mm:ss') 
+                ? $moment(scope.row.MsgSendTime).format('YYYY.MM.DD HH:mm:ss') 
                 : ''
             }}</template>
           </el-table-column>

src/views/report_manage/reportV2/normalReport/editReport.vue

@@ -56,6 +56,8 @@
 						@update="()=>{$refs.chapterContRef&&$refs.chapterContRef.getChapterList()}"
 					/>
 
+					<tipsWrap :style="{ top:'61px' }"/>
+
 					<div class="editor-main">
 						<div 
 							id="leftfroala"
@@ -634,7 +636,6 @@ export default {
 				justify-content: space-between;
 				align-content: center;
 				padding: 0 24px;
-				margin-bottom: 10px;
 				.title{
 						line-height: 60px;
 						font-size: 16px;

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -53,6 +53,9 @@
                     @update="()=>{$refs.chapterContRef&&$refs.chapterContRef.getChapterList()}"
                     @handleVersionRecord="handleVersionRecord()"
                 />
+
+                <tipsWrap/>
+                
                 <div class="main-wrap">
                     <div class="report-action-wrap">
                         <ul class="top-type-list">
@@ -1590,6 +1593,7 @@ div{
     min-height: 100vh;
     flex: 1;
     overflow: auto;
+    position: relative;
     .top-action-wrap{
         position: sticky;
         top: 0px;