.

src/api/business.js

@@ -84,3 +84,12 @@ export function industry_commerce_handover_count(data) {
         data
     })
 }
+
+export function industry_commerce_handover_dowWord(data) {
+    return request({
+        url: '/api/count_ich/dowWord', 
+        method: 'post',
+        data
+    })
+}
+

src/api/qualityAnalysis.js

+import request from '@/utils/request'
+
+export function qualityAnalysis_upload(data) {
+  return request({
+    url: '/api/qualityAnalysis/upload', 
+    method: 'post',
+    data
+  })
+}
+export function qualityAnalysis_getTableTitle(params) {
+    return request({
+      url: '/api/qualityAnalysis/getTableTitle', 
+      method: 'get',
+      params
+    })
+  }
+
+
+export function qualityAnalysis_list(params) {
+    return request({
+      url: '/api/qualityAnalysis', 
+      method: 'get',
+      params
+    })
+}
+
+export function qualityAnalysis_download(data) {
+    return request({
+      url: '/api/qualityAnalysis/download', 
+      method: 'post',
+      data
+    })
+}
+export function qualityAnalysis_destroy(data) {
+    return request({
+      url: '/api/qualityAnalysis/1', 
+      method: 'delete',
+      data
+    })
+}
\ No newline at end of file

src/components/AnalyseModule/index.vue

@@ -47,7 +47,7 @@
         </el-col>
       </el-row>
     </div>
-    <div class="content_container" v-if="original_data.type == 'table'">
+    <div class="content_container" v-if="original_data.type == 'table'" :style="{height:(original_data.height?original_data.height:'285px')}">
       <Table
         v-if="original_data"
         :merge_fields="original_data.merge_fields"
@@ -56,7 +56,7 @@
         :labers="original_data.labers"
       ></Table>
     </div>
-    <div class="content_container" v-if="original_data.type == 'select_table'">
+    <div class="content_container" v-if="original_data.type == 'select_table'" :style="{height:(original_data.height?original_data.height:'285px')}">
       <SelectTabe
         ref="SelectTabe"
         v-if="original_data"
@@ -67,14 +67,14 @@
       </SelectTabe>
     </div>
 
-    <div class="content_container" v-if="false">
+    <div class="content_container" v-if="false"  :style="{height:(original_data.height?original_data.height:'285px')}">
       <line-chart
         :ref="original_data.image_id"
         :chart_data="original_data.data"
         :chart_id="original_data.chart_id"
       ></line-chart>
     </div>
-    <div class="content_container" v-if="original_data.type == 'bar'">
+    <div class="content_container" v-if="original_data.type == 'bar'"  :style="{height:(original_data.height?original_data.height:'285px')}">
       <bar-chart
         :chart_data="{
           raw_data: original_data.raw_data,
@@ -85,7 +85,7 @@
         :chart_id="original_data.chart_id"
       ></bar-chart>
     </div>
-    <div class="content_container" v-if="original_data.type == 'simple_table'">
+    <div class="content_container" v-if="original_data.type == 'simple_table'"  :style="{height:(original_data.height?original_data.height:'285px')}">
       <simple-table
         :table_data="original_data"
         :chart_id="original_data.chart_id"
@@ -94,7 +94,7 @@
     <!-- 眼光稳定性 -->
     <div
       class="content_container"
-      v-if="original_data.type == 'eye_stability_table'"
+      v-if="original_data.type == 'eye_stability_table'"  :style="{height:(original_data.height?original_data.height:'285px')}"
     >
       <eye-stability-table
         :table_data="original_data.list"
@@ -106,7 +106,7 @@
     <!-- 趋势性分析 -->
     <div
       class="content_container_trend"
-      v-if="original_data.type == 'trend_analysis'"
+      v-if="original_data.type == 'trend_analysis'"  :style="{height:(original_data.height?original_data.height:'285px')}"
     >
       <SelectLineChartData
         :labers="original_data.labers"

src/views/business/display_board/index.vue

