epans 1 rok pred
rodič
commit
245b42e6c2

+ 7 - 1
src/utils/request.js

@@ -6,6 +6,8 @@ import { MessageBox, Message } from 'element-ui'
 // import store from '@/store'
 // import { getToken } from '@/utils/auth'
 
+
+//让内外网都能登陆的设置,但是npm run dev 后智能选localhost展示了
 //获取当前url
 const DoMainString = document.querySelector("html").getAttribute("domain");
 axios.defaults.baseURL = process.env.VUE_APP_BASE_API
@@ -19,7 +21,11 @@ if (reg.test(browserUrl)){
   axios.defaults.baseURL = window.location.protocol +"//"+ browserUrl + ":8087/"
 }
 
-console.log("url=========",axios.defaults.baseURL)
+// console.log("url=========",axios.defaults.baseURL)
+
+
+
+
 // create an axios instance
 const service = axios.create({
   //baseURL: process.env.VUE_APP_BASE_API, // 根目录路径

+ 0 - 0
src/views/Login1.vue → src/views/Login备份.vue


+ 123 - 0
src/views/Welcome10.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>

+ 353 - 31
src/views/Welcome3.vue → src/views/Welcome11.vue

@@ -110,37 +110,101 @@
 
         <el-col :span="12">
 
-            <div class = "color-bx">
-              <div  class="color-bx-item color-block1">
-                <span class = "color-circle1 circle-c1"></span>
-                <span class = "color-num">0.84</span>
-                <span class = "color-tt">日均增重(KG)</span>
-              </div>
-              <div  class=" color-bx-item color-block2">
-                <span class = "color-circle1 circle-c2"></span>
-                <span class = "color-num">2357.23</span>
-                <span class = "color-tt">日均饲喂成本(元)</span>
-              </div>
-              <div  class="color-bx-item color-block3">
-                <span class = "color-circle1 circle-c3"></span>
-                <span class = "color-num">93.43</span>
-                <span class = "color-tt">增重达标率(%)</span>
-              </div>
-              <div  class="color-bx-item color-block4">
-                <span class = "color-circle1 circle-c4"></span>
-                <span class = "color-num">99.6</span>
-                <span class = "color-tt">饲喂准确率(%)</span>
-              </div>
-              <div  class="color-bx-item color-block5">
-                <span class = "color-circle1 circle-c5"></span>
-                <span class = "color-num">93.02</span>
-                <span class = "color-tt">疾病治愈率(%)</span>
-              </div>
-            </div> 
+          <div class = "color-bx">
+            <div  class="color-bx-item color-block1">
+              <span class = "color-circle1 circle-c1"></span>
+              <span class = "color-num">0.84</span>
+              <span class = "color-tt">日均增重(KG)</span>
+            </div>
+            <div  class=" color-bx-item color-block2">
+              <span class = "color-circle1 circle-c2"></span>
+              <span class = "color-num">2357.23</span>
+              <span class = "color-tt">日均饲喂成本(元)</span>
+            </div>
+            <div  class="color-bx-item color-block3">
+              <span class = "color-circle1 circle-c3"></span>
+              <span class = "color-num">93.43</span>
+              <span class = "color-tt">增重达标率(%)</span>
+            </div>
+            <div  class="color-bx-item color-block4">
+              <span class = "color-circle1 circle-c4"></span>
+              <span class = "color-num">99.6</span>
+              <span class = "color-tt">饲喂准确率(%)</span>
+            </div>
+            <div  class="color-bx-item color-block5">
+              <span class = "color-circle1 circle-c5"></span>
+              <span class = "color-num">93.02</span>
+              <span class = "color-tt">疾病治愈率(%)</span>
+            </div>
+          </div> 
 
+          <div class="card-cont2">
+
+            <!-- <el-col :span="12">
+              <div id="chartPie2"  style="width: 100%;height:360px;"></div>
+            </el-col> -->
+
+            <el-col :span="8">
+                <div class = "gmu-bx-b">
+                    <div>
+                      <span class = "gmu-squre gmu1"></span>
+                      <span class = "gmu-b-tt">公犊:828</span>
+                    </div>
+                    <div>
+                      <span class = "gmu-squre gmu2"></span>
+                      <span class = "gmu-b-tt">增重达标:863</span>
+                    </div>
+                    <div>
+                      <span class = "gmu-squre gmu3"></span>
+                      <span class = "gmu-b-tt">不达标:65</span>
+                    </div>    
+                    <div>
+                      <span class = "gmu-squre gmu4"></span>
+                      <span class = "gmu-b-tt">达标率:92.47</span>
+                    </div>   
+                </div>
+            </el-col>
+
+            <el-col :span="8">
+              <div id="chartPie3"  style="width: 100%;height:340px;"></div>
+            </el-col>
+
+            <el-col :span="8">
+                <div class = "gmu-bx-b2">
+                    <div> 
+                      <span class = "gmu-b-tt">母犊:1372</span>
+                      <span class = "gmu-squre gmu5"></span>
+                    </div>
+                    <div>
+                      <span class = "gmu-b-tt">增重达标:1286</span>
+                      <span class = "gmu-squre gmu6"></span>
+                    </div>
+                    <div>
+                      <span class = "gmu-b-tt">不达标:86</span>
+                      <span class = "gmu-squre gmu7"></span>
+                    </div>    
+                    <div>
+                      <span class = "gmu-b-tt">达标率:93.31</span>
+                      <span class = "gmu-squre gmu8"></span>
+                    </div>   
+                  </div>
+            </el-col>    
             
+          </div>   
 
-            
+
+          <div class="card-bx">
+
+            <div class="card-title" style = "position: relative;">
+                <span  style = "position: absolute;left: 10px;"><i class="el-icon-d-arrow-right icon-title"></i></span>
+                <span  style = "position: absolute;left: 40px;"> 月均增重</span>
+            </div>
+            <div class="card-cont">
+                <div id="chartLine4"  style="width: 100%;height:360px;"></div>
+            </div>
+          </div>
+
+          
         </el-col> 
 
         <el-col :span="6">
@@ -149,7 +213,7 @@
                 <span><i class="el-icon-d-arrow-right icon-title"></i></span>
                 <span>栏舍概况</span>
             </div>
-            <div class="card-cont" style="padding:10px 20px">
+            <div class="card-cont" style="padding:10px 20px;width:88%">
                 <div class="lan-item lan1">
                   <span class="lan-tit">栏舍概况</span><span class="lan-num lann1">2000</span>
                 </div>
@@ -311,11 +375,20 @@ export default {
     //加载 - 图表假数据,如果是图表需要放mounted里测试假数据
        this.roadchartPie1(this.chartPie1_data)
 
- 
+       this.roadchartPie3(this.chartPie3_data)
+
+      this.roadchartLine4(this.chartLine4_data)
+
+      this.roadchartLine5(this.chartLine5_data)
 
   },
   methods:{
      
+
+    formatpro(percentage){
+      return `${ percentage }`;
+       
+    },
     //图表数据加载
     roadchartPie1(chartPie1_data) {
 
@@ -368,6 +441,255 @@ export default {
         this.chartPie1.resize()
       }
     },
+
+    //图表数据加载
+    roadchartPie2(chartPie2_data) {
+      if (this.chartPie2 != null) {
+        this.chartPie2.dispose()
+      }
+      this.chartPie2 = echarts.init(document.getElementById('chartPie2'))
+      var option = {
+        title: { text: '', left: 'center'},
+        tooltip: {  trigger: 'item' },
+        legend: { 
+           orient: 'vertical',  left: 'left',top: '40',textStyle:{color:'#fff'},
+           icon:'circle',
+           formatter: function (name) {  //图例后添加数值
+          
+            var  data = option.series[0].data;
+         
+            let tarValue;
+            for (let i = 0; i < data.length; i++) {
+              if (data[i].name === name) {
+                tarValue = data[i].value;
+              }
+            }
+
+        
+            return  name+": "+ tarValue;
+          }
+           
+        },
+        color:['#4b07fa', '#0f96fc'],
+ 
+        series: [
+           
+          {
+            name: '',
+            type: 'pie',
+            radius: ['25%', '65%'],
+           center: ['60%', '40%'],
+            labelLine: {
+              length: 30
+            },
+            label: {
+              position:'inside',fontSize: 14,
+              formatter: '   {d}%   ',
+              color:'#fff'
+            },
+            data: [
+              { value: chartPie2_data.num1, name: '公犊' },
+              { value: chartPie2_data.num2, name: '母犊' }, 
+            ]
+          }
+        ]
+      }
+   
+      
+      this.chartPie2.setOption(option)
+      window.onresize = function () {
+        this.chartPie2.resize()
+      }
+    },
+
+    //图表数据加载
+    roadchartPie3(chartPie3_data) {
+      if (this.chartPie3 != null) {
+        this.chartPie3.dispose()
+      }
+      this.chartPie3 = echarts.init(document.getElementById('chartPie3'))
+      var option = {
+        title: { text: '', left: 'center'},
+        tooltip: {  trigger: 'item' },
+        // legend: { 
+        //    orient: 'vertical',  left: 'left',top: '40',textStyle:{color:'#fff'},
+        //    icon:'circle',
+        //    formatter: function (name) {  //图例后添加数值
+          
+        //     var  data = option.series[0].data;
+         
+        //     let tarValue;
+        //     for (let i = 0; i < data.length; i++) {
+        //       if (data[i].name === name) {
+        //         tarValue = data[i].value;
+        //       }
+        //     }
+
+        
+        //     return  name+": "+ tarValue;
+        //   }
+           
+        // },
+        color:[ '#074898', '#7e5428' ,  '#027ff2', '#59d571', '#f19610', '#8805e2'],
+ 
+        series: [
+
+
+        {
+            name: '',
+            type: 'pie',
+            selectedMode: 'single',
+            radius: ['50%', '70%'],
+             center: ['50%', '40%'],
+            label: {
+              show:false,
+              // position:'inside',fontSize: 14,
+              // formatter: '    {d}%   ',
+              // color:'#fff'
+            },
+            data: [
+              { value: chartPie3_data.num1, name: '公犊' },
+              { value: chartPie3_data.num2, name: '母犊' } 
+            ]
+          },
+          {
+            name: '',
+            type: 'pie',
+            radius: ['70%', '90%'],
+           center: ['50%', '40%'],
+            labelLine: {
+              length: 30
+            },
+            label: {
+              show:false,
+              // position:'inside',fontSize: 14,
+              // formatter: '   {d}%   ',
+              // color:'#fff'
+            },
+            data: [
+              { value: chartPie3_data.num3, name: '公犊增重达标' },
+              { value: chartPie3_data.num4, name: '母犊增重达标' },
+              { value: chartPie3_data.num5, name: '公犊不达标' },
+              { value: chartPie3_data.num6, name: '母犊不达标' }
+            ]
+          }
+           
+         
+        ]
+      }
+   
+      
+      this.chartPie3.setOption(option)
+      window.onresize = function () {
+        this.chartPie3.resize()
+      }
+    },
+
+
+    //图表数据加载
+    roadchartLine4(chartLine4_data) {
+      if (this.chartLine4 != null) {
+        this.chartLine4.dispose()
+      }
+      this.chartLine4 = echarts.init(document.getElementById('chartLine4'))
+      var option = {
+        title: { text: '', left: 'center'},
+        tooltip: {  trigger: 'item' },
+        grid: {  show:true,left: "10%", top:'23%', right:'10%', },
+        color:['#f19610', '#1bff7b' ],
+        legend: {   top: '40',textStyle:{color:'#fff'},   icon:'square'},
+        xAxis: [
+          { 
+            type: 'category', 
+            axisTick: { show: true  },  
+            axisLabel: {  color:'#fff',   interval: 0  ,rotate:0},
+            axisLine: { LineStyle: {color:'#fff'}  },
+            data: chartLine4_data.month
+            
+          } 
+        ],
+        yAxis: [
+          { 
+            type: 'value',  
+            axisTick: { show: false  },  
+            axisLabel: {  color:'#fff'  },
+            axisLine: { LineStyle: {color:'#fff'}  },
+            axisLabel: {  color:'#fff'  },
+            
+          }
+        ],
+        series: [
+          {
+            name: '公犊牛',type: 'line',
+            label: {show: false,position: 'inside' },
+            data: chartLine4_data.num1
+          },
+          {
+            name: '母犊牛',type: 'line',
+            label: {show: false,position: 'inside' },
+            data: chartLine4_data.num2
+          },
+        ]
+  
+      }
+      
+      this.chartLine4.setOption(option)
+      window.onresize = function () {
+        this.chartLine4.resize()
+      }
+    },
+
+
+    //图表数据加载
+    roadchartLine5(chartLine5_data) {
+      if (this.chartLine5 != null) {
+        this.chartLine5.dispose()
+      }
+      this.chartLine5 = echarts.init(document.getElementById('chartLine5'))
+      var option = {
+        title: { text: '', left: 'center'},
+        tooltip: {  trigger: 'axis' },
+        grid: {  show:true,left: "30%", top:'23%', right:'0%', },
+        color:['#0070da', '#0ad1df' ],
+        legend: {   top: '40',textStyle:{color:'#fff'},   },
+        xAxis: [ 
+          { 
+            type: 'value', 
+         
+            
+          } 
+        ],
+        yAxis: [
+          { 
+            type: 'category',  
+            axisTick: { show: false  },  
+            axisLabel: {  color:'#fff'  },
+          
+        
+            data: chartLine5_data.month
+            
+          }
+        ],
+        series: [
+          {
+            name: '出生建档', type: 'bar',  stack: 'total',
+            label: {show: true,position: 'inside' },
+            data: chartLine5_data.num1
+          },
+          {
+            name: '断奶出栏',type: 'bar',  stack: 'total',
+            label: {show: true,position: 'inside' },
+            data: chartLine5_data.num2
+          },
+        ]
+  
+      }
+      
+      this.chartLine5.setOption(option)
+      window.onresize = function () {
+        this.chartLine5.resize()
+      }
+    },
     
    
   }
@@ -431,7 +753,7 @@ export default {
 .squre3{background-color:#34d160;}
 
 
-.lan-item{min-width: 100px;width:100%;height:48px;background-color: #054077;line-height:2;padding-left: 50px;margin-bottom:20px;vertical-align:baseline;border-right : 5px solid #0ce0ef;border-left : 5px solid #0ce0ef}
+.lan-item{min-width: 100px;width:88%;height:48px;background-color: #054077;line-height:2;padding-left: 50px;margin-bottom:20px;vertical-align:baseline;border-right : 5px solid #0ce0ef;border-left : 5px solid #0ce0ef}
 .lan-tit{display: inline-block;width:52%;color:#fff;font-size:16px}
 .lan-num{display: inline-block;width:45%;color:#fff;font-size:24px}
 .lan1{background-color: #054077;border-right : 5px solid #0ce0ef;border-left : 5px solid #0ce0ef}

+ 1 - 356
src/views/basicSettings/DiseaseManagement.vue

@@ -20,372 +20,17 @@ export default {
     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:{
-        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' },
-      ],
-
-
-      
-      pastureList:[
-    
-      ],
-
-    
-
- 
-
-
-      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_add() {
-      this.reset_form()
-      this.addFormStatus = 'create'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-    //编辑
-    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()
-    },
-
-    //新增 保存
-    add_dialog_save() {
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
-              "name": me.addForm.name,
-          }
-          console.log("弹窗参数:", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-           ajaxDataPost(me.url_add_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 })
-                }
-            })
-         
-        }
-      })
-    },
-    //编辑 保存
-    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')
-}
-
-     
 
   }
 }

