Merge remote-tracking branch 'origin/master'

修改问题
1 changed files with 1 additions and 1 deletions
--- a/src/views/board/factoryIndex.vue
+++ b/src/views/board/factoryIndex.vue
@ -235,7 +235,7 @@
              <span>kwh</span>
            </div>
            <div class="schedule">
-              <div class="schedule1" :style="`width:${i.expend}%`"></div>
+              <div class="schedule1" :style="`width:${Math.min(100,i.expend)}%`"></div>
            </div>
          </div>
        </template>
Author	SHA1	Message	Date
suixy	2039ddc658	Merge remote-tracking branch 'origin/master'	2 weeks ago
suixy	5e9ade2f8e	修改问题	2 weeks ago