刘洋 1 жил өмнө
parent
commit
5981343249

+ 1 - 1
src/components/common/select-customer/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"
@@ -30,6 +29,7 @@ const props = defineProps({
   modelValue: { type: [Number, String, Array], default: '' },
   modelValue: { type: [Number, String, Array], default: '' },
   type: { type: String, default: '' },
   type: { type: String, default: '' },
   typeRequired: { type: Boolean, default: false },
   typeRequired: { type: Boolean, default: false },
+  showAll: { type: Boolean, default: false },
 });
 });
 const isMultiple = computed(() => {
 const isMultiple = computed(() => {
   const multiple = attrs.multiple;
   const multiple = attrs.multiple;

+ 0 - 1
src/components/common/select-filter-user/index.vue

@@ -7,7 +7,6 @@
     @search="search"
     @search="search"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

+ 1 - 1
src/components/common/select-free-engineer/index.bat.vue

@@ -9,7 +9,7 @@
         />
         />
       </div>
       </div>
     </template>
     </template>
-    <t-option value="" label="全部"></t-option>
+
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.userId"
       :key="item.userId"

+ 0 - 1
src/components/common/select-free-engineer/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.userId"
       :key="item.userId"

+ 0 - 1
src/components/common/select-product/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

+ 0 - 1
src/components/common/select-role/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

+ 0 - 1
src/components/common/select-service-level/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

+ 0 - 1
src/components/common/select-service-unit/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

+ 0 - 1
src/components/common/select-supplier/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

+ 0 - 1
src/components/common/select-type-user/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

+ 0 - 1
src/components/common/select-url-user/index.vue

@@ -6,7 +6,6 @@
     v-bind="attrs"
     v-bind="attrs"
     @change="onChange"
     @change="onChange"
   >
   >
-    <t-option value="" label="全部"></t-option>
     <t-option
     <t-option
       v-for="item in optionList"
       v-for="item in optionList"
       :key="item.id"
       :key="item.id"

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

@@ -37,7 +37,13 @@
           :style="v.style || {}"
           :style="v.style || {}"
         >
         >
           <div class="cell">
           <div class="cell">
-            <span v-if="v.prop !== 'rate'">{{ item[v.prop] }}</span>
+            <t-tooltip
+              v-if="v.prop !== 'rate'"
+              placement="top"
+              :content="item[v.prop]"
+            >
+              <span>{{ item[v.prop] }}</span>
+            </t-tooltip>
             <div class="process-box" v-else>
             <div class="process-box" v-else>
               <div class="process" :style="{ width: item.rate }"></div>
               <div class="process" :style="{ width: item.rate }"></div>
             </div>
             </div>
@@ -104,6 +110,11 @@ const rowClick = (item) => {
         display: flex;
         display: flex;
         justify-content: center;
         justify-content: center;
         align-items: center;
         align-items: center;
+        > span {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
       }
       }
     }
     }
   }
   }

+ 0 - 1
src/components/global/search-form/components/search-form-item.vue

@@ -46,7 +46,6 @@
       :multiple="item.type == 'multipleSelect'"
       :multiple="item.type == 'multipleSelect'"
       v-bind="attrs"
       v-bind="attrs"
     >
     >
-      <t-option value="" label="全部" v-if="item.type == 'select'"></t-option>
       <t-option
       <t-option
         v-for="itemValue in item.options"
         v-for="itemValue in item.options"
         :key="itemValue.value"
         :key="itemValue.value"

+ 4 - 7
src/views/report/service-analysis/index.vue