+ 34 - 0
src/views/basicSettings/DiseaseManagement10.vue

@@ -0,0 +1,34 @@
+<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>
+<!-- 加了scoped,则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

+ 471 - 0
src/views/basicSettings/DiseaseManagement11.vue

@@ -0,0 +1,471 @@
+<template>
+ 
+  <div>
+
+
+    <el-card class="box-card">
+      <!-- 搜索区域 -->
+      <div class="search-bx1">
+          <el-input v-model="searchData.name" placeholder="疾病类型"  style="width: 220px;" class="g-mr20" clearable />
+          <el-button type="primary"   @click="form_search">搜索</el-button>
+          <el-button type="primary"   @click="form_clear">重置</el-button>
+          <el-button type="primary"   @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="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+          </template>
+        </el-table-column>
+    
+         
+ 
+        <!-- <el-table-column  label="状态"  min-width="100px" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.mg_state" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"   />
+          </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" size="mini" icon="el-icon-edit" @click="form_edit(scope.row)">修改</el-button>
+             <!-- 删除按钮 -->
+             <el-button type="danger" size="mini" icon="el-icon-delete" @click="form_delete(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="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 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/category_table/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/base_setting/category_table/add',  
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/base_setting/category_table/update', 
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/base_setting/category_table/is_show', 
+      
+      //接口 - 下拉框 列表 
+      url_get_select1:'/role/getAll',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        name: "",
+        category_type:3, //工单发1,疾病发3
+        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' },
+      ],
+
+
+      
+      pastureList:[
+    
+      ],
+
+    
+
+ 
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' 
+      },
+
+      addFormRules:{
+        name: [
+          { required: true, message: '类型必填', trigger: 'blur' },
+        ],
+   
+
+      },
+
+     
+       
+    }
+  },
+  created(){
+      //获取按钮权限
+      // this.get_auto_buttons 
+     
+
+     //获取下拉框
+     // 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_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    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()
+    },
+
+    //新增 保存
+    add_dialog_save() {
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "category_type":3  //0 无效 3 疾病类型
+          }
+          console.log("弹窗参数:", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+           ajaxDataPost(me.url_add_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 })
+                }
+            })
+         
+        }
+      })
+    },
+    //编辑 保存
+    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)
+
+            var send_data = { 
+              "category_type":3,   // 1 工单类型  2 栏舍组 3 疾病
+              "name": row.name,
+              "id": row.id,
+          }
+            //加载 - 发送新增保存
+            ajaxDataPost(me.url_delete_table, send_data).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 - 362
src/views/basicSettings/InfoRemind.vue

