Browse Source

低优bug修复

刘洋 1 year ago
parent
commit
c4209beec1

+ 2 - 1
src/components/common/table-loop/big-table-loop-dialog.vue

@@ -1,7 +1,7 @@
 <template>
   <my-dialog
     :visible="visible"
-    header=""
+    :header="title || ''"
     :width="(width || 0) + 68"
     attach="body"
     :closeOnOverlayClick="false"
@@ -87,6 +87,7 @@ const props = defineProps({
   data: Object,
   columns: Array,
   width: Number,
+  title: String,
 });
 const modules = ref([Navigation, Mousewheel, Autoplay]);
 const swiperKey = ref(Date.now() + '');

+ 2 - 1
src/components/common/table-loop/index.vue

@@ -69,6 +69,7 @@
       :columns="columns"
       @close="visible = false"
       :width="bigTableWidth"
+      :title="title"
     ></BigTableLoopDialog>
   </div>
 </template>
@@ -82,7 +83,7 @@ import 'swiper/css';
 import 'swiper/css/autoplay';
 const visible = ref(false);
 const emits = defineEmits(['rowClick']);
-const props = defineProps({ data: Object, columns: Array });
+const props = defineProps({ data: Object, columns: Array, title: String });
 const modules = ref([Navigation, Mousewheel, Autoplay]);
 const swiperKey = ref(Date.now() + '');
 const tableLoop = ref();

+ 27 - 3
src/views/report/sop-analysis/index.vue

@@ -47,6 +47,13 @@
                 ref="chart1"
                 :data="tableDataHandle(result1)"
                 :columns="tableColumns1"
+                :title="
+                  sort1 == 'PENDING'
+                    ? '项目预警待处理TOP10'
+                    : sort1 == 'SLOWEST'
+                    ? '项目预警处理最慢TOP10'
+                    : '项目预警处理最快TOP10'
+                "
               ></table-loop>
             </div>
           </div>
@@ -81,6 +88,13 @@
                 ref="chart2"
                 :data="tableDataHandle(result2)"
                 :columns="tableColumns2"
+                :title="
+                  sort2 == 'PENDING'
+                    ? '大区预警待处理TOP10'
+                    : sort2 == 'SLOWEST'
+                    ? '大区预警处理最慢TOP10'
+                    : '大区预警处理最快TOP10'
+                "
               ></table-loop>
             </div>
           </div>
@@ -115,6 +129,13 @@
                 ref="chart3"
                 :data="tableDataHandle(result3)"
                 :columns="tableColumns3"
+                :title="
+                  sort3 == 'PENDING'
+                    ? '供应商预警待处理TOP10'
+                    : sort3 == 'SLOWEST'
+                    ? '供应商预警处理最慢TOP10'
+                    : '供应商预警处理最快TOP10'
+                "
               ></table-loop>
             </div>
           </div>
@@ -244,6 +265,7 @@
                 ref="chart4"
                 :data="tableDataHandle(result4)"
                 :columns="tableColumns4"
+                title="项目考勤异常TOP10"
               ></table-loop>
             </div>
           </div>
@@ -261,6 +283,7 @@
                 ref="chart5"
                 :data="tableDataHandle(result5)"
                 :columns="tableColumns5"
+                title="大区考勤异常TOP10"
               ></table-loop>
             </div>
           </div>
@@ -278,6 +301,7 @@
                 ref="chart6"
                 :data="tableDataHandle(result6)"
                 :columns="tableColumns6"
+                title="供应商考勤异常TOP5"
               ></table-loop>
             </div>
           </div>
@@ -604,7 +628,7 @@ const changeSort = (group, index) => {
                   padding: 4px 8px;
                   .label {
                     color: #8c8c8c;
-                    font-size: 12px;
+                    font-size: 15px;
                   }
                   .row2 {
                     margin-top: 5px;
@@ -615,7 +639,7 @@ const changeSort = (group, index) => {
                         display: flex;
                         align-items: center;
                         span {
-                          font-size: 12px;
+                          font-size: 11px;
                           color: #262626;
                           &:last-child {
                             padding-right: 20px;
@@ -641,7 +665,7 @@ const changeSort = (group, index) => {
                     .grid-item {
                       width: 33.33%;
                       p {
-                        font-size: 16px;
+                        font-size: 18px;
                         font-weight: bold;
                         color: #165dff;
                         &.red {

+ 9 - 3
src/views/resource-guard/person-guard/person-allocate/index.vue

@@ -327,9 +327,15 @@ const initData = () => {
 };
 
 const areaChange = (data) => {
-  params.province = data[0];
-  params.city = data[1];
-  params.area = data[2];
+  if (data) {
+    params.province = data[0];
+    params.city = data[1];
+    params.area = data[2];
+  } else {
+    params.province = '';
+    params.city = '';
+    params.area = '';
+  }
 };
 
 const handleBatchDeploy = () => {