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

project/dv/apps/components/AiGrid.vue

@@ -21,9 +21,7 @@
 </template>
 
 <script>
-  // import { VueOkrTree } from 'vue-okr-tree'
   import OkrTree from './vue-okr-tree/OkrTree'
-  // import 'vue-okr-tree/dist/vue-okr-tree.css'
 
   export default {
     name: 'AiGrid',
@@ -74,9 +72,9 @@
         if (elClass === 'tree' || elClass === 'middle' || (elClass && (elClass.indexOf('chart') > -1 || elClass.indexOf('user') > -1))) {
           var dir = event.deltaY > 0 ? 'Up' : 'Down'
           if (dir === 'Up') {
-            this.scale = this.scale - 0.2 <= 0.1 ? 0.1 : this.scale - 0.2
+            this.scale = this.scale - 0.12 <= 0.1 ? 0.1 : this.scale - 0.12
           } else {
-            this.scale = this.scale + 0.2
+            this.scale = this.scale + 0.12
           }
         }
 

project/dvui/components/AiDvRender.vue

@@ -27,7 +27,7 @@
       <ai-monitor :src="data.src" v-else-if="data.type === 'monitor'" :type="data.monitorType"/>
       <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay v-else-if="data.type === 'video'"/>
       <AiDvPartyOrg style="width: 100%; height: 100%;" v-else-if="data.type === 'partyOrg'" :instance="instance"/>
-      <ai-sprite v-else-if="/building/.test(data.type)" v-bind="data" is3D @init="mods[data.type]"/>
+      <!-- <ai-sprite v-else-if="/building/.test(data.type)" v-bind="data" is3D @init="mods[data.type]"/> -->
     </ai-dv-panel>
   </div>
 </template>
@@ -47,7 +47,7 @@ export default {
   name: 'AiDvRender',
   props: ['data', 'index', 'theme', 'instance'],
   components: {
-    AiSprite,
+    // AiSprite,
     AiDvSummary,
     AiDvDisplay,
     AiDvPanel,
@@ -56,7 +56,7 @@ export default {
   },
   data() {
     return {
-      mods,
+      // mods,
       chartList,
       map: null,
       lib: null