@@ -13,379 +13,17 @@ 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:{
-        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' },
-      ],
-
-
-      
-      pastureList:[
-    
-      ],
-
-    
-
- 
-
-
-      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_add() {
-      this.reset_form()
-      this.addFormStatus = 'create'
-      this.addFormShow = true
-      this.$nextTick(() => {
-        this.$refs['addFormRef'].clearValidate()
-      })
-    },
-
-    //编辑
-    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()
-    },
-
-    //新增 保存
-    add_dialog_save() {
-      var me = this
-      this.$refs['addFormRef'].validate(valid => {
-        //验证成功
-        if (valid) {
-          //发起请求
-          var send_data = {
-              "name": me.addForm.name,
-          }
-          console.log("弹窗参数:", send_data)
-
-          //关闭弹窗
-          // me.addFormShow = false
-         //加载 - 发送新增保存
-           ajaxDataPost(me.url_add_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 })
-                }
-            })
-         
-        }
-      })
-    },
-    //编辑 保存
-    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')
-}
-
-     
 
   }
 }

+ 34 - 0
src/views/basicSettings/InfoRemind10.vue

@@ -0,0 +1,34 @@
+<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>
+<!-- 加了scoped,则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

+ 0 - 0
src/views/basicSettings/InfoRemind3.vue → src/views/basicSettings/InfoRemind11.vue


