Merge branch 'cmy/develop-bi' into develop

TEAMModelBI/ClientApp/src/view/common/header.vue

@@ -10,30 +10,33 @@
         </div>
         <div class="userbox">
             <el-dropdown>
-                <el-icon style="margin-right: 25px;margin-top:8px" v-if="circleUrl">
-                    <el-avatar :size="40" :src="circleUrl"></el-avatar>
-                </el-icon>
-                <PersonalPhoto style="cursor: pointer;" :name="user.name" width="40px" height="40px" v-else></PersonalPhoto>
+                <div>
+                    <el-icon style="margin-right: 25px;margin-top:8px" v-if="circleUrl">
+                        <el-avatar :size="40" :src="circleUrl"></el-avatar>
+                    </el-icon>
+                    <PersonalPhoto style="cursor: pointer;" :name="user.name" width="40px" height="40px" v-else></PersonalPhoto>
+                </div>
                 <template #dropdown>
                     <el-dropdown-menu>
-                        <!-- <el-dropdown-item>姓名：XXX</el-dropdown-item> -->
-                        <div class="userInfo">
-                            <svg class="header-icon" aria-hidden="true">
-                                <use xlink:href="#icon-yonghu"></use>
-                            </svg>
-                            {{$t(`header.name`)}}:{{user.name}}
-                        </div>
-                        <!-- <el-dropdown-item>
-                            <svg class="header-icon" aria-hidden="true">
-                                <use xlink:href="#icon-caozuorizhi-copy"></use>
-                            </svg>
-                            操作日志
-                        </el-dropdown-item> -->
+                        <el-dropdown-item>
+                            <div class="userInfo">
+                                <div>
+                                    <svg class="header-icon" aria-hidden="true">
+                                        <use xlink:href="#icon-yonghu"></use>
+                                    </svg>
+                                </div>
+                                <div>{{$t(`header.name`)}}:{{user.name}}</div>
+                            </div>
+                        </el-dropdown-item>
                         <el-dropdown-item @click="quit">
-                            <svg class="header-icon" aria-hidden="true">
-                                <use xlink:href="#icon-tuichu"></use>
-                            </svg>
-                            {{$t(`header.quit`)}}
+                            <div class="userInfo">
+                                <div>
+                                    <svg class="header-icon" aria-hidden="true">
+                                        <use xlink:href="#icon-tuichu"></use>
+                                    </svg>
+                                </div>
+                                <div> {{$t(`header.quit`)}}</div>
+                            </div>
                         </el-dropdown-item>
                     </el-dropdown-menu>
                 </template>