@@ -50,7 +50,8 @@
             <el-table-column prop="sampling_grade"  label= "抽检等级"></el-table-column>
             <el-table-column prop="large_scale"  label="大等级"></el-table-column>
             <el-table-column prop="position"  label= "部位"></el-table-column>
-            <el-table-column prop="grade2"  label= "色组"></el-table-column>
+            <el-table-column prop="grade2"  label= "组别"></el-table-column>
+            <el-table-column prop="color"  label= "色组"></el-table-column>
             <el-table-column prop="grade"  label="质量档次"></el-table-column>
             <el-table-column prop="sampling_radix_batch"  label= "抽检基数批量(担)"></el-table-column>
             <el-table-column prop="sampling_count"  label= "抽检把数"></el-table-column>

src/views/qualityAnalysis/index.vue

+<!--
+ * @Author: czj
+ * @Date: 2023-03-06 10:06:06
+ * @Description:
+ * @FilePath: \AdministrationHome\src\views\business\index.vue
+-->
+<!--  -->
+<template>
+  <div>
+    <router-view></router-view>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+    };
+  },
+
+  components: {},
+
+  computed: {},
+
+  mounted() { },
+
+  methods: {}
+}
+
+</script>
+<style scoped></style>

src/views/qualityAnalysis/list/index.vue