+ 4 - 10
src/views/basicSettings/WorkOrderType.vue

@@ -13,29 +13,23 @@ import { parseTime, json2excel } from '@/utils/index.js'
 export default {
   data() {
 
-
-    
- 
-  
     return {
 
-  
+ 
        
     }
   },
   created(){
-    
-    
+
   },
   methods:{
 
-    
-     
 
   }
 }
 </script>
- 
+<!-- 加了scoped,则是仅在此组件里生效 -->
 <style scoped>
 
 </style>
+

+ 35 - 0
src/views/basicSettings/WorkOrderType10.vue

@@ -0,0 +1,35 @@
+<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>
+<!-- 加了scoped,则是仅在此组件里生效 -->
+<style scoped>
+
+</style>
+

+ 1 - 1
src/views/basicSettings/WorkOrderType2.vue → src/views/basicSettings/WorkOrderType11.vue

@@ -106,7 +106,7 @@ export default {
       //获取 - 表格数据 - 参数
       searchData:{
         name: "",
-        category_type:1,
+        category_type:1, //工单发1,疾病发3
         page: 1,  //页码
         page_size: 10,   //每页数量
         total:0,  //总页数

+ 3 - 10
src/views/cowManagement/WeightRecord.vue

@@ -13,29 +13,22 @@ import { parseTime, json2excel } from '@/utils/index.js'
 export default {
   data() {
 
-
-    
- 
-  
     return {
 
-  
+ 
        
     }
   },
   created(){
-    
-    
+
   },
   methods:{
 
-    
-     
 
   }
 }
 </script>
- 
+<!-- 加了scoped,则是仅在此组件里生效 -->
 <style scoped>
 
 </style>

+ 34 - 0
src/views/cowManagement/WeightRecord10.vue

@@ -0,0 +1,34 @@
+<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>
+<!-- 加了scoped,则是仅在此组件里生效 -->
+<style scoped>
+
+</style>

+ 0 - 0
src/views/cowManagement/WeightRecord3.vue → src/views/cowManagement/WeightRecord11.vue


+ 0 - 21
src/views/formulaPlan/FormulaTemplate3.vue → src/views/formulaPlan/FormulaTemplate10.vue

@@ -118,7 +118,6 @@
 
          <el-row :gutter="20"  >
             <el-button type="primary"   @click="add_step">增加一个阶段</el-button>
-            <el-button type="primary"   @click="feed_proganmme">智能饲喂方案</el-button>
          </el-row>
 
 
@@ -451,14 +450,6 @@ export default {
       },
 
 
-      feedFormShow:false,
-      addFormStatusStep: '',
-      addFormTxtStep: {  edit: '修改',  create: '新增' },
-      addFormStep:{
-        name:'',id:'' , start_daily_age:undefined,end_daily_age:undefined,forage_id:undefined,forage_name:'',daily_feed_number:undefined,first_class_ratio:undefined,second_class_ratio:undefined,third_class_ratio:undefined,fourth_class_ratio:undefined,allow_class_error:undefined,feed_temp:undefined,feed_temp:undefined,allow_temp_error:undefined,
-      },
-
-
       class_num:4
 
     }
@@ -844,18 +835,6 @@ export default {
       })
     },
 
