diff --git a/src/api/qualityManagement.js b/src/api/qualityManagement.js
index 9221b0c..ea2195c 100644
--- a/src/api/qualityManagement.js
+++ b/src/api/qualityManagement.js
@@ -73,6 +73,7 @@ export function completeInspetionExport(data) {
   return request({
     url: '/quality/processCompleteInspetion/export',
     method: 'post',
+    responseType: 'blob',
     data
   })
 }
@@ -93,7 +94,7 @@ export function queryPoint(data) {
     data
   })
 }
-
+// 缺陷散点图-绘图
 export function drawPoint(data) {
   return request({
     url: '/quality/ProcessFull/drawPoint',
@@ -101,7 +102,7 @@ export function drawPoint(data) {
     data
   })
 }
-
+// 缺陷散点图--底部明细
 export function queryPointClear(data) {
   return request({
     url: '/quality/ProcessFull/queryPointClear',
diff --git a/src/views/qualityManagement/components/defectScatterPlotChart.vue b/src/views/qualityManagement/components/defectScatterPlotChart.vue
index 9b81ec0..82175e8 100644
--- a/src/views/qualityManagement/components/defectScatterPlotChart.vue
+++ b/src/views/qualityManagement/components/defectScatterPlotChart.vue
@@ -45,103 +45,103 @@ export default {
       this.chartDom = document.getElementById('defectScatterPlotChart')
       this.chart = echarts.init(this.chartDom)
       const dataS = [
-        [1, 55, 9, 56, 0.46, 18, 6, '良'],
-        [2, 25, 11, 21, 0.65, 34, 9, '优'],
-        [3, 56, 7, 63, 0.3, 14, 5, '良'],
-        [4, 33, 7, 29, 0.33, 16, 6, '优'],
-        [5, 42, 24, 44, 0.76, 40, 16, '优'],
-        [6, 82, 58, 90, 1.77, 68, 33, '良'],
-        [7, 74, 49, 77, 1.46, 48, 27, '良'],
-        [8, 78, 55, 80, 1.29, 59, 29, '良'],
-        [9, 267, 216, 280, 4.8, 108, 64, '重度污染'],
-        [10, 185, 127, 216, 2.52, 61, 27, '中度污染'],
-        [11, 39, 19, 38, 0.57, 31, 15, '优'],
-        [12, 41, 11, 40, 0.43, 21, 7, '优'],
-        [13, 64, 38, 74, 1.04, 46, 22, '良'],
-        [14, 108, 79, 120, 1.7, 75, 41, '轻度污染'],
-        [15, 108, 63, 116, 1.48, 44, 26, '轻度污染'],
-        [16, 33, 6, 29, 0.34, 13, 5, '优'],
-        [17, 94, 66, 110, 1.54, 62, 31, '良'],
-        [18, 186, 142, 192, 3.88, 93, 79, '中度污染'],
-        [19, 57, 31, 54, 0.96, 32, 14, '良'],
-        [20, 22, 8, 17, 0.48, 23, 10, '优'],
-        [21, 39, 15, 36, 0.61, 29, 13, '优'],
-        [22, 94, 69, 114, 2.08, 73, 39, '良'],
-        [23, 99, 73, 110, 2.43, 76, 48, '良'],
-        [24, 31, 12, 30, 0.5, 32, 16, '优'],
-        [25, 42, 27, 43, 1, 53, 22, '优'],
-        [26, 154, 117, 157, 3.05, 92, 58, '中度污染'],
-        [27, 234, 185, 230, 4.09, 123, 69, '重度污染'],
-        [28, 160, 120, 186, 2.77, 91, 50, '中度污染'],
-        [29, 134, 96, 165, 2.76, 83, 41, '轻度污染'],
-        [30, 52, 24, 60, 1.03, 50, 21, '良'],
-        [31, 46, 5, 49, 0.28, 10, 6, '优']
+        [1, 55],
+        [2, 25],
+        [3, 56],
+        [4, 33],
+        [5, 42],
+        [6, 82],
+        [7, 74],
+        [8, 78],
+        [9, 267],
+        [10, 185],
+        [11, 39],
+        [12, 41],
+        [13, 64],
+        [14, 108],
+        [15, 108],
+        [16, 33],
+        [17, 94],
+        [18, 186],
+        [19, 57],
+        [20, 22],
+        [21, 39],
+        [22, 94],
+        [23, 99],
+        [24, 31],
+        [25, 42],
+        [26, 154],
+        [27, 234],
+        [28, 160],
+        [29, 134],
+        [30, 52],
+        [31, 46]
       ]
       const dataM = [
-        [1, 26, 37, 27, 1.163, 27, 13, '优'],
-        [2, 85, 62, 71, 1.195, 60, 8, '良'],
-        [3, 78, 38, 74, 1.363, 37, 7, '良'],
-        [4, 21, 21, 36, 0.634, 40, 9, '优'],
-        [5, 41, 42, 46, 0.915, 81, 13, '优'],
-        [6, 56, 52, 69, 1.067, 92, 16, '良'],
-        [7, 64, 30, 28, 0.924, 51, 2, '良'],
-        [8, 55, 48, 74, 1.236, 75, 26, '良'],
-        [9, 76, 85, 113, 1.237, 114, 27, '良'],
-        [10, 91, 81, 104, 1.041, 56, 40, '良'],
-        [11, 84, 39, 60, 0.964, 25, 11, '良'],
-        [12, 64, 51, 101, 0.862, 58, 23, '良'],
-        [13, 70, 69, 120, 1.198, 65, 36, '良'],
-        [14, 77, 105, 178, 2.549, 64, 16, '良'],
-        [15, 109, 68, 87, 0.996, 74, 29, '轻度污染'],
-        [16, 73, 68, 97, 0.905, 51, 34, '良'],
-        [17, 54, 27, 47, 0.592, 53, 12, '良'],
-        [18, 51, 61, 97, 0.811, 65, 19, '良'],
-        [19, 91, 71, 121, 1.374, 43, 18, '良'],
-        [20, 73, 102, 182, 2.787, 44, 19, '良'],
-        [21, 73, 50, 76, 0.717, 31, 20, '良'],
-        [22, 84, 94, 140, 2.238, 68, 18, '良'],
-        [23, 93, 77, 104, 1.165, 53, 7, '良'],
-        [24, 99, 130, 227, 3.97, 55, 15, '良'],
-        [25, 146, 84, 139, 1.094, 40, 17, '轻度污染'],
-        [26, 113, 108, 137, 1.481, 48, 15, '轻度污染'],
-        [27, 81, 48, 62, 1.619, 26, 3, '良'],
-        [28, 56, 48, 68, 1.336, 37, 9, '良'],
-        [29, 82, 92, 174, 3.29, 0, 13, '良'],
-        [30, 106, 116, 188, 3.628, 101, 16, '轻度污染'],
-        [31, 118, 50, 0, 1.383, 76, 11, '轻度污染']
+        [1, 26],
+        [2, 85],
+        [3, 78],
+        [4, 21],
+        [5, 41],
+        [6, 56],
+        [7, 64],
+        [8, 55],
+        [9, 76],
+        [10, 91],
+        [11, 84],
+        [12, 64],
+        [13, 70],
+        [14, 77],
+        [15, 109],
+        [16, 73],
+        [17, 54],
+        [18, 51],
+        [19, 91],
+        [20, 73],
+        [21, 73],
+        [22, 84],
+        [23, 93],
+        [24, 99],
+        [25, 146],
+        [26, 113],
+        [27, 81],
+        [28, 56],
+        [29, 82],
+        [30, 106],
+        [31, 118]
       ]
       const dataL = [
-        [1, 91, 45, 125, 0.82, 34, 23, '良'],
-        [2, 65, 27, 78, 0.86, 45, 29, '良'],
-        [3, 83, 60, 84, 1.09, 73, 27, '良'],
-        [4, 109, 81, 121, 1.28, 68, 51, '轻度污染'],
-        [5, 106, 77, 114, 1.07, 55, 51, '轻度污染'],
-        [6, 109, 81, 121, 1.28, 68, 51, '轻度污染'],
-        [7, 106, 77, 114, 1.07, 55, 51, '轻度污染'],
-        [8, 89, 65, 78, 0.86, 51, 26, '良'],
-        [9, 53, 33, 47, 0.64, 50, 17, '良'],
-        [10, 80, 55, 80, 1.01, 75, 24, '良'],
-        [11, 117, 81, 124, 1.03, 45, 24, '轻度污染'],
-        [12, 99, 71, 142, 1.1, 62, 42, '良'],
-        [13, 95, 69, 130, 1.28, 74, 50, '良'],
-        [14, 116, 87, 131, 1.47, 84, 40, '轻度污染'],
-        [15, 108, 80, 121, 1.3, 85, 37, '轻度污染'],
-        [16, 134, 83, 167, 1.16, 57, 43, '轻度污染'],
-        [17, 79, 43, 107, 1.05, 59, 37, '良'],
-        [18, 71, 46, 89, 0.86, 64, 25, '良'],
-        [19, 97, 71, 113, 1.17, 88, 31, '良'],
-        [20, 84, 57, 91, 0.85, 55, 31, '良'],
-        [21, 87, 63, 101, 0.9, 56, 41, '良'],
-        [22, 104, 77, 119, 1.09, 73, 48, '轻度污染'],
-        [23, 87, 62, 100, 1, 72, 28, '良'],
-        [24, 168, 128, 172, 1.49, 97, 56, '中度污染'],
-        [25, 65, 45, 51, 0.74, 39, 17, '良'],
-        [26, 39, 24, 38, 0.61, 47, 17, '优'],
-        [27, 39, 24, 39, 0.59, 50, 19, '优'],
-        [28, 93, 68, 96, 1.05, 79, 29, '良'],
-        [29, 188, 143, 197, 1.66, 99, 51, '中度污染'],
-        [30, 174, 131, 174, 1.55, 108, 50, '中度污染'],
-        [31, 187, 143, 201, 1.39, 89, 53, '中度污染']
+        [1, 91],
+        [2, 65],
+        [3, 83],
+        [4, 109],
+        [5, 106],
+        [6, 109],
+        [7, 106],
+        [8, 89],
+        [9, 53],
+        [10, 80],
+        [11, 117],
+        [12, 99],
+        [13, 95],
+        [14, 116],
+        [15, 108],
+        [16, 134],
+        [17, 79],
+        [18, 71],
+        [19, 97],
+        [20, 84],
+        [21, 87],
+        [22, 104],
+        [23, 87],
+        [24, 168],
+        [25, 65],
+        [26, 39],
+        [27, 39],
+        [28, 93],
+        [29, 188],
+        [30, 174],
+        [31, 187]
       ]
       var option = {
         color: [
diff --git a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
index 92be98e..d359868 100644
--- a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
+++ b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
@@ -11,6 +11,7 @@
             :table-props="tableProps"
             :table-data="tableData"
             :max-height="tableH"
+            @selection-change="selectChange"
           />
           <pagination :limit="listQuery.size" :total="total" />
         </div>
@@ -24,9 +25,10 @@
                 v-model="type"
                 size="small"
                 style="margin-right: 24px"
+                @change="selectType"
               >
-                <el-radio-button label="1">颗粒全选</el-radio-button>
-                <el-radio-button label="2">面检全选</el-radio-button>
+                <el-radio-button label="pellet">颗粒全选</el-radio-button>
+                <el-radio-button label="surface">面检全选</el-radio-button>
               </el-radio-group>
               <el-button
                 type="primary"
@@ -68,31 +70,36 @@ import { tableHeight } from '@/utils/index'
 import defectScatterPlotTotal from './../components/defectScatterPlotTotal.vue'
 import defectScatterPlotChart from './../components/defectScatterPlotChart.vue'
 import { queryPoint, drawPoint, queryPointClear } from '@/api/qualityManagement'
+import moment from 'moment'
+import { timeFormatter } from '@/utils'
 const tableProps = [
   {
-    prop: 'id',
-    label: 'D',
-    fixed: 'left'
+    prop: 'glassId',
+    label: 'ID',
+    fixed: 'left',
+    minWidth: 120
   },
   {
-    prop: 'fullInspectionType',
+    prop: 'testTime',
     label: '检验时间',
-    fixed: 'left'
+    fixed: 'left',
+    filter: timeFormatter,
+    minWidth: 160
   },
   {
-    prop: 'type',
+    prop: 'grindType',
     label: '研磨类型'
   },
   {
-    prop: 'width',
+    prop: 'electricity',
     label: '总电流'
   },
   {
-    prop: 'thick',
+    prop: 'particleSum',
     label: '颗粒总数'
   },
   {
-    prop: 'productQuality',
+    prop: 'surfaceSum',
     label: '面检总数'
   }
 ]
@@ -106,12 +113,15 @@ export default {
         {
           type: 'datePicker',
           label: '检验时间',
-          dateType: 'datetime',
+          dateType: 'datetimerange',
           format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          placeholder: '抽检时间',
-          param: 'testTime',
-          width: 200
+          valueFormat: 'yyyy-MM-ddTHH:mm:ss',
+          rangeSeparator: '-',
+          startPlaceholder: '开始时间',
+          endPlaceholder: '结束时间',
+          param: 'timeVal',
+          defaultSelect: [],
+          width: 350
         },
         {
           type: 'button',
@@ -122,14 +132,14 @@ export default {
       ],
       searchTime: '',
       listQuery: {
-        current: 1,
-        size: 20
+        startTime: '',
+        endTime: ''
       },
       tableProps,
       tableData: [],
       tableH: tableHeight(290),
       total: 0,
-      type: '1',
+      type: 'pellet',
       selectList: [
         { label: '1', value: '1' },
         { label: '2', value: '2' },
@@ -137,25 +147,47 @@ export default {
         { label: '4', value: '4' }
       ],
       checkItem: '',
-      checkList: [],
+      checkList: ['s', 'm', 'l', 'xl'],
       list: [
-        { label: 'S', value: 'S' },
+        { label: 'S', value: 's' },
         { label: 'M', value: 'm' },
         { label: 'L', value: 'l' },
         { label: 'XL', value: 'xl' },
-        { label: '气泡', value: 'qp' },
-        { label: '变形', value: 'bx' },
-        { label: '纤维', value: 'xw' },
-        { label: '划伤', value: 'hs' },
-        { label: '结节', value: 'jj' },
-        { label: '结石', value: 'js' },
-        { label: '铂金', value: 'bj' },
-        { label: '拖尾', value: 'tw' },
+        { label: '气泡', value: 'bl' },
+        { label: '变形', value: 'distortion' },
+        { label: '纤维', value: 'fiber' },
+        { label: '划伤', value: 'scratch' },
+        { label: '结节', value: 'knot' },
+        { label: '结石', value: 'stone' },
+        { label: '铂金', value: 'pt' },
+        { label: '拖尾', value: 'tail' },
         { label: 'ADG', value: 'adg' },
-        { label: '点状缺陷', value: '' },
-        { label: '锡缺陷(顶部)', value: 'xqxt' },
-        { label: '锡缺陷(底部)', value: 'xqxb' },
-        { label: '无法识别', value: 'wfsb' }
+        { label: '点状缺陷', value: 'tin' },
+        { label: '锡缺陷(顶部)', value: 'top' },
+        { label: '锡缺陷(底部)', value: 'bottom' },
+        { label: '无法识别', value: 'iisrest' }
+      ],
+      selectedGlassId: [],
+      leftList: [
+        { name: 'S', value: null, key: 's' },
+        { name: 'M', value: null, key: 'm' },
+        { name: 'L', value: null, key: 'l' },
+        { name: 'XL', value: null, key: 'xl' }
+      ],
+      rightList: [
+        { name: '气泡', value: null, key: 'bl' },
+        { name: '变形', value: null, key: 'distortion' },
+        { name: '纤维', value: null, key: 'fiber' },
+        { name: '划伤', value: null, key: 'scratch' },
+        { name: '点状缺陷', value: null, key: 'tin' },
+        { name: '结石', value: null, key: 'stone' },
+        { name: '铂金', value: null, key: 'pt' },
+        { name: '结节', value: null, key: 'knot' },
+        { name: '拖尾', value: null, key: 'tail' },
+        { name: 'ADG', value: null, key: 'adg' },
+        { name: '锡缺陷(顶部)', value: null, key: 'top' },
+        { name: '锡缺陷(底部)', value: null, key: 'bottom' },
+        { name: '无法识别', value: null, key: 'iisrest' }
       ]
     }
   },
@@ -163,33 +195,76 @@ export default {
     window.addEventListener('resize', () => {
       this.tableH = tableHeight(290)
     })
+    this.formConfig[0].defaultSelect = [
+      moment().format('yyyy-MM-DD') + 'T00:00:00',
+      moment().format('yyyy-MM-DD') + 'T23:59:59'
+    ]
+    this.listQuery.startTime = moment().format('yyyy-MM-DD') + 'T00:00:00'
+    this.listQuery.endTime = moment().format('yyyy-MM-DD') + 'T23:59:59'
     this.getList()
   },
   methods: {
     getList() {
-      // let arr = []
-      // for (let i = 0; i < 30; i++) {
-      //   let obj = {}
-      //   obj.id = i + 10
-      //   arr.push(obj)
-      // }
-      // this.tableData = arr
       queryPoint({ ...this.listQuery }).then((res) => {
         console.log(res)
+        this.tableData = res.data
       })
     },
     drawPic() {
+      // 绘图
+      this.getDetail()
       drawPoint().then((res) => {
         console.log(res)
       })
     },
     getDetail() {
-      queryPointClear().then((res) => {
+      // 明细
+      queryPointClear({
+        glassId: this.selectedGlassId
+      }).then((res) => {
         console.log(res)
       })
     },
     buttonClick(val) {
+      //查询
       console.log(val)
+      this.listQuery.startTime = val.timeVal ? val.timeVal[0] : ''
+      this.listQuery.endTime = val.timeVal ? val.timeVal[1] : ''
+      this.getList()
+    },
+    selectChange(val) {
+      console.log(val)
+      let arr = []
+      if (val.length > 0) {
+        for (let i = 0; i < val.length; i++) {
+          arr.push(val[i].glassId)
+        }
+        this.selectedGlassId = arr
+      } else {
+        this.selectedGlassId = []
+      }
+    },
+    selectType(val) {
+      console.log(val)
+      if (val === 'pellet') {
+        this.checkList = ['s', 'm', 'l', 'xl']
+      } else {
+        this.checkList = [
+          'bl',
+          'distortion',
+          'fiber',
+          'scratch',
+          'knot',
+          'stone',
+          'pt',
+          'tail',
+          'adg',
+          'tin',
+          'top',
+          'bottom',
+          'iisrest'
+        ]
+      }
     },
     moveEnd() {
       this.$refs.poltChart.getChart()