@@ -172,17 +175,18 @@ export default {
 .el-header {
     background-color: #b3c0d1;
     color: var(--el-text-color-primary);
-    line-height: 60px;
+    line-height: 40px;
 }
 .userInfo {
     list-style: none;
     line-height: 36px;
-    padding: 0 20px;
+    padding: 0 10px;
     margin: 0;
     font-size: var(--el-font-size-base);
     color: var(--el-text-color-regular);
     cursor: pointer;
     outline: 0;
+    display: flex;
 }
 .logsbox,
 .userbox {
@@ -246,4 +250,8 @@ export default {
 .logsbox .el-icon-s-order {
     font-size: 16px;
 }
+.userbox .el-tooltip__trigger{
+    border: none !important;
+    outline: none !important;
+}
 </style>

TEAMModelBI/ClientApp/src/view/systemConfig/pushmsg/createdpush.vue

@@ -32,7 +32,7 @@
             <el-form-item label="消息内容" prop="content">
               <el-input v-model="constructorData.basic.content" :autosize="{ minRows: 4, maxRows: 10 }" type="textarea" placeholder="推送消息的内容" />
             </el-form-item>
-            <el-form-item label="消息类型" prop="content" class="form-type">
+            <!-- <el-form-item label="消息类型" prop="content" class="form-type">
               <el-radio-group v-model="constructorData.basic.type" class="radio-type">
                 <el-radio label="1">
                   <el-tag color="rgba(99, 205, 218,.5)">系统型</el-tag>
@@ -47,7 +47,7 @@
                   <el-tag type="success">特殊型</el-tag>
                 </el-radio>
               </el-radio-group>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="是否跳转" prop="content" class="skip-switch">
               <div class="skip-switch">
                 <!-- <div class="skip-title">是否跳转地址</div> -->
@@ -376,7 +376,7 @@
                   <el-form-item label="消息内容" prop="content">
                     <el-input v-model="constructorData.basic.content" :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" placeholder="推送消息的内容" />
                   </el-form-item>
-                  <el-form-item label="消息类型" prop="content" class="form-type">
+                  <!-- <el-form-item label="消息类型" prop="content" class="form-type">
                     <el-radio-group v-model="constructorData.basic.type" class="radio-type">
                       <el-radio label="1">
                         <el-tag color="rgba(99, 205, 218,.5)">系统型</el-tag>
@@ -391,7 +391,7 @@
                         <el-tag type="success">特殊型</el-tag>
                       </el-radio>
                     </el-radio-group>
-                  </el-form-item>
+                  </el-form-item> -->
                   <el-form-item label="是否跳转" prop="content" class="skip-switch">
                     <div class="skip-switch">
                       <!-- <div class="skip-title">是否跳转地址</div> -->
@@ -428,14 +428,14 @@
                 <div class="source-box">
                   <span>消息来源：</span>
                   <el-radio-group v-model="constructorData.source" class="radio-time" @change="timechange">
-                    <el-radio label="BI" disabled>
-                      系统（BI）
+                    <el-radio label="system">
+                      系统通知
                     </el-radio>
                     <el-radio label="IES">
                       IES5（代替）
                     </el-radio>
                     <el-radio label="hita" disabled>
-                      HiTA（代替）
+                      Email发送
                     </el-radio>
                   </el-radio-group>
                 </div>
@@ -445,7 +445,7 @@
                     <el-radio label="immediately">
                       立刻发布推送
                     </el-radio>
-                    <el-radio label="preordered">
+                    <el-radio label="preordered" :disabled="constructorData.source ==='system' ? true:false">
                       预约时间发布
                     </el-radio>
                   </el-radio-group>
@@ -457,7 +457,7 @@
         </div>
         <div class="guidebox">
           <el-button @click="active=2">上一步</el-button>
-          <el-button type="primary" @click="publish">确认发布</el-button>
+          <el-button type="primary" @click="sourceMsg()">确认发布</el-button>
         </div>
       </div>
       <!--确认发布end-->
@@ -524,7 +524,7 @@ let constructorData = ref({
   basic: {
     title: '',
     content: '',
-    type: 0,
+    // type: 0,
     skipstate: false,
     skipUrl: '',
     callbackstate: false,
@@ -820,6 +820,15 @@ function pitchonly (val) {
   }
   console.log(val, constructorData.value.receivedata.personage)
 }
+//根据不同的消息来源 调用不同方法
+function sourceMsg(){
+  let values=constructorData.value.source
+  if(values ==='system'){
+    this.pushSystem()
+  }else{
+    this.publish()
+  }
+}
 //发布消息
 function publish () {
   if (!constructorData.value.source) {
@@ -858,6 +867,20 @@ function publish () {
     ElMessage.error('API异常，消息发送失败！')
   })
 }
+//system通知  访问TW API内容
+function pushSystem(){
+  console.log(constructorData.value)
+  console.log(receivedatas.value)
+  console.log(constructorData.value.receiveType)
+  let tagsData=[]; let receives=constructorData.value.receiveType =='hita5' ? 'HiTA':constructorData.value.receiveType
+  receivedatas.value.forEach((item)=>{tagsData.push(item.id+'_'+receives)})
+  let data={hubName:constructorData.value.receiveType,tags:tagsData,title:constructorData.value.basic.title,body:constructorData.value.basic.content}
+   proxy.$api.sendPushnotify(data).then((res)=>{
+     ElMessage.success('消息发送成功')
+   }).catch((error)=>{
+    ElMessage.error('API异常，消息发送失败！')
+   })
+}
 //clear数据
 function clearData () {
   constructorData.value.basic.title = ''