From ccc80ee33e68d3b46c7b344ac80148c7bd210e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 19 Apr 2024 15:17:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/board/scanDown/index.vue            |   2 +-
 .../report/adverseRecordYearOnYear/index.vue  | 268 ++++++++++++++++++
 src/views/report/highFault/index.vue          |  26 ++
 src/views/report/weldLeakRate/index.vue       |  26 ++
 4 files changed, 321 insertions(+), 1 deletion(-)
 create mode 100644 src/views/report/adverseRecordYearOnYear/index.vue
 create mode 100644 src/views/report/highFault/index.vue
 create mode 100644 src/views/report/weldLeakRate/index.vue

diff --git a/src/views/board/scanDown/index.vue b/src/views/board/scanDown/index.vue
index d06b5c5..96f0dad 100644
--- a/src/views/board/scanDown/index.vue
+++ b/src/views/board/scanDown/index.vue
@@ -817,7 +817,7 @@ export default {
               },
               legend: {
                 itemWidth: 3 * vw,
-                data: ['不良数', '一次不合格率', '目标'],
+                data: ['不良数', '不合格率', '目标'],
                 textStyle: {
                   color: "#d1e6eb",
                   margin: 15,
diff --git a/src/views/report/adverseRecordYearOnYear/index.vue b/src/views/report/adverseRecordYearOnYear/index.vue
new file mode 100644
index 0000000..daf215b
--- /dev/null
+++ b/src/views/report/adverseRecordYearOnYear/index.vue
@@ -0,0 +1,268 @@
+<template>
+  <div class="app-container">
+    <el-form :inline="true" :model="form" ref="form">
+      <el-form-item label="年度" prop="year">
+        <el-input v-model="form.year" placeholder="选择年度"></el-input>
+      </el-form-item>
+      <el-form-item label="产线" prop="productionLine">
+        <el-select v-model="form.productionLine" placeholder="选择产线">
+          <el-option :label="i.label" :value="i.value" v-for="i in option"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit">查询</el-button>
+        <el-button @click="resetForm('form')">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        prop="date"
+        label="工序"
+        width="150">
+      </el-table-column>
+      <el-table-column :label="i.label" v-for="i in tableHead">
+        <el-table-column
+          v-for="item in i"
+          :prop="i.value"
+          :label="i.label"
+          width="120">
+        </el-table-column>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {findProductLineList} from '@//api/base/productLine'
+import {parseTime} from '@//utils/ruoyi'
+import {
+  boxTraceabilityDetailReport,
+  boxTraceabilityReport,
+} from '@//api/report/reportAPI'
+
+export default {
+  name: 'ProductOffLine',
+  data() {
+    return {
+      tableData: [
+        {
+        date: '2016-05-03',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-08',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-06',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-07',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }],
+      form: {},
+      option: [
+        {
+          value: '11',
+          label: '一号线'
+        },
+        {
+          value: '22',
+          label: '二号线'
+        },
+      ],
+      tableHead:[
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+        {
+          label:'今年1月',
+          children:[
+            {
+              label:'不良数',
+              value:'column1_1',
+            },
+            {
+              label:'总产量',
+              value:'column1_2',
+            },
+            {
+              label:'不良率',
+              value:'column1_3',
+            },
+          ]
+        },
+      ]
+    }
+  },
+  created() {
+  },
+  methods: {
+    onSubmit(){
+      console.log(this.form)
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+/deep/ .el-table .cell{
+  text-align: center !important;
+}
+</style>
diff --git a/src/views/report/highFault/index.vue b/src/views/report/highFault/index.vue
new file mode 100644
index 0000000..584ace4
--- /dev/null
+++ b/src/views/report/highFault/index.vue
@@ -0,0 +1,26 @@
+<template>
+  <div class="app-container">
+    3
+  </div>
+</template>
+
+<script>
+import { findProductLineList } from '@//api/base/productLine'
+import { parseTime } from '@//utils/ruoyi'
+import {
+  boxTraceabilityDetailReport,
+  boxTraceabilityReport,
+} from '@//api/report/reportAPI'
+
+export default {
+  name: 'ProductOffLine',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/views/report/weldLeakRate/index.vue b/src/views/report/weldLeakRate/index.vue
new file mode 100644
index 0000000..a6e6b4a
--- /dev/null
+++ b/src/views/report/weldLeakRate/index.vue
@@ -0,0 +1,26 @@
+<template>
+  <div class="app-container">
+    2
+  </div>
+</template>
+
+<script>
+import { findProductLineList } from '@//api/base/productLine'
+import { parseTime } from '@//utils/ruoyi'
+import {
+  boxTraceabilityDetailReport,
+  boxTraceabilityReport,
+} from '@//api/report/reportAPI'
+
+export default {
+  name: 'ProductOffLine',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>

From d31477507e1863dfad138a45be9ab35bd78e20b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 19 Apr 2024 15:46:16 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/adverseRecordYearOnYear/index.vue  |   8 +-
 src/views/report/highFault/index.vue          | 157 +++++++++++++++++-
 2 files changed, 156 insertions(+), 9 deletions(-)

diff --git a/src/views/report/adverseRecordYearOnYear/index.vue b/src/views/report/adverseRecordYearOnYear/index.vue
index daf215b..7b475c4 100644
--- a/src/views/report/adverseRecordYearOnYear/index.vue
+++ b/src/views/report/adverseRecordYearOnYear/index.vue
@@ -2,7 +2,13 @@
   <div class="app-container">
     <el-form :inline="true" :model="form" ref="form">
       <el-form-item label="年度" prop="year">
-        <el-input v-model="form.year" placeholder="选择年度"></el-input>
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          format="yyyy"
+          value-format="yyyy"
+          placeholder="选择年">
+        </el-date-picker>
       </el-form-item>
       <el-form-item label="产线" prop="productionLine">
         <el-select v-model="form.productionLine" placeholder="选择产线">
diff --git a/src/views/report/highFault/index.vue b/src/views/report/highFault/index.vue
index 584ace4..6c21852 100644
--- a/src/views/report/highFault/index.vue
+++ b/src/views/report/highFault/index.vue
@@ -1,26 +1,167 @@
 <template>
   <div class="app-container">
-    3
+    <el-form :inline="true" :model="form" ref="form">
+      <el-form-item label="工厂" prop="factory">
+        <el-select v-model="form.factory" placeholder="选择工厂">
+          <el-option :label="i.label" :value="i.value" v-for="i in option"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产线" prop="productionLine">
+        <el-select v-model="form.productionLine" placeholder="选择产线">
+          <el-option :label="i.label" :value="i.value" v-for="i in option1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="下线时间" prop="date">
+        <el-date-picker
+          v-model="form.date"
+          type="daterange"
+          format="yyyy-mm-dd"
+          value-format="yyyy-mm-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList">查询</el-button>
+        <el-button @click="resetForm('form')">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        type="index"
+        label="序号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="type"
+        label="产品型号">
+      </el-table-column>
+      <el-table-column
+        prop="num"
+        label="问题数量">
+      </el-table-column>
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="form.pageNum"
+      :limit.sync="form.pageSize"
+      @pagination="getList"
+    />
+    <h3 style="font-weight: 600">高故障Top20柱状图</h3>
+    <div style="width: 100%;height: 30vw">
+      <Chart ref="chart1"></Chart>
+    </div>
   </div>
 </template>
 
 <script>
-import { findProductLineList } from '@//api/base/productLine'
-import { parseTime } from '@//utils/ruoyi'
-import {
-  boxTraceabilityDetailReport,
-  boxTraceabilityReport,
-} from '@//api/report/reportAPI'
+import Chart from "@/components/board/Chart";
 
 export default {
   name: 'ProductOffLine',
+  components:{
+    Chart,
+  },
   data() {
     return {
+      total:100,
+      form: {
+        pageNum:1,
+        pageSize:10
+      },
+      option: [
+        {
+          value: '11',
+          label: '工厂一'
+        },
+        {
+          value: '22',
+          label: '工厂二'
+        },
+      ],
+      option1: [
+        {
+          value: '11',
+          label: '产线一'
+        },
+        {
+          value: '22',
+          label: '产线二'
+        },
+      ],
+      tableData: [
+        {
+          type:'1',
+          num:1,
+        },
+        {
+          type:'1',
+          num:1,
+        },
+        {
+          type:'1',
+          num:1,
+        },
+        {
+          type:'1',
+          num:1,
+        },
+        {
+          type:'1',
+          num:1,
+        },
+      ]
     }
   },
-  created() {
+  mounted() {
+    this.$refs.chart1.setData({
+      tooltip: {
+        trigger: 'axis',
+        axisPointer: {
+          type: 'shadow'
+        }
+      },
+      legend: {},
+      grid: {
+        left: '3%',
+        right: '4%',
+        bottom: '3%',
+        containLabel: true
+      },
+      xAxis: {
+        type: 'value',
+        position:'top',
+        boundaryGap: [0, 0.01]
+      },
+      yAxis: {
+        type: 'category',
+        data: ['Brazil', 'Indonesia', 'USA', 'India', 'China', 'World']
+      },
+      series: [
+        {
+          name: '数量',
+          type: 'bar',
+          data: [18203, 23489, 29034, 104970, 131744, 630230]
+        },
+      ]
+    })
   },
   methods: {
+    getList(){
+      console.log(this.form)
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
   }
 }
 </script>
+<style lang="less" scoped>
+/deep/ .el-table .cell{
+  text-align: center !important;
+}
+</style>

From bb74f154b66b5c95078b9af8810e22d3cce704a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 19 Apr 2024 16:03:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/adverseRecordYearOnYear/index.vue  |   4 +-
 src/views/report/weldLeakRate/index.vue       | 276 +++++++++++++++++-
 2 files changed, 268 insertions(+), 12 deletions(-)

diff --git a/src/views/report/adverseRecordYearOnYear/index.vue b/src/views/report/adverseRecordYearOnYear/index.vue
index 7b475c4..e44d7b0 100644
--- a/src/views/report/adverseRecordYearOnYear/index.vue
+++ b/src/views/report/adverseRecordYearOnYear/index.vue
@@ -32,8 +32,8 @@
       <el-table-column :label="i.label" v-for="i in tableHead">
         <el-table-column
           v-for="item in i"
-          :prop="i.value"
-          :label="i.label"
+          :prop="item.value"
+          :label="item.label"
           width="120">
         </el-table-column>
       </el-table-column>
diff --git a/src/views/report/weldLeakRate/index.vue b/src/views/report/weldLeakRate/index.vue
index a6e6b4a..4509c44 100644
--- a/src/views/report/weldLeakRate/index.vue
+++ b/src/views/report/weldLeakRate/index.vue
@@ -1,26 +1,282 @@
 <template>
   <div class="app-container">
-    2
+    <el-form :inline="true" :model="form" ref="form">
+      <el-form-item label="年份" prop="year">
+        <el-date-picker
+          v-model="form.year"
+          type="year"
+          placeholder="选择年">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="周期" prop="period">
+        <el-select v-model="form.period" placeholder="选择周期">
+          <el-option :label="i.label" :value="i.value" v-for="i in option"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList">查询</el-button>
+        <el-button @click="resetForm('form')">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table
+      :data="tableData"
+      style="width: 100%">
+      <el-table-column
+        prop="type"
+        label="工序"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        v-for="i in tableHead"
+        :prop="i.value"
+        :label="i.label"
+        width="120">
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="form.pageNum"
+      :limit.sync="form.pageSize"
+      @pagination="getList"
+    />
+    <h3 style="font-weight: 600">焊漏率折线图</h3>
+    <div style="width: 100%;height: 30vw">
+      <Chart ref="chart1"></Chart>
+    </div>
   </div>
 </template>
 
 <script>
-import { findProductLineList } from '@//api/base/productLine'
-import { parseTime } from '@//utils/ruoyi'
-import {
-  boxTraceabilityDetailReport,
-  boxTraceabilityReport,
-} from '@//api/report/reportAPI'
+import Chart from "@/components/board/Chart";
 
 export default {
   name: 'ProductOffLine',
+  components: {
+    Chart,
+  },
   data() {
     return {
+      total: 100,
+      form: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      option: [
+        {
+          value: '11',
+          label: '日'
+        },
+        {
+          value: '22',
+          label: '月'
+        },
+        {
+          value: '33',
+          label: '年'
+        },
+      ],
+      tableData: [
+        {
+          type: '1',
+          column1: 1,
+        },
+        {
+          type: '1',
+          column1: 1,
+        },
+        {
+          type: '1',
+          column1: 1,
+        },
+        {
+          type: '1',
+          column1: 1,
+        },
+        {
+          type: '1',
+          column1: 1,
+        },
+      ],
+
+      tableHead:  [
+        {
+          label: '第1周',
+          value: 'column1',
+        },
+        {
+          label: '第2周',
+          value: 'column1',
+        },
+        {
+          label: '第3周',
+          value: 'column1',
+        },
+        {
+          label: '第4周',
+          value: 'column1',
+        },
+        {
+          label: '第5周',
+          value: 'column1',
+        },
+        {
+          label: '第6周',
+          value: 'column1',
+        },
+      ]
     }
-  },
-  created() {
-  },
+  }
+  ,
+  mounted() {
+    this.$refs.chart1.setData({
+      tooltip: {
+        trigger: "axis",
+      },
+      legend: {},
+      grid: {
+        top: "middle",
+        left: "3%",
+        right: "4%",
+        bottom: "3%",
+        height: "80%",
+        containLabel: true,
+      },
+      xAxis: {
+        type: "category",
+        data: [100, 200, 20, 30, 60, 89],
+        axisLine: {
+          lineStyle: {
+            color: "#999",
+          },
+        },
+      },
+      yAxis: {
+        type: "value",
+        axisLabel: {
+          formatter: '{value}%'
+        },
+        splitLine: {
+          lineStyle: {
+            type: "dashed",
+            color: "#DDD",
+          },
+        },
+        axisLine: {
+          show: false,
+          lineStyle: {
+            color: "#333",
+          },
+        },
+        nameTextStyle: {
+          color: "#999",
+        },
+        splitArea: {
+          show: false,
+        },
+      },
+      series: [
+        {
+          name: "冰箱A线",
+          type: "line",
+          data: [800, 900, 220, 130, 660, 289],
+          color: "#F58080",
+          lineStyle: {
+            normal: {
+              width: 2,
+              color: {
+                type: "linear",
+
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#FFCAD4", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.4,
+                    color: "#F58080", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#F58080", // 100% 处的颜色
+                  },
+                ],
+                globalCoord: false, // 缺省为 false
+              },
+            },
+          },
+          itemStyle: {
+            normal: {
+              color: "#F58080",
+              borderWidth: 10,
+              /*shadowColor: 'rgba(72,216,191, 0.3)',
+                         shadowBlur: 100,*/
+              borderColor: "#F58080",
+            },
+          },
+          smooth: true,
+        },
+        {
+          name: "冰箱B线",
+          type: "line",
+          data: [123, 568, 111, 222, 123, 56],
+          lineStyle: {
+            normal: {
+              width: 2,
+              color: {
+                type: "linear",
+
+                colorStops: [
+                  {
+                    offset: 0,
+                    color: "#AAF487", // 0% 处的颜色
+                  },
+                  {
+                    offset: 0.4,
+                    color: "#47D8BE", // 100% 处的颜色
+                  },
+                  {
+                    offset: 1,
+                    color: "#47D8BE", // 100% 处的颜色
+                  },
+                ],
+                globalCoord: false, // 缺省为 false
+              },
+              shadowColor: "rgba(71,216,190, 0.5)",
+              shadowBlur: 10,
+              shadowOffsetY: 7,
+            },
+          },
+          itemStyle: {
+            normal: {
+              color: "#AAF487",
+              borderWidth: 10,
+              /*shadowColor: 'rgba(72,216,191, 0.3)',
+                         shadowBlur: 100,*/
+              borderColor: "#AAF487",
+            },
+          },
+          smooth: true,
+        },
+      ],
+    })
+  }
+  ,
   methods: {
+    getList() {
+      console.log(this.form)
+    }
+    ,
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    }
   }
 }
 </script>
+<style lang="less" scoped>
+/deep/ .el-table .cell {
+  text-align: center !important;
+}
+</style>