no message

927759ba · youjie · 9c0bea6b · 927759ba
Commit 927759ba authored May 21, 2025 by youjie
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

dmcTotalTable.vue src/components/dmc/manager/dmcTotalTable.vue +1 -4

No files found.
--- a/src/components/dmc/manager/dmcTotalTable.vue
+++ b/src/components/dmc/manager/dmcTotalTable.vue
@@ -448,11 +448,8 @@
                                <span class="daysInforCBox-r-scoret">评分：</span>
                                <el-rate v-model="child.Score" disabled text-color="#ff9900">
                                </el-rate>
-<<<<<<< HEAD
                                <span style="color: #ff9900;">{{child.Score.toFixed(1)}}</span>
-=======
-                                <span style="color: #ff9900;">{{child.Score}}</span>
->>>>>>> dbee8aa041ab9b2ea29599754eb7ca6c23776354
+
                              </div>
                            </div>
                            <div class="daysInforCBox-right">