+
+<template>
+    <div class="module_container">
+      <div class="card_container">
+        <el-card class="box-card">
+          <el-row :gutter="20">
+            <el-col style="padding-top:10px" :span="6"><el-input clearable v-model="request_params.sample_code"  placeholder="请输入样品编号"  @keydown.enter.native="getTableData"></el-input></el-col>
+            <el-col style="padding-top:10px" :span="6"><el-input clearable v-model="request_params.sample_name"  placeholder="请输入样品名称"  @keydown.enter.native="getTableData"></el-input></el-col>
+            <el-col style="padding-top:10px" :span="6"><el-input clearable v-model="request_params.grade"  placeholder="请输入等级"  @keydown.enter.native="getTableData"></el-input></el-col>
+            <el-col style="padding-top:10px" :span="6"><el-input clearable v-model="request_params.variety"  placeholder="请输入品种"  @keydown.enter.native="getTableData"></el-input></el-col>
+            <el-col style="padding-top:10px" :span="6"><el-input clearable v-model="request_params.area"  placeholder="请输入产地"  @keydown.enter.native="getTableData"></el-input></el-col>
+            <el-col style="padding-top:10px;text-align:right" :span="18">
+                <el-button style="float: right; margin-right:20px ;" type="danger" icon="el-icon-delete" @click="deleteData()" >删除条件数据</el-button>
+                <el-upload style="float: right; margin-right:20px "  action="" :show-file-list="false" accept=".xlsx" :http-request="sliderRequest">
+                    <el-button v-loading='is_upload_loading' type="primary" icon="el-icon-upload2" >上传数据（Execl）</el-button>
+                </el-upload>
+                <el-button style="float: right; margin-right:20px ;"  v-loading='is_export_loading'  type="primary" @click="exportData()" icon="el-icon-download" >下载结果（Execl）</el-button>
+            </el-col>
+          </el-row>
+          <div class="table_container">
+            <el-table v-loading="is_loading" :data="tableData" style="width: 100%;margin-bottom: 20px;height:600px;overflow: auto;">
+              <el-table-column type="index"  width='50'></el-table-column>
+              <el-table-column prop="id" label="ID"></el-table-column>
+              <el-table-column v-for="(i ,index1) in Object.keys(tableTitle)" :key="index1" :prop="i"  :label="tableTitle[i]"></el-table-column>
+              <el-table-column label="操作" width="120">
+                <template slot-scope="scope">
+  
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div style="text-align: right">
+            <el-pagination
+              @current-change="handleCurrentChange"
+              :current-page.sync="request_params.page"
+              :page-size="request_params.limit"
+              layout="total, prev, pager, next"
+              :total="request_params.total"
+            >
+            </el-pagination>
+          </div>
+        </el-card>
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  import TableHead from '@/components/TableHead/index';
+  import { 
+    qualityAnalysis_upload,
+    qualityAnalysis_download,
+    qualityAnalysis_list,
+    qualityAnalysis_destroy,
+    qualityAnalysis_getTableTitle,
+  } from '@/api/qualityAnalysis';
+  
+  import { exportText } from '@/utils/tool.js';
+  const search_def_data = {
+    page: 1,
+    limit: 10,
+    total: 1,
+    "sample_code" :'',   // 样品编号
+    "sample_name" :'',   // 样品名称
+    "grade" :'',   // 等级
+    "variety" :'',   // 品种
+    "area" :'',   // 产地
+    // document_number:'',  //word时需要文件编号
+    // sampling_year:'',  //抽检年份
+    // sampling_time:'',  //抽检时间
+    // check_provinces:'',  //检查省份
+    // check_city:'',  //检查地点_地市
+    // check_area:'',  //检查地点_县
+    // check_address:'',  //检查地点名称
+    // accepting_unit:'',  //接收单位
+    // tobacco_origin_provinces:'',  //产烟省
+    // tobacco_origin_city:'',  //产烟地市
+    // tobacco_origin_area:'',  //产烟县
+    // sampling_grade:'',  //抽检等级
+  }
+  export default {
+    data() {
+      return {
+        is_export_loading:false,
+        is_upload_loading:false,
+        IP: process.env.VUE_APP_BASE_API,
+        //初始化请求参数
+        request_params: Object.assign({}, search_def_data),
+        is_loading: false,
+        tableData: [],
+        tableTitle:{},
+        is_dialogVisible: false,
+        is_updata_type: 'add',
+
+      };
+    },
+  
+    components: { TableHead },
+  
+    computed: {},
+  
+    mounted() {
+      this.init()
+    },
+  
+    methods: {
+      // 上传execl表格数据
+      sliderRequest(upload){
+        this.is_upload_loading=true
+        const formData = new FormData();
+          formData.append('file', upload.file);
+          qualityAnalysis_upload(formData).then((res) => {
+            if (res.code == 200) {
+              this.$message.success(res.message);
+              this.getTableData();
+            }
+            this.is_upload_loading=false
+          });
+      },
+      exportData(){
+        this.is_export_loading=true
+        qualityAnalysis_download(this.request_params).then(res => {
+          if(res.message){
+            let str = res.message.split('=');
+            let url = `${this.IP}${res.message}`;
+            exportText(url, str[str.length - 1]);
+          }
+          this.is_export_loading=false
+        })
+      },
+      // 删除搜寻数据
+      deleteData(){
+        this.$confirm('是否删除搜索寻数据?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+            qualityAnalysis_destroy(this.request_params).then((res) => {
+            if (res.code == 200) {
+              this.$message.success(res.message);
+              this.init();
+            }
+          });
+        })
+        .catch(() => {
+          
+        });
+      },
+     
+      //分页
+      handleCurrentChange(val) {
+        this.request_params.page = val;
+        this.getTableData();
+      },
+      getTableData(){
+        this.is_loading=true
+        qualityAnalysis_getTableTitle(this.request_params).then(res1 => {
+            this.tableTitle=res1
+            qualityAnalysis_list(this.request_params).then(res => {
+                this.tableData=res.data;
+                this.request_params.page=res.current_page
+                this.request_params.total=res.total
+                this.request_params.limit=parseInt(res.per_page)
+                this.is_loading=false
+            })
+        })
+        
+        
+      },
+  
+      init() {
+        this.request_params= Object.assign({}, search_def_data);
+        this.getTableData();
+      },
+  
+      //取消
+      handleClose() {
+        this.is_dialogVisible = false;
+      },
+      
+    },
+  }
+  
+  </script>
+  <style lang="scss" scoped></style>
+  
\ No newline at end of file