Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

core/apps/AppQyWxConfig/AppQyWxConfig.vue

@@ -31,5 +31,6 @@ export default {
 
 <style lang="scss" scoped>
 .AppQyWxConfig {
+  height: 100%;
 }
 </style>

project/dvui/components/AiDvRender.vue

@@ -41,7 +41,6 @@ import AiDvPanel from "../layout/AiDvPanel/AiDvPanel";
 import AiDvDisplay from "../layout/AiDvDisplay/AiDvDisplay";
 import AiDvSummary from "../layout/AiDvSummary/AiDvSummary";
 import AiSprite from "./AiSprite";
-import * as mods from "./AiSprite/mods";
 
 
 export default {

project/dvui/components/AiSprite/building/building1.js

@@ -1,4 +0,0 @@
-const initModel = () => {
-
-}
-export default initModel

project/dvui/components/AiSprite/mods.js

@@ -1 +0,0 @@
-export const building1 = import('./building/building1')

project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue

@@ -45,7 +45,8 @@
                       <ai-open-data type="departmentName" :openid="item.createUserDept" class="name"></ai-open-data>
                     </div>
                     <div class="flex-between">
-                      <div class="item-info">群发类型：<span>{{$dict.getLabel('mstSendType', item.sendType) || ''}}</span></div>
+                      <!-- <div class="item-info">群发类型：<span>{{$dict.getLabel('mstSendType', item.sendType) || ''}}</span></div> -->
+                      <div class="item-info">群发类型：<span>群发居民群</span></div>
                       <span class="item-btn" @click="$router.push({name: '357e228ba8e64008ace90d095a7a0dd7', params: { id: item.id }})">详情</span>
                     </div>
                   </el-card>