-
-    feed_proganmme() {
- 
-      this.addFormStep.id = this.tableListStep.length + 1
-
-      this.addFormShowStep = true
-      this.$nextTick(() => {
-        this.$refs['addFormRefStep'].clearValidate()
-      })
-
-    },
-
     //编辑
     edit_step(index, row) {
       this.stepIndex = index

+ 1108 - 0
src/views/formulaPlan/FormulaTemplate11.vue

@@ -0,0 +1,1108 @@
+<template>
+
+  <div>
+
+
+    <el-card class="box-card">
+      <!-- 搜索区域 -->
+      <div class="search-bx1">
+          <el-input v-model="searchData.name" placeholder="配方名称"  style="width: 180px;" class="g-mr20 g-mb20" clearable />
+
+          <el-select v-model="searchData.calf_category_id" filterable placeholder="犊牛类型" class="g-mr20" style="width: 180px;" clearable>
+            <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
+
+          <el-input-number v-model="searchData.min_daily_age" style="width:120px;" :controls="false" placeholder="日龄" />
+          <span style="margin:0px 8px;">至</span>
+          <el-input-number v-model="searchData.max_daily_age" style="width:120px;" class="g-mr20" :controls="false" placeholder="日龄" />
+
+
+
+
+          <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="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.calf_category_name }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="适用日龄" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{   }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="配方阶段数" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{   }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="公犊增重指标(KG/日)" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.male_calf_daily_weight }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="母犊增重指标(KG/日)" min-width="150px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.female_calf_daily_weight }}</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>
+             <!-- 删除按钮 -->
+             <el-button type="danger"  v-if="isButtonEdit"  size="mini" icon="el-icon-delete" @click="form_delete(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="80%">
+      <div class="">
+        <el-form  ref="addFormRef"  :rules="addFormRules"  :model="addForm"  label-position="right" label-width="160px"  style="width:80%;margin:0 auto 50px">
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="配方名称:" prop="name">
+                <el-input v-model="addForm.name"      />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="犊牛类型:" prop="calf_category_id">
+                <el-select  v-model="addForm.calf_category_id" filterable placeholder="请选择" class="filter-item" style="width: 100%;" >
+                  <el-option v-for="item in calfTypeList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+         </el-row>
+
+         <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="公犊增重指标(KG/日):" prop="male_calf_daily_weight">
+                <el-input v-model="addForm.male_calf_daily_weight"    placeholder="建议填写,用以统计牛只成长达标率"   />
+              </el-form-item>
+
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="母犊增重指标(KG/日):" prop="female_calf_daily_weight">
+                <el-input v-model="addForm.female_calf_daily_weight"    placeholder="建议填写,用以统计牛只成长达标率"   />
+              </el-form-item>
+            </el-col>
+         </el-row>
+
+
+
+         <el-row :gutter="20"  >
+            <el-button type="primary"   @click="add_step">增加一个阶段</el-button>
+            <el-button type="primary"   @click="feed_proganmme">智能饲喂方案</el-button>
+         </el-row>
+
+
+         <el-row>
+            <!-- 表格 -->
+            <el-table   key="0"  ref="tableStep" :data="tableListStep"  v-loading="tableLoadingStep" 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.start_daily_age }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="结束日龄" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.end_daily_age }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="饲料类型" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.forage_name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="日饲喂量(kg)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.daily_feed_number }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第一班占比(%)" min-width="150px" align="center" >
+                <template slot-scope="scope">
+                  <span>{{ scope.row.first_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第二班占比(%)" min-width="150px" align="center" v-if="class_num == 2 || class_num == 3 || class_num == 4">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.second_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第三班占比(%)" min-width="150px" align="center" v-if=" class_num == 3 || class_num == 4">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.third_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="第四班占比(%)" min-width="150px" align="center" v-if="  class_num == 4">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.fourth_class_ratio }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="班次允许误差(kg)" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.allow_class_error }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="饲喂温度℃" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.feed_temp }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="允许温差℃" min-width="150px" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.allow_temp_error }}</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="edit_step(scope.$index, scope.row)">修改</el-button>
+                  <!-- 删除按钮 -->
+                  <el-button type="danger"  v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="delete_step(scope.$index, scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+         </el-row>
+
+
+
+        </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>
+
+     <!-- 弹窗 新增or修改 阶段 -->
+    <el-dialog  :title="addFormTxtStep[addFormStatusStep]" :visible.sync="addFormShowStep" @close="add_step_close" width="80%">
+      <div class="">
+        <el-form  ref="addFormRefStep"  :rules="addFormRulesStep"  :model="addFormStep"  label-position="right" label-width="150px"  style="width:80%;margin:0 auto 50px">
+
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="阶段:"  >
+                <el-input v-model="addFormStep.id"    placeholder=""  disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="开始日龄:" prop="start_daily_age">
+                <el-input v-model="addFormStep.start_daily_age"    placeholder=""   />
+              </el-form-item>
+
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束日龄:" prop="end_daily_age">
+                <el-input v-model="addFormStep.end_daily_age"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="饲料类型:" prop="forage_id">
+                <el-select  v-model="addFormStep.forage_id" filterable placeholder="请选择"  style="width: 100%;" >
+                  <el-option v-for="item in forageList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="日饲喂量(kg):" prop="daily_feed_number">
+                <el-input v-model="addFormStep.daily_feed_number"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row :gutter="20">
+          <el-col :span="12">
+              <el-form-item label="第一班占比(%):" prop="first_class_ratio">
+                <el-input v-model="addFormStep.first_class_ratio"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="第二班占比(%):" prop="second_class_ratio" v-if="class_num == 2 || class_num == 3 || class_num == 4">
+                <el-input v-model="addFormStep.second_class_ratio"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row :gutter="20">
+          <el-col :span="12">
+              <el-form-item label="第三班占比(%):" prop="third_class_ratio" v-if=" class_num == 3 || class_num == 4">
+                <el-input v-model="addFormStep.third_class_ratio"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="第四班占比(%):" prop="fourth_class_ratio" v-if=" class_num == 4">
+                <el-input v-model="addFormStep.fourth_class_ratio"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+         </el-row>
+
+         <el-row :gutter="20">
+          <el-col :span="12">
+              <el-form-item label="饲喂温度℃:" prop="feed_temp">
+                <el-input v-model="addFormStep.feed_temp"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="允许温差℃:" prop="allow_temp_error">
+                <el-input v-model="addFormStep.allow_temp_error"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+         </el-row>
+         <el-row :gutter="20">
+          <el-col :span="12">
+              <el-form-item label="班次允许误差(kg):" prop="allow_class_error">
+                <el-input v-model="addFormStep.allow_class_error"    placeholder=""   />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+
+            </el-col>
+         </el-row>
+
+
+
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="addFormStatusStep==='create'?add_step_save():edit_step_save()">确认</el-button>
+          <el-button @click="addFormShowStep = false">关闭</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+
+
+     <!-- 弹窗 智能方案 -->
+     <el-dialog   title="智能方案" :visible.sync="feedFormShow" @close="add_step_close" width="80%">
+      <div class="">
+        <el-form  ref="feedFormStatusStep"  :rules="addFormRulesStep"  :model="feedFormStep"  label-position="right" label-width="150px"  style="width:80%;margin:0 auto 50px">
+
+ 
+
+          <el-row :gutter="20"  >
+            <h2> 通过简单设置,系统将根据算法自动生成犊牛整个饲喂阶段的日饲喂量。  </h2>
+            <h2> 注:只需设置起始、截止以及任意一个中间日龄(中间阶段的日龄可自行添加,添加越多算法越精准,至少设置1个中间日龄的饲喂量)  </h2>
+          
+          </el-row>
+          <el-row :gutter="20"  >
+            <el-button type="primary"   @click="add_step">增加中间日龄</el-button>
+          </el-row>
+
+
+          <el-row>
+              <!-- 表格 -->
+              <el-table   key="0"  ref="tableStep" :data="tableListStep"  v-loading="tableLoadingStep" 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.start_daily_age }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="结束日龄" min-width="150px" align="center">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.end_daily_age }}</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="edit_step(scope.$index, scope.row)">修改</el-button>
+                    <!-- 删除按钮 -->
+                    <el-button type="danger"  v-if="isButtonEdit" size="mini" icon="el-icon-delete" @click="delete_step(scope.$index, scope.row)">删除</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+          </el-row>
+
+
+
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="addFormStatusStep==='create'?add_step_save():edit_step_save()">确认</el-button>
+          <el-button @click="addFormShowStep = 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/formula_plan/formula/list',
+      //接口 - 新增 - 表格
+      url_add_table:'/api/v1/ops/formula_plan/formula/add',
+      //接口 - 修改 - 表格
+      url_edit_table:'/api/v1/ops/formula_plan/formula/update',
+      //接口 - 删除 - 表格
+      url_delete_table:'/api/v1/ops/formula_plan/formula',
+
+      //接口 - 下拉框 列表
+      url_get_select1:'/api/v1/ops/calf_feed/enum/list',
+
+      //接口 - 下拉框 列表 栏舍组
+      url_get_select2:'/api/v1/ops/barn_group/list?page=1&page_size=1000',
+
+      //按钮权限
+      isButtonEdit:false,
+
+      //获取 - 表格数据 - 参数
+      searchData:{
+        calf_code: "",
+        barn_name: "",
+        mother_code: "",
+        calf_category_id:undefined,
+        genders: undefined,
+        status: undefined,
+        min_daily_weight_gain: undefined,
+        max_daily_weight_gain: undefined,
+        min_daily_age: undefined,
+        max_daily_age: 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' },
+      ],
+
+
+
+
+
+
+
+
+      //栏舍状态
+      statusList:[
+        {id: 1, value: '正常'},
+        {id: 2, value: '空栏'},
+        {id: 3, value: '损坏'},
+      ],
+
+
+
+      //犊牛类型
+      calfTypeList:[
+
+      ],
+
+    //栏舍
+      cowsheList:[
+
+      ],
+       //饲料
+      forageList:[
+
+      ],
+
+      sexList:[
+        {id: 1, value: '公'},
+        {id: 2, value: '母'},
+      ],
+
+
+
+
+
+      addFormShow:false,
+      addFormStatus: '',
+      addFormTxt: {  edit: '修改',  create: '新增' },
+      addForm:{
+        name:'',id:'' ,calf_category_id:undefined, male_calf_daily_weight:undefined, female_calf_daily_weight:undefined,
+      },
+      addFormRules:{
+        name: [ { required: true, message: '配方名称必填', trigger: 'blur' },  ],
+        calf_category_id: [ { required: true, message: '犊牛类型必填', trigger: 'blur' },  ],
+      },
+
+
+      stepIndex:undefined,
+
+      tableLoadingStep: false,
+      //表格内容
+      tableListStep:[
+
+      ],
+
+      addFormShowStep:false,
+      addFormStatusStep: '',
+      addFormTxtStep: {  edit: '修改',  create: '新增' },
+      addFormStep:{
+        name:'',id:'' , start_daily_age:undefined,end_daily_age:undefined,forage_id:undefined,forage_name:'',daily_feed_number:undefined,first_class_ratio:undefined,second_class_ratio:undefined,third_class_ratio:undefined,fourth_class_ratio:undefined,allow_class_error:undefined,feed_temp:undefined,feed_temp:undefined,allow_temp_error:undefined,
+      },
+
+      addFormRulesStep:{
+        // name: [
+        //   { required: true, message: '类型必填', trigger: 'blur' },
+        // ],
+      },
+
+
+      feedFormShow:false,
+      feedFormStatusStep: '',
+      feedFormTxtStep: {  edit: '修改',  create: '新增' },
+      feedFormStep:{
+        name:'',id:'' ,  daily_feed_number:undefined,first_class_ratio:undefined,second_class_ratio:undefined,third_class_ratio:undefined,fourth_class_ratio:undefined,allow_class_error:undefined 
+      },
+
+
+      class_num:4
+
+    }
+  },
+  created(){
+
+     //获取按钮权限
+     const isButtonEdit = checkButtons(this.$store.state.buttonsList, "日龄饲喂模板编辑")
+      this.isButtonEdit = isButtonEdit
+      console.log('this.isButtonEdit==========',this.isButtonEdit)
+
+
+     var me = this
+
+     //获取下拉框
+     this.get_select_list1()
+
+     //表格 - 初始化
+     setTimeout(function () {
+       me.get_table_data()
+			}, 1000);
+
+
+//  this.get_table_data()
+
+  },
+  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
+            }
+
+        })
+
+
+
+
+        ajaxDataPost('/api/v1/ops/barn/list?page=1&page_size=1000', {name:"",barn_group_name:"",status:undefined}).then(e => {
+            console.log("穿梭框1:",e)
+
+            //打印请求成功结果
+            if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+              me.cowsheList = []
+            } else {
+              me.cowsheList = e.data.list
+            }
+
+        })
+
+
+
+
+
+
+        ajaxDataGet('/api/v1/ops/base_setting/forage/list?page=1&page_size=1000', {  }).then(e => {
+          console.log("饲料下拉框1:",e)
+
+          //打印请求成功结果
+          if(e.data.list == null || e.data.list == undefined ||e.data.list.length == 0   ){
+            me.forageList = []
+          } else {
+            me.forageList = e.data.list
+          }
+
+        })
+        // 班次数量下拉框
+        ajaxDataGet('/api/v1/ops/calf_feed/enum/list').then(e => {
+          console.log(e)
+          if(e.code === 200){
+            var class_num = e.data.class_list.length
+          } else {
+            var class_num = 4
+          }
+          console.log("class_num========",class_num)
+          me.class_num = class_num
+        })
+
+
+
+    },
+
+
+    //获取 表格
+    get_table_data() {
+
+     var me = this
+
+     me.tableLoading = true
+     console.log("searchData======>", me.searchData)
+
+
+
+
+     if( me.searchData.calf_category_id == ""){
+        me.searchData.calf_category_id = 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)
+
+        })
+
+
+    },
+    //搜索 查询表格
+    form_search(){
+      var me = this
+      console.log('请求表格列表searchData',me.searchData)
+      me.get_table_data()
+
+    },
+
+    //重置 表格
+    form_clear(){
+      var me = this
+      me.searchData.calf_code = ""
+      me.searchData.barn_name = ""
+      me.searchData.mother_code = ""
+      me.searchData.calf_category_id = undefined
+      me.searchData.genders = undefined
+      me.searchData.status = undefined
+      me.searchData.min_daily_weight_gain = undefined
+      me.searchData.max_daily_weight_gain = undefined
+      me.searchData.min_daily_age = undefined
+      me.searchData.max_daily_age = undefined
+
+
+
+      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 = ''
+      this.addForm.id = undefined
+      this.addForm.calf_category_id = undefined
+      this.addForm.male_calf_daily_weight = undefined
+      this.addForm.female_calf_daily_weight = undefined
+      this.addForm.number = ''
+
+
+      this.tableListStep = []
+
+    },
+
+    //新增
+    form_add() {
+      this.reset_form()
+      this.addFormStatus = 'create'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+    //编辑
+    form_edit(row) {
+      this.reset_form()
+      var me = this
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addForm = Object.assign({}, row)
+
+      if(row.genders == 0){
+        this.addForm.genders = undefined
+      }
+      me.tableListStep = row.formula_stage
+
+      this.addFormStatus = 'edit'
+      this.addFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRef'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_dialog_close(){
+       //内容重置
+       this.$refs['addFormRef'].resetFields()
+    },
+
+    //新增 保存
+    add_dialog_save() {
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+              "name": me.addForm.name,
+              "calf_category_id": me.addForm.calf_category_id,
+              "calf_category_name":'11',
+              "male_calf_daily_weight": parseFloat(me.addForm.male_calf_daily_weight),
+              "female_calf_daily_weight": parseFloat(me.addForm.female_calf_daily_weight),
+              "formula_stage": me.tableListStep
+          }
+
+
+
+
+
+
+          console.log("弹窗参数:", send_data)
+
+          //关闭弹窗
+          // me.addFormShow = false
+         //加载 - 发送新增保存
+           ajaxDataPost(me.url_add_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 })
+                }
+            })
+
+        }
+      })
+    },
+    //编辑 保存
+    edit_dialog_save(){
+      var me = this
+      this.$refs['addFormRef'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var send_data = {
+             "id": me.addForm.id,
+              "name": me.addForm.name,
+              "calf_category_id": me.addForm.calf_category_id,
+              "calf_category_name":'11',
+              "male_calf_daily_weight": parseFloat(me.addForm.male_calf_daily_weight),
+              "female_calf_daily_weight": parseFloat(me.addForm.female_calf_daily_weight),
+              "formula_stage": me.tableListStep
+          }
+
+          // var name = this.barnGroupList.find(obj => obj.id == me.addForm.barn_group_id).name
+          // console.log(name)
+
+           // 编辑保存
+          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: '已取消删除'
+          });
+        });
+
+
+
+    },
+
+
+
+
+
+
+    //清空弹窗表单信息
+    reset_step(){
+
+      this.addFormStep.name = ''
+      this.addFormStep.start_daily_age = undefined
+      this.addFormStep.end_daily_age = undefined
+      this.addFormStep.forage_id = undefined
+      this.addFormStep.forage_name=""
+      this.addFormStep.daily_feed_number = undefined
+      this.addFormStep.first_class_ratio = undefined
+      this.addFormStep.second_class_ratio = undefined
+      this.addFormStep.third_class_ratio = undefined
+      this.addFormStep.fourth_class_ratio = undefined
+      this.addFormStep.allow_class_error = undefined
+      this.addFormStep.feed_temp = undefined
+      this.addFormStep.allow_temp_error = undefined
+
+
+    },
+
+    //新增
+    add_step() {
+      this.reset_step()
+      this.addFormStatusStep = 'create'
+      this.addFormStep.id = this.tableListStep.length + 1
+
+      this.addFormShowStep = true
+      this.$nextTick(() => {
+        this.$refs['addFormRefStep'].clearValidate()
+      })
+    },
+
+
+    feed_proganmme() {
+ 
+    
+      this.feedFormShow = true
+      this.$nextTick(() => {
+        this.$refs['addFormRefStep'].clearValidate()
+      })
+
+    },
+
+    //编辑
+    edit_step(index, row) {
+      this.stepIndex = index
+      console.log('行内容row=========', row)
+      //编辑行内容赋值
+      this.addFormStep = Object.assign({}, row)
+
+      if(row.forage_id == 0){
+        this.addFormStep.forage_id = undefined
+      }
+      this.addFormStatusStep = 'edit'
+      this.addFormShowStep = true
+      this.$nextTick(() => {
+        this.$refs['addFormRefStep'].clearValidate()
+      })
+    },
+
+
+    //新增关闭
+    add_step_close(){
+       //内容重置
+       this.$refs['addFormRefStep'].resetFields()
+       this.reset_step()
+       this.addFormShowStep = false
+
+    },
+
+    //新增 保存
+    add_step_save() {
+      var me = this
+      this.$refs['addFormRefStep'].validate(valid => {
+        //验证成功
+        if (valid) {
+          //发起请求
+          var forage_name = me.forageList.find(obj => obj.id == me.addFormStep.forage_id).name
+          var send_data =   {
+            "id":  me.addFormStep.id,
+            "name":  me.addFormStep.name,
+            "start_daily_age":me.addFormStep.start_daily_age,
+            "end_daily_age":me.addFormStep.end_daily_age,
+            "forage_id": me.addFormStep.forage_id,
+            "forage_name":  forage_name ,
+            "daily_feed_number":me.addFormStep.daily_feed_number,
+            "first_class_ratio": me.addFormStep.first_class_ratio,
+            "second_class_ratio":me.addFormStep.second_class_ratio,
+            "third_class_ratio": me.addFormStep.third_class_ratio,
+            "fourth_class_ratio": me.addFormStep.fourth_class_ratio,
+            "allow_class_error": me.addFormStep.allow_class_error,
+            "feed_temp": me.addFormStep.feed_temp,
+            "allow_temp_error": me.addFormStep.allow_temp_error,
+        }
+
+
+
+
+
+          console.log("弹窗参数:", send_data)
+
+          //关闭弹窗
+          me.addFormShowStep = false
+          me.tableListStep.push(send_data)
+
+
+        }
+      })
+    },
+    //编辑 保存
+    edit_step_save(){
+      var me = this
+      this.$refs['addFormRefStep'].validate(valid => {
+        //验证成功
+        if (valid) {
+          var forage_name = me.forageList.find(obj => obj.id == me.addFormStep.forage_id).name
+          //发起请求
+          var send_data = {
+
+            "id":  me.addFormStep.id,
+            "name":  me.addFormStep.name,
+            "start_daily_age":me.addFormStep.start_daily_age,
+            "end_daily_age":me.addFormStep.end_daily_age,
+            "forage_id": me.addFormStep.forage_id,
+            "forage_name":  forage_name ,
+            "daily_feed_number":me.addFormStep.daily_feed_number,
+            "first_class_ratio": me.addFormStep.first_class_ratio,
+            "second_class_ratio":me.addFormStep.second_class_ratio,
+            "third_class_ratio": me.addFormStep.third_class_ratio,
+            "fourth_class_ratio": me.addFormStep.fourth_class_ratio,
+            "allow_class_error": me.addFormStep.allow_class_error,
+            "feed_temp": me.addFormStep.feed_temp,
+            "allow_temp_error": me.addFormStep.allow_temp_error,
+          }
+
+
+
+           // 编辑保存
+          console.log("弹窗参数:", send_data)
+          me.addFormShowStep = false
+          var stepIndex = me.stepIndex
+          this.$set(me.tableListStep, stepIndex, send_data)
+          console.log('me.tableListStep============',me.tableListStep)
+
+
+        }
+      })
+    },
+
+
+    delete_step(index, row) {
+      var me = this
+
+       me.$confirm('是否删除此条内容?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log('点击了 - 删除一个阶段index===',index,'row===',row)
+          me.tableListStep.splice(index, 1)
+
+            //加载 - 发送新增保存
+            // 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>

+ 41 - 0
src/views/workManagement/WorkTaskAssign10.vue

@@ -0,0 +1,41 @@
+<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>

+ 0 - 0
src/views/workManagement/WorkTaskAssign3.vue → src/views/workManagement/WorkTaskAssign11.vue


+ 41 - 0
src/views/workManagement/WorkTaskImplement10.vue

@@ -0,0 +1,41 @@
+<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>

+ 0 - 0
src/views/workManagement/WorkTaskImplement3.vue → src/views/workManagement/WorkTaskImplement11.vue