Browse Source

存活率、疾病情况等

epans 1 year ago
parent
commit
37a747f4b8

+ 4 - 0
src/views/Home.vue

@@ -22,6 +22,8 @@
           <el-submenu :index="item.id +''" v-for="item in menuList" :key="item.id">
             <!-- 一级菜单的模板区域 -->
             <template slot="title">
+              <!-- <span class = "nav-icon"></span> -->
+             
               <i class="iconfont el-icon-s-order"></i>
               <span>{{item.name}}</span>
             </template>
@@ -266,6 +268,8 @@ export default {
 <!-- 加了scoped,则是仅在此组件里生效 -->
 <style scoped>
 
+.nav-icon{display:inline-block;height: 30px;width: 30px; background:  url("../assets/images/nlogin-bg1.jpg") no-repeat; }
+
 .home-container{height:100%}
 /* el-header一个类名就是一个样式,可以直接赋样式 */
 .el-header{background-color:#373d41;display:flex;justify-content:space-between;padding-left:0;align-items: center;color:#fff;font-size:20px;} 

+ 123 - 0
src/views/Welcome1.vue

@@ -0,0 +1,123 @@
+<template>
+  <div class="login_container">
+    <!-- 光明设备系统 -->
+
+
+    <!-- <div class="card-bx">
+             
+             <div class="card-cont">
+                 <div id="chartPie1"  style="width: 100%;height:280px;"></div>
+             </div>
+             
+          </div> -->
+      
+  </div>
+</template> 
+
+<script>
+import {   ajaxDataPost } from '@/api/common'
+import * as echarts from 'echarts';
+
+//  require('echarts/theme/macarons')
+export default {
+  data() {
+    return {
+       //图表请求参数
+      chart1: {
+        getdataListParm: {
+          name: 'getChart1ByHomepage',
+          page: 1,
+          offset: 1,
+          pagecount: '',
+          returntype: 'Map',
+          parammaps: {
+            inputDatetime: '',
+            beginDate: '',
+            endDate: '',
+        
+          }
+        }
+      },
+      //图表实例
+      chartPie1: null,
+      //图表数据
+      chartPie1_data: {
+        monthdate:['一月', '二月', '三月', '四月', '五月', '六月', '七月'],
+        arr1:[22, 22, 22, 2, 22, 22, 55],
+        arr2:[33, 11, 44, 55, 90, 230, 55],
+       
+      },
+    }
+  },
+
+  created(){
+  
+  },
+  mounted() {
+    //加载 - 图表假数据,如果是图表需要放mounted里测试假数据
+     // this.roadchartPie1(this.chartPie1_data)
+
+ 
+
+  },
+  methods:{
+     
+    //图表数据加载
+    roadchartPie1(chartPie1_data) {
+
+      
+      if (this.chartPie1 != null) {
+        this.chartPie1.dispose()
+      }
+
+      console.log(echarts)
+      this.chartPie1 = echarts.init(document.getElementById('chartPie1'))
+      var option = {
+        title: [
+          { subtext: '犊牛总数', left: '16.67%',  top: '75%', textAlign: 'center' },
+          { subtext: '公犊牛', left: '50%', top: '75%',  textAlign: 'center' },
+          { subtext: '母犊牛', left: '83.33%', top: '75%', textAlign: 'center' }
+        ],
+        series: [
+          {
+            type: 'pie',radius: '25%',radius: ['50%', '70%'],
+            data: [
+              { name: '犊牛总数', value: 2300 },
+            ],
+            itemStyle: { color: '#fac229'},
+            label: {formatter: '{c}',position: 'center', fontSize: 20 },
+            left: 0,right: '66.6667%',top: 0, bottom: 0
+          },
+          {
+            type: 'pie', radius: '25%', radius: ['50%', '70%'],
+            data: [
+              { name: '公犊牛', value: 928, itemStyle: { color: '#6af7a4'},label: {formatter: '{c}',position: 'center', fontSize: 20 }},
+              { name: '', value: 2700, itemStyle: { color: '#104658'},label: {formatter: ' ',position: 'center', fontSize: 20}},
+            ],
+            left: '33.3333%',right: '33.3333%', top: 0,bottom: 0
+          },
+          {
+            type: 'pie',radius: '25%',radius: ['50%', '70%'],
+            data: [
+              { name: '母犊牛', value: 1372,itemStyle: { color: '#6cd6fc'},label: {formatter: '{c}',position: 'center', fontSize: 20 }},
+              { name: '', value: 400,itemStyle: { color: '#093580'},label: {formatter: ' ',position: 'center', fontSize: 20 } },
+            ],    
+            left: '66.6667%', right: 0,  top: 0, bottom: 0
+          }
+        ]
+      }
+   
+      
+      this.chartPie1.setOption(option)
+      window.onresize = function () {
+        this.chartPie1.resize()
+      }
+    },
+    
+   
+  }
+}
+</script>
+<!-- 加了scoped,则是仅在此组件里生效 -->
+<style scoped> 
+</style>

+ 34 - 34
src/views/basicSettings/CalfType.vue

@@ -421,40 +421,40 @@ export default {
 
  
     form_export() {
-    //获取请求表格数据的参数
-    //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
-    //请求表格
-    // GetDataByName(this.download.getdataListParm).then(response => {
-    //     if (response.data.list !== null) {
-    //       this.download.list = response.data.list
-    //     } else {
-    //       this.download.list = []
-    //     }
-    //     var excelDatas = [
-    //       {
-    //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
-    //         filterVal: ['title1', 'title2', 'title3', 'title4'],
-    //         tableDatas: this.download.list,
-    //         sheetName: 'Sheet1'
-    //       }
-    //     ]
-    //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
-    // })
-
-    var excelDatas = [
-        {
-            tHeader: ['表头1', '表头2', '表头3', '表头4',],
-            filterVal: ['title1', 'title2', 'title3', 'title4'],
-            tableDatas: [ 
-                {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
-                {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
-                {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
-            ],
-            sheetName: 'Sheet1'
-        }
-    ]
-    json2excel(excelDatas, '表格大标题', true, 'xlsx')
-}
+        //获取请求表格数据的参数
+        //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+        //请求表格
+        // GetDataByName(this.download.getdataListParm).then(response => {
+        //     if (response.data.list !== null) {
+        //       this.download.list = response.data.list
+        //     } else {
+        //       this.download.list = []
+        //     }
+        //     var excelDatas = [
+        //       {
+        //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+        //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+        //         tableDatas: this.download.list,
+        //         sheetName: 'Sheet1'
+        //       }
+        //     ]
+        //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+        // })
+
+        var excelDatas = [
+            {
+                tHeader: ['表头1', '表头2', '表头3', '表头4',],
+                filterVal: ['title1', 'title2', 'title3', 'title4'],
+                tableDatas: [ 
+                    {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                    {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                    {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+                ],
+                sheetName: 'Sheet1'
+            }
+        ]
+        json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    }
 
      
 

+ 689 - 0
src/views/basicSettings/InfoRemind3.vue

@@ -0,0 +1,689 @@
+<template>
+ 
+  <div>
+
+
+    <el-card class="box-card">
+  
+
+ 
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="序号"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="消息名称" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="触发条件" min-width="250px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>
+        
+        
+        <el-table-column label="发送方式" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="详细配置" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <a class="correcting" size="mini" style="width: 80px;" @click="form_see(scope.row)">查看</a>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="提醒对象" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+ 
+ 
+        
+
+        <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="scope">
+             <!-- 修改按钮 -->
+             <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">设置</el-button>
+     
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页区域 -->
+      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
+    </el-card>
+
+
+    <!-- 弹窗 设置 -->
+    <el-dialog   title="设置" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+      <div class="">
+        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="100px"  style="width:50%;margin:0 auto 50px">
+            <el-form-item label="类型名称:" prop="name">
+                <el-input   v-model="addForm.name"  ></el-input>  
+            </el-form-item>
+        </el-form>
+
+        <div style="height: 500px;">
+          <el-row :gutter="20">
+            <el-col :span="8">
+       
+              <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="120px"  style="width:100%;margin:0 auto 50px">
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="消息名称:" prop="messageName">
+                      <span>{{addForm.messageName}}</span>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="触发条件:" prop="triggerCondition">
+                      <span>{{addForm.triggerCondition}}</span>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="发送方式:" prop="sendingMethod">
+                      <el-select v-model="addForm.sendingMethod" style="width: 100%;" placeholder="发送方式">
+                        <el-option v-for="item in modeList" :key="item.id" :label="item.name" :value="item.id" />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <div v-if="addForm.sendingMethod == '1'">
+                  <el-row :gutter="5">
+                    <el-col :span="18">
+                      <el-form-item label="发送机制">
+                        <el-select v-model="addForm.sendingMechanism" style="width: 100%;" placeholder="发送机制">
+                          <el-option v-for="item in mechanismList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" v-if="addForm.sendingMechanism == '2'">
+                        <el-input ref="numberCycles" v-model="addForm.numberCycles" style="width: 100%;" placeholder="循环次数" type="text" />
+                    </el-col>
+                  </el-row>
+                  <el-row v-if="addForm.sendingMechanism !== '1' && addForm.sendingMechanism !== ''">
+                    <el-col :span="24">
+                      <el-form-item label="间隔周期:">
+                        <el-input ref="intervalPeriod1" v-model="addForm.intervalPeriod1" style="width: 33%;margin-right:1%" placeholder="天" type="text" />
+                        <el-input ref="intervalPeriod2" v-model="addForm.intervalPeriod2" style="width: 33%;margin-right:1%" placeholder="小时" type="text" />
+                        <el-input ref="intervalPeriod3" v-model="addForm.intervalPeriod3" style="width: 32%;" placeholder="分钟" type="text" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </div>
+                <div v-if="addForm.sendingMethod == '2'">
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="延时:">
+                        <el-input ref="delayed1" v-model="addForm.delayed1" style="width: 33%;margin-right:1%" placeholder="天" type="text" />
+                        <el-input ref="delayed2" v-model="addForm.delayed2" style="width: 33%;margin-right:1%" placeholder="小时" type="text" />
+                        <el-input ref="delayed3" v-model="addForm.delayed3" style="width: 32%;" placeholder="分钟" type="text" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="发送时间">
+                         <el-time-select placeholder="发送时间" :clearable="false" style="width: 100%;" v-model="addForm.sendTime" :picker-options="{ start: '00:00', step: '00:05', end: '23:59' }" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="5">
+                    <el-col :span="18">
+                      <el-form-item label="发送机制">
+                        <el-select v-model="addForm.sendingMechanism" style="width: 100%;" placeholder="发送机制">
+                          <el-option v-for="item in mechanismList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" v-if="addForm.sendingMechanism == '2'">
+                        <el-input ref="numberCycles" v-model="addForm.numberCycles" style="width: 100%;" placeholder="循环次数" type="text" />
+                    </el-col>
+                  </el-row>
+                  <el-row v-if="addForm.sendingMechanism !== '1' && addForm.sendingMechanism !== ''">
+                    <el-col :span="24">
+                      <el-form-item label="间隔周期:">
+                        <el-input ref="intervalPeriod1" v-model="addForm.intervalPeriod1" style="width: 33%;margin-right:1%" placeholder="天" type="text" />
+                        <el-input ref="intervalPeriod2" v-model="addForm.intervalPeriod2" style="width: 33%;margin-right:1%" placeholder="小时" type="text" />
+                        <el-input ref="intervalPeriod3" v-model="addForm.intervalPeriod3" style="width: 32%;" placeholder="分钟" type="text" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </div>
+                <div v-if="addForm.sendingMethod == '3'">
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="发送机制:">
+                        <span>持续循环</span>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row :gutter="5">
+                    <el-col :span="18">
+                      <el-form-item label="周期类型">
+                        <el-select v-model="addForm.cycleType" style="width: 100%;" placeholder="周期类型">
+                          <el-option v-for="item in cycleTypeList" :key="item.id" :label="item.name" :value="item.id" />
+                        </el-select>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6" v-if="addForm.cycleType == '2'">
+                      <el-select v-model="addForm.week" style="width: 100%;" placeholder="每周">
+                        <el-option v-for="item in weekList" :key="item.id" :label="item.name" :value="item.id" />
+                      </el-select>
+                    </el-col>
+                    <el-col :span="6" v-if="addForm.cycleType == 3">
+                      <el-select v-model="addForm.month" style="width: 100%;" placeholder="每月">
+                        <el-option v-for="item in monthList" :key="item.id" :label="item.name" :value="item.id" />
+                      </el-select>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="发送时间">
+                         <el-time-select placeholder="发送时间" :clearable="false" style="width: 100%;" v-model="addForm.sendTime" :picker-options="{ start: '00:00', step: '00:05', end: '23:59' }" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </div>
+              </el-form>
+            </el-col>
+            <el-col :span="16">
+              <b>提醒对象:</b>
+              <div class="search">
+                <el-input v-model="setUp.empCode" placeholder="角色名称" style="width: 180px;" class="filter-item" clearable />
+                <el-input v-model="setUp.empCode" placeholder="用户名称" style="width: 180px;" class="filter-item" clearable />
+                <el-input v-model="setUp.empname" placeholder="员工姓名" style="width: 180px;" class="filter-item" clearable />
+                <el-button class="successBorder" @click="form_search">查询</el-button>
+              </div>
+              <el-row :gutter="5">
+                <el-col :span="6">
+                  <el-table
+                    ref="setUpTable1"
+                    :key="setUp.tableKey1"
+                    v-loading="setUp.listLoading1"
+                    element-loading-text="给我一点时间"
+                    :data="setUp.list1"
+                    border
+                    fit
+                    highlight-current-row
+                    style="width: 100%;"
+                    :row-style="rowStyle"
+                    :cell-style="cellStyle"
+                    class="elTable table-fixed"
+                    @selection-change="handleSelectionChange1"
+                    :height="350"
+                  >
+                    <el-table-column type="selection" align="center" width="50" />
+                    <el-table-column label="角色名" min-width="100px" align="center" prop="rolename" />
+                  </el-table>
+                </el-col>
+                <el-col :span="18">
+                  <el-table
+                    ref="setUpTable2"
+                    :key="setUp.tableKey2"
+                    v-loading="setUp.listLoading2"
+                    element-loading-text="给我一点时间"
+                    :data="setUp.list2"
+                    border
+                    fit
+                    highlight-current-row
+                    style="width: 100%;"
+                    :row-style="rowStyle"
+                    :cell-style="cellStyle"
+                    class="elTable table-fixed"
+                    @selection-change="handleSelectionChange2"
+                    :height="350"
+                  >
+                    <el-table-column type="selection" align="center" width="50" />
+                    <el-table-column label="用户名称" min-width="130px" align="center" prop="username" />
+                    <el-table-column label="员工姓名" min-width="130px" align="center" prop="empname" />
+                    <el-table-column label="角色" min-width="130px" align="center" prop="rolename" />
+                  </el-table>
+                </el-col>
+              </el-row>
+            </el-col>
+          </el-row>
+        </div>
+
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+          <el-button @click="addFormShow = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+ 
+    
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+export default {
+  data() {
+
+
+    
+ 
+  
+    return {
+
+ 
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+          messageName:'',//消息名称
+          triggerCondition:'',//触发条件,
+          sendingMethod:'1',//发送方式
+          delayed1:'',//延时
+          delayed2:'',//延时
+          delayed3:'',//延时,
+          sendTime:'',//发送时间,
+          sendingMechanism:'1',// 发送机制
+          numberCycles:'',//循环次数
+          intervalPeriod1:'',//间隔周期
+          intervalPeriod2:'',//间隔周期
+          intervalPeriod3:'',//间隔周期
+          cycleType:'1',
+
+          page: 1,  //页码
+          page_size: 10,   //每页数量
+          total:0,  //总页数
+          pastureId: ""
+      },
+
+      modeList: [
+          { id: '1', name: '立即' },
+          { id: '2', name: '延时' },
+          { id: '3', name: '指定周期' },
+        ],
+        mode: '0',
+        mechanismList: [
+          { id: '1', name: '单次' },
+          { id: '2', name: '指定循环次数' },
+          { id: '3', name: '循环至任务结束' },
+        ],
+        cycleTypeList:[
+          { id: '1', name: '每天' },
+          { id: '2', name: '每周' },
+          { id: '3', name: '每月' },
+        ],//周期类型
+        weekList:[
+          { id: '1', name: '周一' },
+          { id: '2', name: '周二' },
+          { id: '3', name: '周三' },
+          { id: '4', name: '周四' },
+          { id: '5', name: '周五' },
+          { id: '6', name: '周六' },
+          { id: '7', name: '周日' },
+        ],//周
+        monthList:[],//月
+        mechanism: '0',
+        activeName:'first',
+
+
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+ 
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+      },
+
+
+
+      setUpForm:{
+        name:'',id:'' 
+      },
+
+      setUp:{
+          dialogStatus: '',
+          dialogFormVisible:false,
+          // 角色
+          tableKey1: 0,
+          list1: [],
+          total1: 0,
+          listLoading1: false,
+          data1:{
+            name: 'getRoleList', page: 1, offset: 1, pagecount:'',returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid')
+            }
+          },
+          // 用户
+          tableKey2: 0,
+          list2: [],
+          total2: 0,
+          listLoading2: false,
+          data2:{
+            name: 'getuserallL', page: 1, offset: 1, pagecount:'',returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid'),
+              roleid:''
+            }
+          },
+          temp:{}
+        },
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+     //获取下拉框
+     // this.get_select_list1()
+
+      //表格 - 初始化 
+      this.get_table_data()
+
+     
+
+    
+  },
+  methods:{
+
+    get_auto_buttons() {
+      // 编辑
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "用户管理编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    },
+    
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1:",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("牧场下拉框1:",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.pastureList = []
+          } else {
+            me.pastureList = e.data
+          }
+  
+        })
+
+    
+    },
+
+    
+    //获取 表格
+    get_table_data() {
+ 
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+      var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("表格请求结果:",e)
+          //打印请求成功结果
+          if(e.code == 200 ){
+            me.tableList = e.data.list
+            me.searchData.total = e.data.total;	// 总数
+            me.searchData.page = e.data.page;	//页码
+            me.searchData.page_size = e.data.page_size;	//每页数量
+           
+          } else {
+            me.$message({ type: 'error', message: '请求表格列表失败!' + e.msg, duration: 2000 })
+          }
+
+          setTimeout(() => {
+            me.tableLoading = false
+          }, 100)
+  
+        })
+
+       
+    },
+  
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.name = ""
+      me.get_table_data()
+    },
+
+    //监听 page_size 改变的事件
+    change_size_page(item){
+      console.log(item)
+     // this.searchData.page_size = item
+      //  this.getUserList()
+    },
+
+    //监听 page 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.searchData.page = item
+       this.get_table_data()
+    },
+
+    //清空弹窗表单信息
+    reset_form(){
+      this.addForm.name = ''
+    },
+
+    
+
+    //编辑
+    form_edit(row) {
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)  
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          console.log("弹窗参数:", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                console.log("编辑结果:",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '编辑成功!'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '编辑失败!' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+
+
+    
+    
+
+
+
+    form_delete(row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            console.log("删除的ID参数:", row.id)
+            //加载 - 发送新增保存
+            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                console.log("编辑结果:",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '删除失败!' + e.msg, duration: 2000 })
+                }
+            })
+
+        
+ 
+          
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+ 
+    form_export() {
+        //获取请求表格数据的参数
+        //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+        //请求表格
+        // GetDataByName(this.download.getdataListParm).then(response => {
+        //     if (response.data.list !== null) {
+        //       this.download.list = response.data.list
+        //     } else {
+        //       this.download.list = []
+        //     }
+        //     var excelDatas = [
+        //       {
+        //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+        //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+        //         tableDatas: this.download.list,
+        //         sheetName: 'Sheet1'
+        //       }
+        //     ]
+        //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+        // })
+
+        var excelDatas = [
+            {
+                tHeader: ['表头1', '表头2', '表头3', '表头4',],
+                filterVal: ['title1', 'title2', 'title3', 'title4'],
+                tableDatas: [ 
+                    {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                    {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                    {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+                ],
+                sheetName: 'Sheet1'
+            }
+        ]
+        json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    }
+
+     
+
+  }
+}
+</script>
+<!-- 加了scoped,则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

+ 517 - 0
src/views/cowManagement/WeightRecord3.vue

@@ -0,0 +1,517 @@
+<template>
+ 
+  <div>
+
+
+    <el-card class="box-card">
+      <!-- 搜索区域 -->
+      <div class="search-bx1">
+
+
+        <el-date-picker v-model="searchData.inputDatetime1"  type="daterange" range-separator="至" start-placeholder="称量日期" end-placeholder="称量日期" style="width: 220px;" class="g-mr20"  />
+
+        <el-input v-model="searchData.beginRemoteCost" placeholder="犊牛体重" style="width: 100px;"    onkeyup="this.value=this.value.replace(/[^\d.]/g,'');" ></el-input>
+              -
+        <el-input v-model="searchData.endRemoteCost" placeholder="犊牛体重" style="width: 100px;" class="g-mr20"  onkeyup="this.value=this.value.replace(/[^\d.]/g,'');"></el-input>
+
+
+        <el-date-picker v-model="searchData.inputDatetime2"  style="width: 260px;" class="g-mr20"  type="daterange" range-separator="至" start-placeholder="犊牛出生日期" end-placeholder="犊牛出生日期" />
+
+        <el-select v-model="searchData.barid" filterable placeholder="性别"  style="width: 90px;" class="g-mr20"  clearable>
+          <el-option v-for="item in sexNameList" :key="item.id" :label="item.bname" :value="item.id" />
+        </el-select>
+
+        <el-input v-model="searchData.repairCode" placeholder="母号"  style="width: 220px;" class="g-mr20"  />
+
+
+
+
+                                  
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <el-button type="primary"   @click="form_clear">重置</el-button>
+          <!-- <el-button type="primary"   v-if="isButtonEdit" @click="form_add">添加</el-button> -->
+           <!-- <el-button type="primary"   @click="form_export">导出</el-button> -->
+      </div>
+
+ 
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="序号"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="称量时间" min-width="120px" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.weightTime  }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="犊牛体重(KG)" min-width="120px" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.cowweight  }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="犊牛出生日期" min-width="120px" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.cowbirthdate  }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="性别" min-width="120px" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.sex  }}</span>
+            </template>
+        </el-table-column>
+ 
+        
+          <el-table-column label="母号" min-width="120px" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ scope.row.mothernum  }}</span>
+            </template>
+          </el-table-column>
+ 
+       
+        <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="scope">
+             <!-- 修改按钮 -->
+             <el-button type="primary" v-if="isButtonEdit" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">建档</el-button>
+ 
+
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页区域 -->
+      <el-pagination  @size-change="change_size_page"  @current-change="change_current_page"  :current-page="searchData.page" :page-sizes="[1,5,10,20,30,50]"  :page-size="searchData.page_size" layout="total, prev, pager, next" :total="searchData.total"/>
+    </el-card>
+
+
+    <!-- 弹窗 新增or修改 -->
+    <el-dialog  :title="addFormTxt[addFormStatus]" :visible.sync="addFormShow" @close="add_dialog_close" width="50%">
+      <div class="">
+        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="150px"  style="width:50%;margin:0 auto 50px">
+            <el-form-item label="母号:" prop="mothernum">
+                <el-input   v-model="addForm.mothernum" :disabled="addFormStatus =='edit'"  ></el-input>  
+            </el-form-item>
+
+            <el-form-item label="体重(KG):" prop="cowweight">
+              <el-input ref="cowweight" v-model="addForm.cowweight"   style="width: 100%;"   />
+            </el-form-item>  
+
+            <el-form-item label="出生日期:" prop="cowbirthdate">
+              <el-date-picker v-model="addForm.cowbirthdate" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;" :clearable="false"  />
+      
+            </el-form-item>
+
+            <el-form-item label="性别:" prop="visiterId">
+              <el-select ref="visiterId" v-model="addForm.visiterId" filterable placeholder="请选择"   style="width: 100%;"  >
+                <el-option v-for="item in sexNameList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="栏舍:" prop="visiterId">
+              <el-select ref="visiterId" v-model="addForm.visiterId" filterable placeholder="请选择"  style="width: 100%;"  >
+                <el-option v-for="item in columnNameList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+
+
+            <el-form-item label="犊牛类型:" prop="visiterId">
+              <el-select ref="visiterId" v-model="addForm.visiterId" filterable placeholder="请选择"   style="width: 100%;"  >
+                <el-option v-for="item in cowNameList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="备注:" prop="remark">
+              <el-input ref="remark" v-model="addForm.remark" type="textarea" maxlength="200"  style="width: 100%;" :rows="3"  />
+            </el-form-item>
+
+
+
+
+
+
+
+
+           
+            
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="addFormStatus==='create'?add_dialog_save():edit_dialog_save()">确认</el-button>
+          <el-button @click="addFormShow = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+ 
+    
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+export default {
+  data() {
+
+
+    
+ 
+  
+    return {
+
+ 
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/base_setting/calf_type/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/calf_type/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/calf_type/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/calf_type/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      isButtonEdit:false,
+
+
+      //  下拉框 - 性别 
+      sexNameList: [
+        {id: "公", name: "公"}, 
+        {id: "母", name: "母"}, 
+      ], 
+
+       //  下拉框 - 栏舍组 
+       columnNameList: [
+        {id: "栏舍组1", name: "栏舍组1"}, 
+        {id: "栏舍组2", name: "栏舍组2"}, 
+        {id: "栏舍组3", name: "栏舍组3"}
+      ], 
+      //  下拉框 - 犊牛类型 
+      cowNameList: [
+        {id: "犊牛1", name: "犊牛1"}, 
+        {id: "犊牛2", name: "犊牛2"}, 
+        {id: "犊牛3", name: "犊牛3"}
+      ], 
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        name: "",
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+ 
+      
+    
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [ { required: true, message: '类型名称必填', trigger: 'blur' },  ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "犊牛类型编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+     
+
+     //获取下拉框
+     // this.get_select_list1()
+
+      //表格 - 初始化 
+      this.get_table_data()
+
+     
+
+    
+  },
+  methods:{
+
+    get_auto_buttons() {
+      // 编辑
+      const isButtonEdit = checkButtons(this.$store.state.buttonsList, "用户管理编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+    },
+    
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataGet(me.url_get_select1, {"roleName": "",  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("下拉框1:",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.roleList = []
+          } else {
+            me.roleList = e.data
+          }
+
+         
+  
+        })
+
+
+        ajaxDataGet('/authdata/pasture', {  "page": 1,   "page_size": 1000}).then(e => {
+          console.log("牧场下拉框1:",e)
+
+          //打印请求成功结果
+          if(e.data == null || e.data == undefined ||e.data.length == 0   ){
+            me.pastureList = []
+          } else {
+            me.pastureList = e.data
+          }
+  
+        })
+
+    
+    },
+
+    
+    //获取 表格
+    get_table_data() {
+ 
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+      var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("表格请求结果:",e)
+          //打印请求成功结果
+          if(e.code == 200 ){
+            me.tableList = e.data.list
+            me.searchData.total = e.data.total;	// 总数
+            me.searchData.page = e.data.page;	//页码
+            me.searchData.page_size = e.data.page_size;	//每页数量
+           
+          } else {
+            me.$message({ type: 'error', message: '请求表格列表失败!' + e.msg, duration: 2000 })
+          }
+
+          setTimeout(() => {
+            me.tableLoading = false
+          }, 100)
+  
+        })
+
+       
+    },
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.name = ""
+      me.get_table_data()
+    },
+
+    //监听 page_size 改变的事件
+    change_size_page(item){
+      console.log(item)
+     // this.searchData.page_size = item
+      //  this.getUserList()
+    },
+
+    //监听 page 改变的事件
+    change_current_page(item){
+      console.log(item)
+       this.searchData.page = item
+       this.get_table_data()
+    },
+
+    //清空弹窗表单信息
+    reset_form(){
+      this.addForm.name = ''
+    },
+
+  
+
+    //编辑
+    form_edit(row) {
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)  
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "id": me.addForm.id,
+          }
+          console.log("弹窗参数:", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+         ajaxDataPut(me.url_edit_table, send_data).then(e => {
+                console.log("编辑结果:",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success', message: '编辑成功!'  , duration: 2000 })
+                  //关闭弹窗
+                  me.addFormShow = false
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '编辑失败!' + e.msg, duration: 2000 })
+                }
+            })
+         
+        }
+      })
+    },
+
+
+    
+    
+
+
+
+    form_delete(row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+            console.log("删除的ID参数:", row.id)
+            //加载 - 发送新增保存
+            ajaxDataDelete(me.url_delete_table + '/' +row.id, {}).then(e => {
+                console.log("编辑结果:",e)
+                //打印请求成功结果
+                if(e.code == 200  ){
+                  me.$message({ type: 'success',  message: '删除成功!'  });
+                  me.get_table_data()
+                } else {
+                  me.$message({ type: 'error', message: '删除失败!' + e.msg, duration: 2000 })
+                }
+            })
+
+        
+ 
+          
+        }).catch(() => {
+          me.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+
+
+       
+    },
+
+ 
+    form_export() {
+        //获取请求表格数据的参数
+        //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+        //请求表格
+        // GetDataByName(this.download.getdataListParm).then(response => {
+        //     if (response.data.list !== null) {
+        //       this.download.list = response.data.list
+        //     } else {
+        //       this.download.list = []
+        //     }
+        //     var excelDatas = [
+        //       {
+        //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+        //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+        //         tableDatas: this.download.list,
+        //         sheetName: 'Sheet1'
+        //       }
+        //     ]
+        //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+        // })
+
+        var excelDatas = [
+            {
+                tHeader: ['表头1', '表头2', '表头3', '表头4',],
+                filterVal: ['title1', 'title2', 'title3', 'title4'],
+                tableDatas: [ 
+                    {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                    {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                    {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+                ],
+                sheetName: 'Sheet1'
+            }
+        ]
+        json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    }
+
+     
+
+  }
+}
+</script>
+<!-- 加了scoped,则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

+ 0 - 41
src/views/dataStatistics/DiseaseSituation1.vue

@@ -1,41 +0,0 @@
-<template>
- 
-  <div>
-        1.1版本页面,待开发
-  </div>
-
-
-</template> 
-
-<script>
-import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
-import { parseTime, json2excel } from '@/utils/index.js'
-export default {
-  data() {
-
-
-    
- 
-  
-    return {
-
-  
-       
-    }
-  },
-  created(){
-    
-    
-  },
-  methods:{
-
-    
-     
-
-  }
-}
-</script>
- 
-<style scoped>
-
-</style>

+ 378 - 0
src/views/dataStatistics/DiseaseSituation3.vue

@@ -0,0 +1,378 @@
+<template>
+ 
+  <div>
+
+    <el-card class="box-card">
+
+       <!-- 搜索区域 -->
+       <div class="search-bx1">
+
+
+        <el-date-picker v-model="searchData.inputDatetime1" class="g-mr20" type="year"  style="width: 250px;" />
+
+        <el-select v-model="searchData.typeId" filterable placeholder="犊牛类型" style="width: 180px;" class="g-mr20">
+          <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+
+        <el-select   v-model="searchData.barid"   placeholder="疾病类型" style="width: 180px;" class="g-mr20" clearable>
+          <el-option v-for="item in diseaseList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+
+       
+
+
+         
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <!-- <el-button type="primary"   @click="form_clear">重置</el-button> -->
+     
+            <el-button type="primary"   @click="form_export">导出</el-button>  
+      </div>
+
+
+      <div id="chartBar1"  style="width: 100%;height:280px;"></div>
+
+
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="日期"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="发病次数" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="治愈次数" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>  
+        <el-table-column label="治愈率" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>  
+        
+      </el-table>
+
+      
+
+
+    </el-card >
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+
+import * as echarts from 'echarts';
+
+export default {
+  data() {
+
+ 
+ 
+  
+    return {
+
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/barn_group/list',
+      //接口 - 获取 - 图表
+      url_get_echart:'/api/v1/ops/barn_group/add',  
+ 
+      //获取 - 表格数据 - 参数
+      searchData:{
+        inputDatetime1:"",
+        typeId:"全部",
+        name: "",
+        barn_group_name: "",
+        number: "",
+        status: undefined,
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+
+      diseaseList: [
+         {id: "疾病1", name: "疾病1"}, 
+         {id: "疾病1", name: "疾病1"}, 
+         {id: "疾病1", name: "疾病1"}, 
+ 
+      ], 
+
+      //  下拉框 - 栏舍组 
+      calfTypeList: [
+        // {id: "栏舍组1", name: "栏舍组1"}, 
+        // {id: "栏舍组2", name: "栏舍组2"}, 
+        // {id: "栏舍组3", name: "栏舍组3"}
+      ], 
+
+
+
+      chart1: {
+        getdataListParm: {
+          name: 'getChart1ByHomepage',
+          page: 1,
+          offset: 1,
+          pagecount: '',
+          returntype: 'Map',
+          parammaps: {
+            inputDatetime: '',
+            beginDate: '',
+            endDate: '',
+        
+          }
+        }
+      },
+      //图表实例
+      chartBar1: null,
+      //图表数据
+      chartBar1_data: {
+        monthdate:['2022-01', '2022-02', '2022-03', '2022-04', '2022-05', '2022-06', '2022-07'],
+        arr1:[49, 71, 98, 92, 104, 76, 113],
+        arr2:[83, 78, 98, 93, 106, 85, 115],
+       
+      },
+  
+       
+    }
+  },
+  mounted() {
+    //加载 - 图表假数据,如果是图表需要放mounted里测试假数据
+     this.roadchartBar1(this.chartBar1_data)
+
+ 
+
+  },
+  created(){
+    
+    //获取下拉框
+    this.get_select_list1()
+    //表格 - 初始化 
+    this.get_table_data()
+
+
+     //this.getChart1
+
+  },
+  methods:{
+
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataPost('/api/v1/ops/base_setting/calf_type/list?page=1&page_size=1000', {name:"" }).then(e => {
+            console.log("穿梭框1:",e)
+
+            //打印请求成功结果
+            if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+              me.calfTypeList = []
+            } else {
+              me.calfTypeList = e.data.list
+            }
+
+        })
+
+ 
+    
+    },
+
+
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+
+      if (me.searchData.inputDatetime1 !== '' && me.searchData.inputDatetime1 !== null) {
+          me.searchData.min_operation_time = parseTime(me.searchData.inputDatetime1[0], '{y}-{m}-{d}')
+          me.searchData.max_operation_time = parseTime(me.searchData.inputDatetime1[1], '{y}-{m}-{d}')
+        } else {
+          me.searchData.inputDatetime1 = ''
+          me.searchData.min_operation_time = ''
+          me.searchData.max_operation_time = ''
+        }               
+      me.get_table_data()
+      me.getChart1()
+
+    },
+    
+
+    //获取 表格
+    get_table_data() {
+ 
+      var me = this
+
+      me.tableLoading = true
+      console.log("searchData======>", me.searchData)
+
+
+      
+      if( me.searchData.status == ""){
+        me.searchData.status = undefined
+      }
+
+       var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+       ajaxDataPost(send_url,  me.searchData).then(e => {
+          console.log("表格请求结果:",e)
+          //打印请求成功结果
+            if(e.code == 200 ){
+              me.tableList = e.data.list
+              me.searchData.total = e.data.total;	// 总数
+              me.searchData.page = e.data.page;	//页码
+              me.searchData.page_size = e.data.page_size;	//每页数量
+            
+            } else {
+              me.$message({ type: 'error', message: '请求表格列表失败!' + e.msg, duration: 2000 })
+            }
+
+            setTimeout(() => {
+              me.tableLoading = false
+            }, 100)
+
+        })
+
+      
+    },
+
+    getChart1() {
+
+
+      var send_url = me.url_get_chart + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("图表请求结果:",e)
+        //打印请求成功结果
+          // if(e.code == 200 ){
+          //   me.tableList = e.data.list
+          //   me.searchData.total = e.data.total;	// 总数
+          //   me.searchData.page = e.data.page;	//页码
+          //   me.searchData.page_size = e.data.page_size;	//每页数量
+          
+          // } else {
+          //   me.$message({ type: 'error', message: '请求表格列表失败!' + e.msg, duration: 2000 })
+          // }
+
+          // if (response.data.list !== null) {
+          //   var chartBar1_data = response.data.list[0]
+          //   this.chartBar1_data =  chartBar1_data
+          //   this.roadchartBar1(chartBar1_data)
+          // } else {
+          //   this.chart1.list = []
+          // }
+ 
+
+      })
+
+ 
+     
+    },
+
+    roadchartBar1(chartBar1_data) {
+
+            
+      if (this.chartBar1 != null) {
+        this.chartBar1.dispose()
+      }
+
+      console.log(echarts)
+      this.chartBar1 = echarts.init(document.getElementById('chartBar1'))
+      var option = {
+        title: { text: '疾病情况'},
+        tooltip: { trigger: 'axis' },
+        legend: { data: ['治愈','疾病' ] },
+        grid: { left: '3%',right: '4%', bottom: '3%', containLabel: true },
+        xAxis: {
+          type: 'category',
+          axisPointer: { type: 'shadow'},
+          data: chartBar1_data.monthdate 
+        },
+        yAxis: [
+          { type: 'value',axisLabel: {formatter: '{value} 次' }},
+        ],
+        series: [
+          { name: '治愈',  type: 'bar', data: chartBar1_data.arr1   },
+          { name: '疾病',  type: 'bar', data: chartBar1_data.arr2   },
+        ]
+      }
+
+
+      this.chartBar1.setOption(option)
+      window.onresize = function () {
+        this.chartBar1.resize()
+      }
+    },
+
+
+    form_export() {
+        //获取请求表格数据的参数
+        //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+        //请求表格
+        // GetDataByName(this.download.getdataListParm).then(response => {
+        //     if (response.data.list !== null) {
+        //       this.download.list = response.data.list
+        //     } else {
+        //       this.download.list = []
+        //     }
+        //     var excelDatas = [
+        //       {
+        //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+        //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+        //         tableDatas: this.download.list,
+        //         sheetName: 'Sheet1'
+        //       }
+        //     ]
+        //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+        // })
+
+        var excelDatas = [
+            {
+                tHeader: ['表头1', '表头2', '表头3', '表头4',],
+                filterVal: ['title1', 'title2', 'title3', 'title4'],
+                tableDatas: [ 
+                    {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                    {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                    {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+                ],
+                sheetName: 'Sheet1'
+            }
+        ]
+        json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    }
+
+
+    
+
+   
+     
+
+  }
+}
+</script>
+ 
+<style scoped>
+
+</style>

+ 37 - 0
src/views/dataStatistics/FeedCost3.vue

@@ -368,6 +368,43 @@ export default {
     },
 
 
+    form_export() {
+        //获取请求表格数据的参数
+        //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+        //请求表格
+        // GetDataByName(this.download.getdataListParm).then(response => {
+        //     if (response.data.list !== null) {
+        //       this.download.list = response.data.list
+        //     } else {
+        //       this.download.list = []
+        //     }
+        //     var excelDatas = [
+        //       {
+        //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+        //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+        //         tableDatas: this.download.list,
+        //         sheetName: 'Sheet1'
+        //       }
+        //     ]
+        //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+        // })
+
+        var excelDatas = [
+            {
+                tHeader: ['表头1', '表头2', '表头3', '表头4',],
+                filterVal: ['title1', 'title2', 'title3', 'title4'],
+                tableDatas: [ 
+                    {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                    {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                    {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+                ],
+                sheetName: 'Sheet1'
+            }
+        ]
+        json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    }
+
+
     
 
    

+ 0 - 41
src/views/dataStatistics/SurvivalRate1.vue

@@ -1,41 +0,0 @@
-<template>
- 
-  <div>
-        1.1版本页面,待开发
-  </div>
-
-
-</template> 
-
-<script>
-import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
-import { parseTime, json2excel } from '@/utils/index.js'
-export default {
-  data() {
-
-
-    
- 
-  
-    return {
-
-  
-       
-    }
-  },
-  created(){
-    
-    
-  },
-  methods:{
-
-    
-     
-
-  }
-}
-</script>
- 
-<style scoped>
-
-</style>

+ 376 - 0
src/views/dataStatistics/SurvivalRate3.vue

@@ -0,0 +1,376 @@
+<template>
+ 
+  <div>
+
+    <el-card class="box-card">
+
+       <!-- 搜索区域 -->
+       <div class="search-bx1">
+
+
+        <el-date-picker v-model="searchData.inputDatetime1" class="g-mr20" type="year"  style="width: 250px;" />
+        <el-select v-model="searchData.typeId" filterable placeholder="犊牛类型" style="width: 180px;" class="g-mr20">
+          <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
+        </el-select>
+ 
+
+       
+
+
+         
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <!-- <el-button type="primary"   @click="form_clear">重置</el-button> -->
+     
+            <el-button type="primary"   @click="form_export">导出</el-button>  
+      </div>
+
+
+      <div id="chartLine1"  style="width: 100%;height:280px;"></div>
+
+
+      <!-- 表格 -->
+      <el-table   key="0"  :data="tableList"  v-loading="tableLoading" element-loading-text="给我一点时间"    border fit>
+        <el-table-column label="日期"  width="50px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.id }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="犊牛数" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="死亡率" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>  
+        <el-table-column label="存活率" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.number }}</span>
+          </template>
+        </el-table-column>  
+        
+      </el-table>
+
+       
+
+    </el-card >
+  </div>
+
+
+</template> 
+
+<script>
+import {  ajaxDataGet, ajaxDataPost, ajaxDataPut, ajaxDataDelete, checkButtons} from '@/api/common'
+import { parseTime, json2excel } from '@/utils/index.js'
+
+import * as echarts from 'echarts';
+
+export default {
+  data() {
+
+ 
+ 
+  
+    return {
+
+
+      //接口 - 获取 - 表格
+      url_get_table:'/api/v1/ops/barn_group/list',
+      //接口 - 获取 - 图表
+      url_get_echart:'/api/v1/ops/barn_group/add',  
+ 
+      //获取 - 表格数据 - 参数
+      searchData:{
+        inputDatetime1:"",
+        typeId:"全部",
+        name: "",
+        barn_group_name: "",
+        number: "",
+        status: undefined,
+        page: 1,  //页码
+        page_size: 10,   //每页数量
+        total:0,  //总页数
+        pastureId: ""
+      },
+      tableLoading: false,
+      //表格内容
+      tableList:[
+        //  { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123',roleList:[2,3] },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123',roleList:[] },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"admin", id:100, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"epans", id:200, date:'2023-12-01',email:'测试信息1123' },
+        // { username:"derek", id:300, date:'2023-12-01',email:'测试信息1123' },
+      ],
+
+
+      feedList: [
+         {id: "全部饲料", name: "全部饲料"}, 
+         {id: "牛奶", name: "牛奶"}, 
+         {id: "水", name: "水"}, 
+         {id: "代乳粉", name: "代乳粉"}, 
+      ], 
+
+      //  下拉框 - 栏舍组 
+      calfTypeList: [
+        // {id: "栏舍组1", name: "栏舍组1"}, 
+        // {id: "栏舍组2", name: "栏舍组2"}, 
+        // {id: "栏舍组3", name: "栏舍组3"}
+      ], 
+
+
+
+      chart1: {
+        getdataListParm: {
+          name: 'getChart1ByHomepage',
+          page: 1,
+          offset: 1,
+          pagecount: '',
+          returntype: 'Map',
+          parammaps: {
+            inputDatetime: '',
+            beginDate: '',
+            endDate: '',
+        
+          }
+        }
+      },
+      //图表实例
+      chartLine1: null,
+      //图表数据
+      chartLine1_data: {
+        monthdate:['2022-08-04', '2022-08-05', '2022-08-06', '2022-08-07', '2022-08-08', '2022-08-09', '2022-08-10'],
+        arr1:['3.52', '3.17', '3.31', '2.79', '3.22', '2.98', '3.06'],
+        arr2:['3.52', '3.17', '3.31', '2.79', '3.22', '2.98', '3.06'],
+        arr3:['3.52', '3.17', '3.31', '2.79', '3.22', '2.98', '3.06'],
+        arr4:['3.52', '3.17', '3.31', '2.79', '3.22', '2.98', '3.06'],
+        arr5:['3.52', '3.17', '3.31', '2.79', '3.22', '2.98', '3.06'],
+        arr6:['3.52', '3.17', '3.31', '2.79', '3.22', '2.98', '3.06'],
+        sum:['300.52', '300.17', '300.31', '200.79', '300.22', '200.98', '300.06'],
+       
+      },
+  
+       
+    }
+  },
+  mounted() {
+    //加载 - 图表假数据,如果是图表需要放mounted里测试假数据
+     this.roadchartLine1(this.chartLine1_data)
+
+ 
+
+  },
+  created(){
+    
+    //获取下拉框
+    this.get_select_list1()
+    //表格 - 初始化 
+    this.get_table_data()
+
+
+     //this.getChart1
+
+  },
+  methods:{
+
+    //获取 下拉框
+    get_select_list1(){
+        var me = this
+        ajaxDataPost('/api/v1/ops/base_setting/calf_type/list?page=1&page_size=1000', {name:"" }).then(e => {
+            console.log("穿梭框1:",e)
+
+            //打印请求成功结果
+            if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+              me.calfTypeList = []
+            } else {
+              me.calfTypeList = e.data.list
+            }
+
+        })
+
+ 
+    
+    },
+
+
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+
+      if (me.searchData.inputDatetime1 !== '' && me.searchData.inputDatetime1 !== null) {
+          me.searchData.min_operation_time = parseTime(me.searchData.inputDatetime1[0], '{y}-{m}-{d}')
+          me.searchData.max_operation_time = parseTime(me.searchData.inputDatetime1[1], '{y}-{m}-{d}')
+        } else {
+          me.searchData.inputDatetime1 = ''
+          me.searchData.min_operation_time = ''
+          me.searchData.max_operation_time = ''
+        }               
+      me.get_table_data()
+      me.getChart1()
+
+    },
+    
+
+    //获取 表格
+    get_table_data() {
+ 
+      var me = this
+
+      me.tableLoading = true
+      console.log("searchData======>", me.searchData)
+
+
+      
+      if( me.searchData.status == ""){
+        me.searchData.status = undefined
+      }
+
+       var send_url = me.url_get_table + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+       ajaxDataPost(send_url,  me.searchData).then(e => {
+          console.log("表格请求结果:",e)
+          //打印请求成功结果
+            if(e.code == 200 ){
+              me.tableList = e.data.list
+              me.searchData.total = e.data.total;	// 总数
+              me.searchData.page = e.data.page;	//页码
+              me.searchData.page_size = e.data.page_size;	//每页数量
+            
+            } else {
+              me.$message({ type: 'error', message: '请求表格列表失败!' + e.msg, duration: 2000 })
+            }
+
+            setTimeout(() => {
+              me.tableLoading = false
+            }, 100)
+
+        })
+
+      
+    },
+
+    getChart1() {
+
+
+      var send_url = me.url_get_chart + '?page=' + me.searchData.page +  '&page_size=' + me.searchData.page_size
+
+      ajaxDataPost(send_url,  me.searchData).then(e => {
+        console.log("图表请求结果:",e)
+        //打印请求成功结果
+          // if(e.code == 200 ){
+          //   me.tableList = e.data.list
+          //   me.searchData.total = e.data.total;	// 总数
+          //   me.searchData.page = e.data.page;	//页码
+          //   me.searchData.page_size = e.data.page_size;	//每页数量
+          
+          // } else {
+          //   me.$message({ type: 'error', message: '请求表格列表失败!' + e.msg, duration: 2000 })
+          // }
+
+          // if (response.data.list !== null) {
+          //   var chartLine1_data = response.data.list[0]
+          //   this.chartLine1_data =  chartLine1_data
+          //   this.roadchartLine1(chartLine1_data)
+          // } else {
+          //   this.chart1.list = []
+          // }
+ 
+
+      })
+
+ 
+     
+    },
+
+    roadchartLine1(chartLine1_data) {
+
+            
+      if (this.chartLine1 != null) {
+        this.chartLine1.dispose()
+      }
+
+      console.log(echarts)
+      this.chartLine1 = echarts.init(document.getElementById('chartLine1'))
+      var option = {
+        title: { text: '犊牛死亡趋势'},
+        tooltip: { trigger: 'axis' },
+        legend: { data: ['死亡' ] },
+        grid: { left: '3%',right: '4%', bottom: '3%', containLabel: true },
+        xAxis: {
+          type: 'category',
+          axisPointer: { type: 'shadow'},
+          data: chartLine1_data.monthdate 
+        },
+        yAxis: [
+          { type: 'value',axisLabel: {formatter: '{value} 头' }},
+        ],
+        series: [
+          { name: '死亡',  type: 'line', data: chartLine1_data.arr1   }
+        ]
+      }
+
+      this.chartLine1.setOption(option)
+      window.onresize = function () {
+        this.chartLine1.resize()
+      }
+    },
+
+
+    form_export() {
+        //获取请求表格数据的参数
+        //this.download.getdataListParm.parammaps = this.tableObj.getdataListParm.parammaps
+        //请求表格
+        // GetDataByName(this.download.getdataListParm).then(response => {
+        //     if (response.data.list !== null) {
+        //       this.download.list = response.data.list
+        //     } else {
+        //       this.download.list = []
+        //     }
+        //     var excelDatas = [
+        //       {
+        //         tHeader: ['表头1', '表头2', '表头3', '表头4',],
+        //         filterVal: ['title1', 'title2', 'title3', 'title4'],
+        //         tableDatas: this.download.list,
+        //         sheetName: 'Sheet1'
+        //       }
+        //     ]
+        //     json2excel(excelDatas, '表格大标题', true, 'xlsx')
+        // })
+
+        var excelDatas = [
+            {
+                tHeader: ['表头1', '表头2', '表头3', '表头4',],
+                filterVal: ['title1', 'title2', 'title3', 'title4'],
+                tableDatas: [ 
+                    {title1: "内容1",title2: "内容2",title3: "内容3",title4: "内容4"},
+                    {title1: "内容11",title2: "内容22",title3: "内容32",title4: "内容44"},
+                    {title1: "内容111",title2: "内容222",title3: "内容333",title4: "内容444"},
+                ],
+                sheetName: 'Sheet1'
+            }
+        ]
+        json2excel(excelDatas, '表格大标题', true, 'xlsx')
+    }
+
+
+    
+
+   
+     
+
+  }
+}
+</script>
+ 
+<style scoped>
+
+</style>