@@ -334,9 +334,7 @@ watch(serviceId, (serviceUnitId) => {
 const supplierId = ref('');
 const supplierId = ref('');
 const supplierOptions = computed(() => {
 const supplierOptions = computed(() => {
   return (result2.value?.supplierDistribution || []).map((item) => {
   return (result2.value?.supplierDistribution || []).map((item) => {
-    item.label = item.name;
-    item.value = item.id;
-    return item;
+    return { ...item, label: item.name, value: item.id };
   });
   });
   //与result2相关,转换数据即可
   //与result2相关,转换数据即可
   return [];
   return [];
@@ -385,12 +383,12 @@ const options1 = computed(() => {
 });
 });
 
 
 const options2 = computed(() => {
 const options2 = computed(() => {
-  const supplierDistribution = result2?.supplierDistribution || [];
+  const supplierDistribution = result2.value?.supplierDistribution || [];
+
   return createRingPieOption(
   return createRingPieOption(
     {
     {
       data: supplierDistribution.map((item) => {
       data: supplierDistribution.map((item) => {
-        item.value = item.count;
-        return item;
+        return { ...item, name: item.name || 'null', value: item.count };
       }),
       }),
       title: '派单数',
       title: '派单数',
       center: ['50%', '30%'],
       center: ['50%', '30%'],
@@ -513,7 +511,6 @@ const options8 = computed(() => {
       data: data,
       data: data,
     });
     });
   }
   }
-  console.log(xData, sData);
   return createStackingBarOption(
   return createStackingBarOption(
     {
     {
       xData: xData,
       xData: xData,

+ 22 - 22
src/views/report/sop-analysis/index.vue

@@ -329,92 +329,92 @@ const tableDataHandle = (data) => {
 };
 };
 const tableColumns1 = [
 const tableColumns1 = [
   {
   {
-    prop: 'a',
+    prop: 'crmName',
     label: '客户名称',
     label: '客户名称',
     style: { width: '60px' },
     style: { width: '60px' },
   },
   },
   {
   {
-    prop: 'b',
+    prop: 'province',
     label: '大区',
     label: '大区',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
   {
   {
-    prop: 'c',
+    prop: 'real_name',
     label: '区域协调人',
     label: '区域协调人',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
-  { prop: 'd', label: '预警数', style: { width: '60px' } },
+  { prop: 'avgWarn', label: '预警数', style: { width: '60px' } },
 ];
 ];
 const tableColumns2 = [
 const tableColumns2 = [
   {
   {
-    prop: 'a',
+    prop: 'province',
     label: '大区',
     label: '大区',
     style: { width: '60px' },
     style: { width: '60px' },
   },
   },
   {
   {
-    prop: 'b',
+    prop: 'real_name',
     label: '大区经理',
     label: '大区经理',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
   {
   {
-    prop: 'c',
+    prop: 'avgWarn',
     label: '预警数',
     label: '预警数',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
-  { prop: 'd', label: '均值', style: { width: '60px' } },
+  { prop: 'avgMinutes', label: '均值', style: { width: '60px' } },
 ];
 ];
 
 
 const tableColumns3 = [
 const tableColumns3 = [
   {
   {
-    prop: 'a',
+    prop: 'supplier',
     label: '供应商',
     label: '供应商',
     style: { width: '60px' },
     style: { width: '60px' },
   },
   },
   {
   {
-    prop: 'b',
+    prop: 'province',
     label: '大区',
     label: '大区',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
   {
   {
-    prop: 'c',
+    prop: 'real_name',
     label: '区域协调人',
     label: '区域协调人',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
-  { prop: 'd', label: '预警数', style: { width: '70px' } },
-  { prop: 'e', label: '均值', style: { width: '60px' } },
+  { prop: 'avgWarn', label: '预警数', style: { width: '70px' } },
+  { prop: 'avgMinutes', label: '均值', style: { width: '60px' } },
 ];
 ];
 
 
 const tableColumns4 = [
 const tableColumns4 = [
   {
   {
-    prop: 'a',
+    prop: 'crmName',
     label: '客户名称',
     label: '客户名称',
     style: { width: '60px' },
     style: { width: '60px' },
   },
   },
   {
   {
-    prop: 'b',
+    prop: 'dname',
     label: '考勤对象',
     label: '考勤对象',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
   {
   {
-    prop: 'c',
+    prop: 'real_name',
     label: '区域协调人',
     label: '区域协调人',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
-  { prop: 'd', label: '异常数', style: { width: '60px' } },
+  { prop: 'total', label: '异常数', style: { width: '60px' } },
 ];
 ];
 const tableColumns5 = [
 const tableColumns5 = [
   {
   {
-    prop: 'a',
+    prop: 'province',
     label: '大区',
     label: '大区',
     style: { width: '60px' },
     style: { width: '60px' },
   },
   },
   {
   {
-    prop: 'b',
+    prop: 'real_name',
     label: '大区经理',
     label: '大区经理',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
   {
   {
-    prop: 'c',
+    prop: 'total',
     label: '异常数',
     label: '异常数',
     style: { width: '70px' },
     style: { width: '70px' },
   },
   },
@@ -423,11 +423,11 @@ const tableColumns5 = [
 
 
 const tableColumns6 = [
 const tableColumns6 = [
   {
   {
-    prop: 'a',
+    prop: 'supplier',
     label: '供应商',
     label: '供应商',
     style: { width: '80px' },
     style: { width: '80px' },
   },
   },
-  { prop: 'd', label: '异常数', style: { width: '70px' } },
+  { prop: 'total', label: '异常数', style: { width: '70px' } },
   { prop: 'e', label: '均值', style: { width: '60px' } },
   { prop: 'e', label: '均值', style: { width: '60px' } },
 ];
 ];
 watch(serviceId, (serviceId) => {
 watch(serviceId, (serviceId) => {