修改产品提出的10个问题

.env.development

@@ -4,12 +4,12 @@ ENV = 'development'
 # base api
 # 测试线
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
 # VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
 
 # 许义平后台本地
-VUE_APP_BASE_API = 'http://192.168.1.96:8081/'
+# VUE_APP_BASE_API = 'http://192.168.1.96:8081/'
 # VUE_APP_BASE_API = 'http://192.168.1.93/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/utils/request.js

@@ -14,9 +14,9 @@ if (DoMainString) {
 var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
 var browserUrl = window.location.hostname
 console.log("========url===",reg.test(browserUrl))
-if (reg.test(browserUrl)){
-  URL = window.location.protocol +"//"+ browserUrl + ":8082"
-}
+// if (reg.test(browserUrl)){
+//   URL = window.location.protocol +"//"+ browserUrl + ":8082"
+// }
 
 Cookies.set('url',URL)
 console.log(process.env.VUE_APP_BASE_API,'===========URL1111')

src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -144,7 +144,7 @@ export default {
       isSupplementList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用补料
       isLeftoverMaterialList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用剩料
       decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
-      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定牛头数
+      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定牛羊只数
       disposalList: [], // 剩料处理选项
       waterConditioningList: [{ id: '0', name: '青贮' }, { id: '1', name: '总日粮饲喂量' }, { id: '2', name: '不处理' }], // 水分调节选项
       priceCalculationList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用库存管理

src/views/basicData/defaultParameter/function/index.vue

@@ -57,8 +57,8 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="启用饲料锁定头数：" prop="isLockCount">
-            <el-select v-model="createTemp.isLockCount" :disabled="isRoleEdit==false" filterable placeholder="启用饲料锁定头数" class="filter-item" style="width:100%">
+          <el-form-item label="启用饲料锁定羊只数：" prop="isLockCount">
+            <el-select v-model="createTemp.isLockCount" :disabled="isRoleEdit==false" filterable placeholder="启用饲料锁定羊只数" class="filter-item" style="width:100%">
               <el-option v-for="item in isLockBullsList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -189,7 +189,7 @@
           <!-- <br>
           5、是否启用饲料合同：若选择是，则开启库存管理中饲料合同页面。 -->
           <br>
-          5、启用饲料锁定头数：开启后则配方模板中饲料表显示此字段。
+          5、启用饲料锁定羊只数：开启后则配方模板中饲料表显示此字段。
           <br>
           6、车辆载重超出重量提醒比例：撒料计划中车次分配栏舍重量，当分配的合计重量超出车辆最大重量*此比例时，进行提示。限制输入正整数。
           <br>
@@ -233,7 +233,7 @@ export default {
       isSupplementList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用补料
       isLeftoverMaterialList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用剩料
       decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
-      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定头数
+      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定羊只数
       disposalList: [], // 剩料处理选项
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' },{ id: '4', name: '5' },{ id: '5', name: '6' }], // 班次数量
       feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同

src/views/basicData/equipmentTMR/index.vue

@@ -55,12 +55,7 @@
             <el-input v-if="scope.row.Edit" v-model.trim="scope.row.volume" type="number" style="width:98%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="车速(km/h)" min-width="110px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.speed }}</span>
-            <el-input v-if="scope.row.Edit" v-model.trim="scope.row.speed" type="number" style="width:98%;padding:10px 0;" />
-          </template>
-        </el-table-column>
+
         <el-table-column label="车辆颜色" min-width="70px" align="center">
           <template slot-scope="scope">
             <el-color-picker v-model="scope.row.tcolor" size="mini" :predefine="predefineColors" style="vertical-align: middle;" :disabled="scope.row.NoEdit" />
@@ -72,14 +67,20 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.datacaptureno" type="number" step="0.01" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="TMR设备类型" min-width="110px" align="center">
+        <el-table-column label="TMR设备类型123" min-width="110px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.tclassname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.tclassid" filterable :disabled="scope.row.islock == 1" placeholder="TMR设备类型" class="filter-item" style="width:95%;padding:10px 0;" @change="changeType">
+            <el-select v-if="scope.row.Edit" v-model="scope.row.tclassid" filterable :disabled="scope.row.islock == 1" placeholder="TMR设备类型" class="filter-item" style="width:95%;padding:10px 0;" @change="changeType(scope.row)">
               <el-option v-for="item in typeList" :key="item.id" :label="item.label" :value="item.value" />
             </el-select>
           </template>
         </el-table-column>
+        <el-table-column label="车速(km/h)" min-width="110px" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.NoEdit">{{ scope.row.speed }}</span>
+            <el-input v-if="scope.row.Edit" v-model.trim="scope.row.speed" type="number" :disabled="scope.row.isSpeed" style="width:98%;padding:10px 0;" />
+          </template>
+        </el-table-column>
 
         <el-table-column label="最大搅拌量(KG)" min-width="110px" align="center">
           <template slot-scope="scope">
@@ -134,7 +135,7 @@
         <el-table-column label="撒料机每转体积" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.volume_rate }}</span>
-            <el-input v-if="scope.row.Edit" v-model.trim="scope.row.volume_rate" type="number" style="width:98%;padding:10px 0;" />
+            <el-input v-if="scope.row.Edit" v-model.trim="scope.row.volume_rate" :disabled="scope.row.isSpeed" type="number" style="width:98%;padding:10px 0;" />
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
@@ -264,7 +265,8 @@ export default {
           list: [],
           total: 0,
           listLoading: false,
-          temp: {}
+          temp: {},
+          // isSpeed:false, // 是否校验车速和搅拌机速度
         },
       },
       textMap: {
@@ -307,6 +309,11 @@ export default {
             this.$set(response.data.list[i], 'isCreate', false) // 新增操作
             this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
             this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
+            if(response.data.list[i].tclassid == '2' || response.data.list[i].tclassid == '4' ){
+              this.$set(response.data.list[i], 'isSpeed', true) // 车速是否可加
+            }else{
+            this.$set(response.data.list[i], 'isSpeed', false) // 车速是否可加
+            }
           }
           this.table.list = response.data.list
           this.table.pageNum = response.data.pageNum
@@ -351,8 +358,20 @@ export default {
       this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'eqcode': '', 'tname': '', 'datacaptureno': '', 'tclassid': '', 'maxstirfeed': '', 'tcolor': '#ccc', 'autosecond': '0', 'imei': '','volume':'','speed':'','volume_rate':'' })
     },
     // TMR设备类型
-    changeType(item) {
+    changeType(obj) {
+      console.log(obj,'9999')
+      const item = obj.tclassid;
       this.table.temp.tclassname = this.typeList.find(obj => obj.value == item).label
+      // 如果是固定或小料 则无需设置速度必填
+      if(item == '2' || item.value == '4' ){
+        obj.isSpeed = true;
+        obj.speed=0;
+        obj.volume_rate=0;
+      } else{
+        obj.isSpeed = false;
+      }
+
+
     },
     // 跳转延时
     changeAutosecond(item, row) {
@@ -373,6 +392,7 @@ export default {
         row.autosecondname = ''
         this.table.temp.autosecondname = ''
       }
+      const isSpeed = row.isSpeed;
       this.table.temp.pastureid = Cookies.get('pastureid')
       this.table.temp.eqcode = row.eqcode
       this.table.temp.tname = row.tname
@@ -390,27 +410,27 @@ export default {
       this.table.temp.imei = row.imei
       this.table.temp.speed = row.speed
       this.table.temp.volume_rate = row.volume_rate
-      if(this.table.temp.volume == ''){
-        this.table.temp.volume = 0
-      }
-      this.table.temp.volume = parseFloat(row.volume)
+      // if(this.table.temp.volume == ''){
+      //   this.table.temp.volume = 0
+      // }
+      this.table.temp.volume =row.volume == '' ? 0: parseFloat(row.volume)
       // 检验用户名称/角色是否为空
-      if (this.table.temp.eqcode == '' && this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == '' && this.table.temp.speed == '' && this.table.temp.volume_rate == '') {
+      if (this.table.temp.eqcode == '' && this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == '' && this.table.temp.speed == '' && this.table.temp.volume_rate == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: 'TMR设备编号/TMR设备名称/数据采集卡编号/TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: 'TMR设备名称/数据采集卡编号/TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: '数据采集卡编号/TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: 'TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: '最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      }else if (this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      }else if (this.table.temp.speed == ''&& this.table.temp.volume_rate == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: '车速/撒料机每转体积不能为空', duration: 2000 })
         return false
       } else if (this.table.temp.eqcode == '') {
@@ -428,15 +448,15 @@ export default {
       } else if (this.table.temp.maxstirfeed == '') {
         this.$message({ type: 'error', message: '最大搅拌量不能为空', duration: 2000 })
         return false
-      }else if (this.table.temp.speed == '') {
+      }else if (this.table.temp.speed == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: '车速不能为空', duration: 2000 })
         return false
-      }else if (this.table.temp.volume_rate == '') {
+      }else if (this.table.temp.volume_rate == '' && !row.isSpeed) {
         this.$message({ type: 'error', message: '撒料机每转体积不能为空', duration: 2000 })
         return false
       }
-      const datacaptureno = /^([0-9]|(1[0-5]))$/
-      if (!datacaptureno.test(parseFloat(this.table.temp.datacaptureno))) {
+      const datacapturenoReg = /^([0-9]|(1[0-5]))$/
+      if (!datacapturenoReg.test(parseFloat(this.table.temp.datacaptureno))) {
         this.$message({ type: 'error', message: '数据采集卡请输入0-15之间整数', duration: 2000 })
         return false
       }
@@ -461,8 +481,11 @@ export default {
         this.$message({ type: 'error', message: 'TMR设备名称不可输入特殊字符', duration: 2000 })
         return false
       }
-      this.table.temp.speed = parseFloat(row.speed)
-      this.table.temp.volume_rate = parseFloat(row.volume_rate)
+      // this.table.temp.speed = parseFloat(row.speed)
+      // this.table.temp.volume_rate = parseFloat(row.volume_rate)
+      // this.table.temp.volume = parseFloat(row.volume)
+       this.table.temp.speed = parseFloat(row.speed)
+       this.table.temp.volume_rate = parseFloat(row.volume_rate)
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
@@ -519,6 +542,7 @@ export default {
     },
     updateData(row) {
       console.log('点击了编辑保存', row)
+
       if (row.tcolor == null) {
         row.tcolor = '#CCCCCC'
       }
@@ -528,6 +552,7 @@ export default {
         this.table.temp.autosecondname = ''
       }
 
+      const isSpeed = row.isSpeed;
       this.table.temp.pastureid = Cookies.get('pastureid')
       this.table.temp.eqcode = row.eqcode
       this.table.temp.tname = row.tname
@@ -546,27 +571,31 @@ export default {
       this.table.temp.autosecondname = this.table.temp.autosecondname
       this.table.temp.speed = row.speed
       this.table.temp.volume_rate = row.volume_rate
-      if(this.table.temp.volume == ''){
+      if(row.volume == ''){
         this.table.temp.volume = 0
       }
       this.table.temp.volume = parseFloat(row.volume)
+      if(row.volume_rate == ''){
+        this.table.temp.volume_rate = 0
+      }
+
       // 检验用户名称/角色是否为空
-      if (this.table.temp.eqcode == '' && this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == '' && this.table.temp.speed == '' && this.table.temp.volume_rate == '') {
+      if (this.table.temp.eqcode == '' && this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == '' && this.table.temp.speed == '0' && this.table.temp.volume_rate == '0'  && !row.isSpeed) {
         this.$message({ type: 'error', message: 'TMR设备编号/TMR设备名称/数据采集卡编号/TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == '0'&& this.table.temp.volume_rate == '0'  && !row.isSpeed) {
         this.$message({ type: 'error', message: 'TMR设备名称/数据采集卡编号/TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == '0' && this.table.temp.volume_rate == '0'  && !row.isSpeed) {
         this.$message({ type: 'error', message: '数据采集卡编号/TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == ''  && !row.isSpeed) {
         this.$message({ type: 'error', message: 'TMR设备类型/最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      } else if (this.table.temp.maxstirfeed == ''&& this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      } else if (this.table.temp.maxstirfeed == ''&& this.table.temp.speed == '0' && this.table.temp.volume_rate == '0'  && !row.isSpeed) {
         this.$message({ type: 'error', message: '最大搅拌量/车速/撒料机每转体积不能为空', duration: 2000 })
         return false
-      }else if (this.table.temp.speed == ''&& this.table.temp.volume_rate == '') {
+      }else if (this.table.temp.speed == '0' && this.table.temp.volume_rate == '0' && !row.isSpeed) {
         this.$message({ type: 'error', message: '车速/撒料机每转体积不能为空', duration: 2000 })
         return false
       } else if (this.table.temp.eqcode == '') {
@@ -584,15 +613,15 @@ export default {
       } else if (this.table.temp.maxstirfeed == '') {
         this.$message({ type: 'error', message: '最大搅拌量不能为空', duration: 2000 })
         return false
-      }else if (this.table.temp.speed == '') {
+      }else if (this.table.temp.speed == '0'  && !row.isSpeed) {
         this.$message({ type: 'error', message: '车速不能为空', duration: 2000 })
         return false
-      }else if (this.table.temp.volume_rate == '') {
+      }else if (this.table.temp.volume_rate == '0'  && !row.isSpeed) {
         this.$message({ type: 'error', message: '撒料机每转体积不能为空', duration: 2000 })
         return false
       }
-      const datacaptureno = /^([0-9]|(1[0-5]))$/
-      if (!datacaptureno.test(parseInt(this.table.temp.datacaptureno))) {
+      const datacapturenoReg = /^([0-9]|(1[0-5]))$/
+      if (!datacapturenoReg.test(parseInt(this.table.temp.datacaptureno))) {
         this.$message({ type: 'error', message: '数据采集卡请输入0-15之间整数', duration: 2000 })
         return false
       }
@@ -618,16 +647,18 @@ export default {
         this.$message({ type: 'error', message: 'TMR设备名称不可输入特殊字符', duration: 2000 })
         return false
       }
+
       this.table.temp.speed = parseFloat(row.speed)
-      this.table.temp.volume_rate = parseFloat(row.volume_rate)
+       this.table.temp.volume_rate = parseFloat(row.volume_rate)
+
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
       }, 1000)
       this.requestParam.name = 'updateTMR'
       this.requestParam.parammaps = this.table.temp
+      console.log('新增保存发送参数', this.requestParam)
       PostDataByName(this.requestParam).then(response => {
-        console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList()

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -131,7 +131,7 @@
               <b style="font-size: 26px;line-height: 30px;">{{ scope.row.ftname }}</b>
             </template>
           </el-table-column>
-          <el-table-column label="头数" min-width="80px" align="center">
+          <el-table-column label="羊只数" min-width="80px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.cowcount }}</span>
             </template>
@@ -871,7 +871,7 @@
             </el-table-column>
             <el-table-column label="时间" min-width="80px" align="center" prop="plantime" />
             <el-table-column label="配方名称" min-width="100px" align="center" prop="ftname" />
-            <el-table-column label="头数" min-width="80px" align="center" prop="cowcount" />
+            <el-table-column label="羊只数" min-width="80px" align="center" prop="cowcount" />
             <el-table-column label="描述" min-width="80px" align="center" prop="display" />
             <el-table-column label="发料位" min-width="80px" align="left" prop="barnames" />
           </el-table>
@@ -932,8 +932,8 @@ export default {
       requestParams: [
         // { name: 'getDictByName', offset: 0, pagecount: 0, params: ['牲畜父类'] }
       ],
-      planTypeList: [{ lable: '预混计划', value: '4' }, { lable: '撒料计划', value: '0' },
-      // { lable: '剩料计划', value: '3' },
+      planTypeList: [ { lable: '撒料计划', value: '0' },
+      // { lable: '剩料计划', value: '3' }, { lable: '预混计划', value: '4' }
       { lable: '撒料计划-混料', value: '1' }, { lable: '撒料计划-撒料', value: '2' }, { lable: '预称重计划', value: '5' }], // 计划类型
       printingTypeList: [{ lable: '精料', value: '1' }, { lable: '铲车', value: '2' }], // 打印类型
       frequencyList: [], // 班次

src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue

@@ -26,8 +26,8 @@
         </el-table-column>
         <el-table-column :key="2" label="栏舍名称" prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
         <el-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-        <el-table-column :key="4" label="软件头数" prop="softccount" min-width="70px" align="center" />
-        <el-table-column :key="5" label="实际头数" min-width="100px" align="center">
+        <el-table-column :key="4" label="软件羊只数" prop="softccount" min-width="70px" align="center" />
+        <el-table-column :key="5" label="实际羊只数" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ccount }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccount" step="0.01" type="number" style="width:95%;padding:10px 0;" @blur="blurCcount(scope.row)" />
@@ -39,7 +39,7 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.ratio" step="0.01" type="number" style="width:95%;padding:10px 0;" @blur="blurRatio(scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column :key="7" label="系数头数" min-width="100px" align="center">
+        <el-table-column :key="7" label="系数羊只数" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ccountratio }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccountratio" step="0.01" type="number" style="width:95%;padding:10px 0;" @blur="blurCcountratio(scope.row)" />
@@ -314,7 +314,7 @@ export default {
       // SfweightLock
       row.SfweightLock = this.recipeTemplateList.find(obj => obj.id == row.ptid).SfweightLock
     },
-    // 实际牛头数
+    // 实际牛羊只数
     blurCcount(row) {
       if (row.ccount !== '' && row.ratio !== '') {
         row.ccountratio = formatNum(parseFloat(row.ccount) * parseFloat(row.ratio) / 100, 2)
@@ -325,7 +325,7 @@ export default {
       }
       if (this.table.isPtsfname == false) {
         if (row.Sfweight !== '' && row.ccountratio !== '' && row.SfweightLock !== '' && row.ccount) {
-          // 软件牛头数softccount实际牛头数ccount系数(%)ratio系数头数ccountratio
+          // 软件牛羊只数softccount实际牛羊只数ccount系数(%)ratio系数羊只数ccountratio
           // row.pweight = formatNum(parseFloat(row.Sfweight) * parseFloat(row.ccountratio) + parseFloat(row.SfweightLock) * parseFloat(row.ccount), 2)
           // row.weight = formatNum(parseFloat(row.pweight) * (parseFloat(row.tratio) / 100), 2)
           row.pweight = formatNum(parseFloat(row.Sfweight) * parseFloat(row.ccount) * parseFloat(row.ratio) / 100 + parseFloat(row.SfweightLock) * parseFloat(row.ccount), 2)
@@ -383,8 +383,8 @@ export default {
       }
       this.getSumWeight(row)
     },
-    // 系数头数
-    // 系数头数=实际牛头数*系数*100%；
+    // 系数羊只数
+    // 系数羊只数=实际牛羊只数*系数*100%；
     blurCcountratio(row) {
       if (row.ccountratio !== '' && row.ccount !== '' && row.ratio !== '') {
         row.ratio = formatNum(parseFloat(row.ccountratio) * 100 / parseFloat(row.ccount), 2)
@@ -503,11 +503,11 @@ export default {
       const positiveInteger = /^[1-9]\d*$/
       if (row.ccount !== '') {
         if (!positiveInteger.test(parseFloat(row.ccount))) {
-          this.$message({ type: 'error', message: '实际头数请输入正整数', duration: 2000 })
+          this.$message({ type: 'error', message: '实际羊只数请输入正整数', duration: 2000 })
           return false
         }
       } else {
-        this.$message({ type: 'error', message: '实际头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: '实际羊只数不能为空', duration: 2000 })
       }
       const positiveNumber = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
       if (row.ratio !== '') {
@@ -520,11 +520,11 @@ export default {
       }
       if (row.ccountratio !== '') {
         if (!positiveNumber.test(parseFloat(row.ccountratio))) {
-          this.$message({ type: 'error', message: '系数头数请输入正数', duration: 2000 })
+          this.$message({ type: 'error', message: '系数羊只数请输入正数', duration: 2000 })
           return false
         }
       } else {
-        this.$message({ type: 'error', message: '系数头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: '系数羊只数不能为空', duration: 2000 })
       }
 
       if (row.tratio == '') {

src/views/formulationPlan/dhedFormula/index.vue

@@ -17,7 +17,7 @@
         <!-- <el-input v-model="table.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
         <el-button class="successBorder" @click="form_search">查询</el-button>
         <el-button v-if="isRoleEdit" class="successBorder" @click="handleDryMatterRegulation">干物质调节</el-button>
-        <el-button v-if="isRoleEdit && isSynchronous" class="successBorder" @click="handleSynchronous">软件头数同步</el-button>
+        <el-button v-if="isRoleEdit && isSynchronous" class="successBorder" @click="handleSynchronous">软件羊只数同步</el-button>
         <el-button v-if="isRoleEdit && !isproportion" class="successBorder" @click="handle_batchEdit">批量编辑</el-button>
         <el-button v-if="isRoleEdit && isproportion" icon="el-icon-folder-checked" class="success" @click="handle_batchEdit_save">保存</el-button>
         <el-button v-if="isRoleEdit && isproportion" icon="el-icon-close" class="sortCancel" @click="cancelChangeEdit">取消</el-button>
@@ -66,12 +66,12 @@
             <span>{{ scope.row.pen }}</span>
           </template>
         </el-table-column>
-        <el-table-column :key="2" label="软件头数" min-width="60px" align="center">
+        <el-table-column :key="2" label="软件羊只数" min-width="60px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.softccount }}</span>
           </template>
         </el-table-column>
-        <el-table-column :key="3" label="实际头数" min-width="80px" align="center">
+        <el-table-column :key="3" label="实际羊只数" min-width="80px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit && !isproportion">{{ scope.row.ccount }}</span>
             <el-input v-if="scope.row.Edit || isproportion" v-model="scope.row.ccount" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurCcount(scope.row)" :placeholder="scope.row.placeholder_ccount" @focus="focusData(scope.row)" />
@@ -83,7 +83,7 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.ratio" step="0.01" type="number" style="width:100%;padding:10px 0;" @blur="blurRatio(scope.row)" :placeholder="scope.row.placeholder_ratio" />
           </template>
         </el-table-column>
-        <el-table-column :key="5" label="系数头数" min-width="85px" align="center">
+        <el-table-column :key="5" label="系数羊只数" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.ccountratio }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.ccountratio" type="number" style="width:100%;padding:10px 0;" @blur="blurCcountratio(scope.row)" :placeholder="scope.row.placeholder_ccountratio" />
@@ -312,10 +312,10 @@
             </u-table-column> -->
             <u-table-column :key="2" label="栏舍名称" prop="barname" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <u-table-column :key="3" label="班次" prop="times" min-width="90px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <u-table-column :key="4" label="软件头数" prop="softccount" min-width="70px" align="center" />
-            <u-table-column :key="5" label="实际头数" prop="ccount" min-width="70px" align="center" />
+            <u-table-column :key="4" label="软件羊只数" prop="softccount" min-width="70px" align="center" />
+            <u-table-column :key="5" label="实际羊只数" prop="ccount" min-width="70px" align="center" />
             <u-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />
-            <u-table-column :key="7" label="系数头数" prop="ccountratio" min-width="70px" align="center" />
+            <u-table-column :key="7" label="系数羊只数" prop="ccountratio" min-width="70px" align="center" />
             <u-table-column :key="8" label="配方模板" prop="ptname" min-width="70px" align="center" />
             <u-table-column v-if="table.isPtsfname" :key="9" label="补料配方" prop="ptsname" min-width="70px" align="center" />
             <u-table-column :key="10" label="班次比例" prop="tratio" min-width="70px" align="center" />
@@ -639,12 +639,12 @@
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="单产(kg/头)" min-width="130px" align="center">
+                    <el-table-column label="单产(kg/羊只)" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.product }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="干物质采食量(kg/头)" min-width="130px" align="center">
+                    <el-table-column label="干物质采食量(kg/羊只)" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
@@ -725,12 +725,12 @@
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="单产(kg/头)" min-width="130px" align="center">
+                    <el-table-column label="单产(kg/羊只)" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.product }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="干物质采食量(kg/头)" min-width="130px" align="center">
+                    <el-table-column label="干物质采食量(kg/羊只)" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
@@ -1122,7 +1122,7 @@ export default {
     }
   },
   computed: {
-    // 设置请求头
+    // 设置请求羊只
     headers() {
       return {
         token: getToken()
@@ -1131,16 +1131,16 @@ export default {
     uploadData() {
       return {
         name: 'checkbarname,checkftsw,checkftbl',
-        importParams: '栏舍名称,实际头数,系数（%）,配方模板,补料配方,第一班比例（%）,第二班比例（%）,第三班比例（%）',
+        importParams: '栏舍名称,实际羊只数,系数（%）,配方模板,补料配方,第一班比例（%）,第二班比例（%）,第三班比例（%）',
         sheetname: 'Sheet1',
         // 登录牧场
         pastureid: Cookies.get('pastureid'),
         // 日期参数
         dateParams: '',
         // 必填参数
-        requiredParams: '栏舍名称,实际头数,系数（%）,配方模板,',
+        requiredParams: '栏舍名称,实际羊只数,系数（%）,配方模板,',
         // 为数值的参数
-        numParams: '实际头数,系数（%）,第一班比例（%）,第二班比例（%）,第三班比例（%）,,第四班比例（%）'
+        numParams: '实际羊只数,系数（%）,第一班比例（%）,第二班比例（%）,第三班比例（%）,,第四班比例（%）'
       }
     },
     // 设置上传地址
@@ -1569,15 +1569,15 @@ export default {
       row.dryweight = this.recipeTemplateList.find(obj => obj.id == item).dryweight// SfweightLock
       // 补料重量supplyweight
       // 配方重量ftweight
-      // 系数头数ccountratio
+      // 系数羊只数ccountratio
       // 投喂量feedweight
-      // 实际牛头数ccount
+      // 实际牛羊只数ccount
       // 投喂量 = 配方重量 + 补料重量
-      // 配方重量 = Sfweight * 系数头数 + SfweightLock * 实际牛头数ccount
+      // 配方重量 = Sfweight * 系数羊只数 + SfweightLock * 实际牛羊只数ccount
       console.log(row.Sfweight, 'row.Sfweight')
-      console.log(row.ccountratio, '系数头数')
+      console.log(row.ccountratio, '系数羊只数')
       console.log(row.SfweightLock, 'SfweightLock')
-      console.log(row.ccount, '实际牛头数')
+      console.log(row.ccount, '实际牛羊只数')
       if (row.Sfweight !== '' && row.ccount !== '') {
         this.$set(row, 'ftweight', formatNum(parseFloat(row.Sfweight) * parseFloat(row.ccountratio) + parseFloat(row.SfweightLock) * parseFloat(row.ccount), parseInt(Cookies.get('decimal'))))
       } else {
@@ -1640,9 +1640,9 @@ export default {
       }
       // 补料重量supplyweight
       // 配方重量ftweight
-      // 系数头数ccountratio
+      // 系数羊只数ccountratio
       // 投喂量feedweight
-      // 实际牛头数ccount
+      // 实际牛羊只数ccount
       // 投喂量 = 配方重量 + 补料重量
       row.myccname = this.feedingFormulaList.find(obj => obj.id == item).ccname
       if (row.bigcowclass !== row.myccname) {
@@ -1658,12 +1658,12 @@ export default {
         row.BLweight = 0
         row.BLSfweightLock = 0
       }
-      // 配方重量 = 系数头数 * Sfweight
+      // 配方重量 = 系数羊只数 * Sfweight
       // if (row.ccountratio !== '' && row.ftweight !== '') {
       //   row.ftweight = parseFloat(row.Sfweight) * parseFloat(row.ccountratio)
       // }
 
-      // 补料重量 = 系数头数 * BLweight
+      // 补料重量 = 系数羊只数 * BLweight
       // console.log(row.ccountratio)
       // console.log(row.ccount)
       // console.log(row.BLweight)
@@ -1700,11 +1700,11 @@ export default {
       this.$set(row, 'dailyWeight', parseFloat(row.w1) + parseFloat(row.w2) + parseFloat(row.w3) + parseFloat(row.w4) + parseFloat(row.w5) + parseFloat(row.w6))
       row.dailyWeight = formatNum(row.dailyWeight, parseInt(Cookies.get('decimal')))
     },
-    // 实际牛头数失去焦点计算
-    // ccount实际牛头数
+    // 实际牛羊只数失去焦点计算
+    // ccount实际牛羊只数
     // ratio系数
-    // ccountratio系数牛头数
-    blurCcount(row) { // 实际牛头数
+    // ccountratio系数牛羊只数
+    blurCcount(row) { // 实际牛羊只数
       if (row.ftid !== '-1' && row.ftid !== '') {
         row.Sfweight = this.recipeTemplateList.find(obj => obj.id == row.ftid).Sfweight
         row.SfweightLock = this.recipeTemplateList.find(obj => obj.id == row.ftid).SfweightLock
@@ -1717,9 +1717,9 @@ export default {
       if (row.w6 == '' || row.w6 == undefined || isNaN(row.w6)) { row.w6 = 0 }
 
       // 系数不变
-      // 系数头数=实际牛头数*系数
+      // 系数羊只数=实际牛羊只数*系数
       row.ccountratio = row.ccount * row.ratio / 100
-      // 配方重量=实际牛头数*系数*配方模板取Sfweight
+      // 配方重量=实际牛羊只数*系数*配方模板取Sfweight
       row.ftweight = (row.ccount * row.ratio / 100 * row.Sfweight).toFixed(this.decimal)
       this.public(row)
       this.placeholder(row)
@@ -1735,10 +1735,10 @@ export default {
       if (row.w4 == '' || row.w4 == undefined || isNaN(row.w4)) { row.w4 = 0 }
       if (row.w5 == '' || row.w5 == undefined || isNaN(row.w5)) { row.w5 = 0 }
       if (row.w6 == '' || row.w6 == undefined || isNaN(row.w6)) { row.w6 = 0 }
-      // 配方重量=实际牛头数*系数*配方模板取Sfweight
+      // 配方重量=实际牛羊只数*系数*配方模板取Sfweight
       row.ftweight = (row.ccount * row.ratio / 100 * row.Sfweight).toFixed(this.decimal)
-      // 实际牛头数不变
-      // 系数头数=实际牛头数*系数
+      // 实际牛羊只数不变
+      // 系数羊只数=实际牛羊只数*系数
       row.ccountratio = (parseFloat(row.ccount)*(parseFloat(row.ratio) / 100)).toFixed(this.decimal)
       this.public(row)
       this.placeholder(row)
@@ -1754,10 +1754,10 @@ export default {
       if (row.w4 == '' || row.w4 == undefined || isNaN(row.w4)) { row.w4 = 0 }
       if (row.w5 == '' || row.w5 == undefined || isNaN(row.w5)) { row.w5 = 0 }
       if (row.w6 == '' || row.w6 == undefined || isNaN(row.w6)) { row.w6 = 0 }
-      // 实际牛头数不变
-      // 系数=系数头数/实际牛头数*100
+      // 实际牛羊只数不变
+      // 系数=系数羊只数/实际牛羊只数*100
       row.ratio = (parseFloat(row.ccountratio) / parseFloat(row.ccount) * 100).toFixed(this.decimal)
-      // 配方重量=实际牛头数*系数*配方模板取Sfweight
+      // 配方重量=实际牛羊只数*系数*配方模板取Sfweight
       row.ftweight = (row.ccount * row.ratio / 100 * row.Sfweight).toFixed(this.decimal)
       this.public(row)
       this.placeholder(row)
@@ -1899,7 +1899,7 @@ export default {
       if (row.ftid !== '-1' && row.ftid !== '') {
         row.Sfweight = this.recipeTemplateList.find(obj => obj.id == row.ftid).Sfweight
       }
-      // 配方重量=实际牛头数*系数*配方模板取Sfweight
+      // 配方重量=实际牛羊只数*系数*配方模板取Sfweight
       row.ftweight = (parseFloat(row.ccount) * parseFloat(row.ratio) / 100 * parseFloat(row.Sfweight)).toFixed(this.decimal)
         console.log(parseFloat(row.ccount),'======ccount')
         console.log(parseFloat(row.ftweight),'======ftweight')
@@ -2009,7 +2009,7 @@ export default {
       this.$set(row, 'placeholder_ccountratio', this.oldRowList.ccountratio)
     },
     blurWeight(row,item) {
-      // 配方重量=实际牛头数*系数*配方模板取Sfweight
+      // 配方重量=实际牛羊只数*系数*配方模板取Sfweight
       if (row.ftid !== '-1' && row.ftid !== '') {
         row.Sfweight = this.recipeTemplateList.find(obj => obj.id == row.ftid).Sfweight
       }
@@ -2321,20 +2321,20 @@ export default {
         obj.data.push({'old':this.oldRowList.bw6,'new':row.bw6,times:6,'ptid':row.ftid,'ptsid':row.ptsfid})
       }
       if (this.table.temp.ccount == '' && this.table.temp.ratio == '' && this.table.temp.ccountratio == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '实际头数/系数/系数头数/配方模版不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: '实际羊只数/系数/系数羊只数/配方模版不能为空', duration: 2000 })
         return false
       }
       if (this.table.temp.ratio == '' && this.table.temp.ccountratio == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '系数/系数头数/配方模版不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: '系数/系数羊只数/配方模版不能为空', duration: 2000 })
         return false
       }
       if (this.table.temp.ccountratio == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '系数头数/配方模版不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: '系数羊只数/配方模版不能为空', duration: 2000 })
         return false
       }
-      console.log(this.table.temp.ccount, '实际头数不能为空')
+      console.log(this.table.temp.ccount, '实际羊只数不能为空')
       if (this.table.temp.ccount === '') {
-        this.$message({ type: 'error', message: '实际头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: '实际羊只数不能为空', duration: 2000 })
         return false
       }
       if (this.table.temp.ratio === '') {
@@ -2342,7 +2342,7 @@ export default {
         return false
       }
       if (this.table.temp.ccountratio === '') {
-        this.$message({ type: 'error', message: '系数头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: '系数羊只数不能为空', duration: 2000 })
         return false
       }
       if (this.table.temp.ftid == '') {
@@ -2353,7 +2353,7 @@ export default {
       if (!positiveInteger.test(parseFloat(this.table.temp.ccount))) {
         this.$message({
           type: 'error',
-          message: '实际头数请输入正整数',
+          message: '实际羊只数请输入正整数',
           duration: 2000
         })
         return false
@@ -2711,11 +2711,11 @@ export default {
             this.$message({ type: 'error', message: '开始日期结束日期不能为空', duration: 2000 })
             return false
           } else {
-            // 牛头数
+            // 牛羊只数
             const positiveInteger = /^[1-9]\d*$/
             if (this.nutritional.tab1.temp.cowsum !== '') {
               if (!positiveInteger.test(parseFloat(this.nutritional.tab1.temp.cowsum))) {
-                this.$message({ type: 'error', message: '头数请输入正整数', duration: 2000 })
+                this.$message({ type: 'error', message: '羊只数请输入正整数', duration: 2000 })
                 return false
               }
             }
@@ -3185,15 +3185,15 @@ export default {
           var downloadList = [
             { 'obj1': '1、文件类型为xlsx类型，对应表格文件名格式为：文件名称.xlsx；' },
             { 'obj1': '2、底部工作表名称不可更改，默认为：Sheet1；' },
-            { 'obj1': '3、栏舍名称,实际头数,系数（%）,系数头数,配方模板,补料配方字体为必填；' },
+            { 'obj1': '3、栏舍名称,实际羊只数,系数（%）,系数羊只数,配方模板,补料配方字体为必填；' },
             { 'obj1': '4、第一列栏舍名称默认为系统中栏舍，不可修改；' },
-            { 'obj1': '5、实际头数为正整数，系数为正数，至多保留俩位小数；' },
+            { 'obj1': '5、实际羊只数为正整数，系数为正数，至多保留俩位小数；' },
             { 'obj1': '6、配方模板名称必须与系统中配方计划—配方模板中的饲喂配方匹配；若补料配方开启，需与配方模板中的补料配方匹配；' },
             { 'obj1': '7、数据最多可导入200条，超过200条请分多个文件导入。' }
           ]
           var excelDatas = [
             {
-              tHeader: ['栏舍名称', '实际头数', '系数（%）', '配方模板', '补料配方', '第一班比例（%）', '第二班比例（%）', '第三班比例（%）', '第四班比例（%）','第五班比例（%）','第六班比例（%）'],
+              tHeader: ['栏舍名称', '实际羊只数', '系数（%）', '配方模板', '补料配方', '第一班比例（%）', '第二班比例（%）', '第三班比例（%）', '第四班比例（%）','第五班比例（%）','第六班比例（%）'],
               filterVal: ['barname', '', '', '', '', '', '', '', ''],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'
@@ -3262,7 +3262,7 @@ export default {
           if (this.table.isRW1 == true && this.table.isRW2 == false && this.table.isRW3 == false && this.table.isRW4 == false && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件头数', '实际头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: ['栏舍名称', '软件羊只数', '实际羊只数', '系数(%)', '系数羊只数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3271,7 +3271,7 @@ export default {
           } else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == false && this.table.isRW4 == false && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件头数', '实际头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: ['栏舍名称', '软件羊只数', '实际羊只数', '系数(%)', '系数羊只数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3280,7 +3280,7 @@ export default {
           } else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == false && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件头数', '实际头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: ['栏舍名称', '软件羊只数', '实际羊只数', '系数(%)', '系数羊只数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3289,7 +3289,7 @@ export default {
           } else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == true && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件头数', '实际头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: ['栏舍名称', '软件羊只数', '实际羊只数', '系数(%)', '系数羊只数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'r4', 'w4', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3298,7 +3298,7 @@ export default {
           }else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == true && this.table.isRW5 == true && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件头数', '实际头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: ['栏舍名称', '软件羊只数', '实际羊只数', '系数(%)', '系数羊只数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'r4', 'w4','r5', 'w5', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3307,7 +3307,7 @@ export default {
           }else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == true && this.table.isRW5 == true && this.table.isRW6 == true) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件头数', '实际头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量','第六班比例(%)', '第六班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: ['栏舍名称', '软件羊只数', '实际羊只数', '系数(%)', '系数羊只数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量','第六班比例(%)', '第六班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'r4', 'w4','r5', 'w5','r6', 'w6', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3335,10 +3335,10 @@ export default {
            import('@/vendor/Export2Excel').then(excel => {
              const list1 = res.data.result
              const tHeader = [
-               '栏舍名称', '实际头数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', '错误信息'
+               '栏舍名称', '实际羊只数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', '错误信息'
              ]
              const filterVal = [
-               '栏舍名称', '实际头数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', 'error_msg'
+               '栏舍名称', '实际羊只数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', 'error_msg'
              ]
              const data1 = this.formatJson(filterVal, list1)
              excel.export_json_to_excel({ header: tHeader, data: data1, filename: '栏舍配方导入报错信息', autoWidth: true, bookType: 'xlsx' })
@@ -3367,7 +3367,7 @@ export default {
       this.$refs.mychild.restTemp()
     },
     handleSynchronous(){
-      MessageBox.confirm('是否进行软件头数同步?', {
+      MessageBox.confirm('是否进行软件羊只数同步?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
         const url = 'authdata/ud/feedp/sync'
@@ -3378,7 +3378,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消软件头数同步' })
+        this.$message({ type: 'info', message: '已取消软件羊只数同步' })
       })
     },
     handle_batchEdit(){

src/views/login/index.vue

@@ -411,7 +411,8 @@ $bg: #ccc;
 $light_gray: #ccc;
 $cursor: #000;
 .login-container{
-  position: relative;height: 100%;width: 100%;background:  url("../../assets/images/nlogin-bg1.jpg") no-repeat;background-size: cover;
+  position: relative;height: 100%;width: 100%;
+  background:  url("../../assets/images/sheeps3.jpeg") no-repeat;background-size: cover;
     .new-login{
       width: 50%;height: 42%;position: absolute;left: 0;right: 0;bottom: 0;top: 0;margin: auto;
       .new-login-l{

src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -355,7 +355,7 @@
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
-                <h4>牛群准确率</h4>
+                <h4>羊群准确率</h4>
                 <div v-if="tab.chart3.isChart" class="button">
                   <div class="chartButton">
                     <my-select ref="tenantselect" :model="tab.chart3.getdataListParm.parammaps.statisticsList" :option="tab.chart3.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart3" />
@@ -1067,7 +1067,7 @@
                   <u-table-column label="修改时间" width="100px" align="center" prop="createdate" />
                   <u-table-column label="修改用户" width="130px" align="center" prop="empname" />
                   <u-table-column label="班次" min-width="100px" align="center" prop="times" />
-                  <u-table-column label="实际牛头数" min-width="100px" align="center" prop="ccount">
+                  <u-table-column label="实际羊只数" min-width="100px" align="center" prop="ccount">
                     <template slot-scope="{row}">
                       <span v-if="row.ccountstatus == 1" style="color: red;">{{row.ccount}}</span>
                       <span v-else >{{row.ccount}}</span>
@@ -1079,7 +1079,7 @@
                       <span v-else >{{row.ratio}}</span>
                     </template>
                   </u-table-column>
-                  <u-table-column label="系数头数" min-width="100px" align="center" prop="ccountratio">
+                  <u-table-column label="系数羊只数" min-width="100px" align="center" prop="ccountratio">
                     <template slot-scope="{row}">
                       <span v-if="row.ccountratiostatus == 1" style="color: red;">{{row.ccountratio}}</span>
                       <span v-else >{{row.ccountratio}}</span>
@@ -1534,7 +1534,7 @@ export default {
             listLoading: false
           }
         },
-        // 牛群准确率
+        // 羊群准确率
         chart3: {
           chartLine: null,
           chartLine_data: {},
@@ -2337,8 +2337,8 @@ export default {
           startDate = parseTime(this.tab.chart3.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
           endDate = parseTime(this.tab.chart3.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
           this.tab.chart3.getdataListParm.parammaps.status = 0
-          console.log('牛群准确率开始日期==>', startDate)
-          console.log('牛群准确率结束日期==>', endDate)
+          console.log('羊群准确率开始日期==>', startDate)
+          console.log('羊群准确率结束日期==>', endDate)
         } else if (this.tab.chart3.getdataListParm.parammaps.specificDate == '2') {
           if (this.tab.chart3.getdataListParm.parammaps.selectYear == '') {
             this.$message({ type: 'error', message: '请输入年', duration: 2000 })
@@ -2353,14 +2353,14 @@ export default {
           startDate = this.tab.chart3.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart3.getdataListParm.parammaps.selectYear)[this.tab.chart3.getdataListParm.parammaps.selectWeek[0]].month + '-' + whichWeek(this.tab.chart3.getdataListParm.parammaps.selectYear)[this.tab.chart3.getdataListParm.parammaps.selectWeek[0]].date
           endDate = this.tab.chart3.getdataListParm.parammaps.selectYear + '-' + whichWeek(this.tab.chart3.getdataListParm.parammaps.selectYear)[this.tab.chart3.getdataListParm.parammaps.selectWeek[1]].last.month + '-' + whichWeek(this.tab.chart3.getdataListParm.parammaps.selectYear)[this.tab.chart3.getdataListParm.parammaps.selectWeek[1]].last.date
           this.tab.chart3.getdataListParm.parammaps.status = 1
-          console.log('牛群准确率开始周日期==>', startDate)
-          console.log('牛群准确率结束周日期==>', endDate)
+          console.log('羊群准确率开始周日期==>', startDate)
+          console.log('羊群准确率结束周日期==>', endDate)
         } else if (this.tab.chart3.getdataListParm.parammaps.specificDate == '3') {
           startDate = this.tab.chart3.getdataListParm.parammaps.chartMonth[0]
           endDate = this.tab.chart3.getdataListParm.parammaps.chartMonth[1].substring(0, 8) + '31'
           this.tab.chart3.getdataListParm.parammaps.status = 2
-          console.log('牛群准确率开始月日期==>', startDate)
-          console.log('牛群准确率结束月日期==>', endDate)
+          console.log('羊群准确率开始月日期==>', startDate)
+          console.log('羊群准确率结束月日期==>', endDate)
         }
         this.tab.chart3.getdataListParm.parammaps.startTime = startDate
         this.tab.chart3.getdataListParm.parammaps.stopTime = endDate
@@ -3676,7 +3676,7 @@ export default {
       }
     },
 
-    // 牛群准确率
+    // 羊群准确率
     changeStatisticChart3(arr) {
       var arr1 = []
       for (let i = 0; i < arr.length; i++) {
@@ -3698,7 +3698,7 @@ export default {
       this.tab.chart3.chartLine_data.data1 = this.tab.chart3.getdataListParm.parammaps.statisticsList
       this.roadChartLine3(this.tab.chart3.chartLine_data)
     },
-    // 牛群准确率
+    // 羊群准确率
     getChart3() {
       this.tab.chart3.listLoading = true
       const url = 'authdata/chart/accuracyAllNQ'
@@ -3744,8 +3744,8 @@ export default {
           }
           this.tab.chart3.chart3Data3 = response.data.list.data3
           this.tab.chart3.total = response.data.total
-          console.log('牛群准确率图数据', this.tab.chart3.chartLine_data)
-          console.log('牛群准确率表数据', this.tab.chart3.table.list)
+          console.log('羊群准确率图数据', this.tab.chart3.chartLine_data)
+          console.log('羊群准确率表数据', this.tab.chart3.table.list)
           var arrData3 = []
           for (let i = 0; i < this.tab.chart3.getdataListParm.parammaps.statisticsList.length; i++) {
             const myId = this.tab.chart3.statisticsList.find(obj => obj.name == this.tab.chart3.getdataListParm.parammaps.statisticsList[i]).id
@@ -4446,16 +4446,16 @@ export default {
         ]
         json2excel(excelDatasTabChart2, '计划统计', true, 'xlsx')
       } else if (item == 'chart3') {
-        console.log('牛群准确率导出')
+        console.log('羊群准确率导出')
         var excelDatasTabChart3 = [
           {
             tHeader: ['日期', '牲畜类别', '计划重量（kg）', '实际重量（kg）', '准确率'],
             filterVal: ['日期', '名称', '理论量', '实际量', '准确率'],
             tableDatas: this.tab.chart3.table.list,
-            sheetName: '牛群准确率'
+            sheetName: '羊群准确率'
           }
         ]
-        json2excel(excelDatasTabChart3, '牛群准确率', true, 'xlsx')
+        json2excel(excelDatasTabChart3, '羊群准确率', true, 'xlsx')
       } else if (item == 'chart4') {
         console.log('车辆准确率（重量）导出')
         var excelDatasTabChart4 = [
@@ -4514,7 +4514,7 @@ export default {
         this.tab.chart2.isTable = true
         this.tab.chart2.isChart = false
       } else if (item == 'chart3') {
-        console.log('牛群准确率表格')
+        console.log('羊群准确率表格')
         this.tab.chart3.isTable = true
         this.tab.chart3.isChart = false
       } else if (item == 'chart4') {
@@ -4549,7 +4549,7 @@ export default {
         this.tab.chart2.isChart = true
         this.getChart2()
       } else if (item == 'chart3') {
-        console.log('牛群准确率图表')
+        console.log('羊群准确率图表')
         this.tab.chart3.isTable = false
         this.tab.chart3.isChart = true
         this.getChart3()

src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -42,14 +42,14 @@
             <el-table-column v-if="tab.isHouseName" sortable label="栏舍" min-width="70px" align="center" prop="栏舍" />
             <el-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
             <el-table-column v-if="tab.isLivestockType" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
-            <el-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="实际牛头数" />
+            <el-table-column sortable label="实际羊只数" min-width="60px" align="center" prop="实际羊只数" />
             <el-table-column sortable label="应混料量（kg）" min-width="60px" align="center" prop="应混料量" />
             <el-table-column sortable label="实际混料量（kg）" min-width="70px" align="center" prop="实际混料量" />
             <el-table-column sortable label="撒料量（kg）" min-width="60px" align="center" prop="撒料量" />
             <el-table-column sortable label="平均混料时间" min-width="70px" align="center" prop="混料时间" />
-            <el-table-column sortable label="转投剩料量（kg）" min-width="70px" align="center" prop="转投剩料量" />
+            <!-- <el-table-column sortable label="转投剩料量（kg）" min-width="70px" align="center" prop="转投剩料量" />
             <el-table-column sortable label="昨日剩料量（kg）" min-width="70px" align="center" prop="今日剩料量" />
-            <el-table-column sortable label="剩料率（%）" min-width="60px" align="center" prop="剩料率" />
+            <el-table-column sortable label="剩料率（%）" min-width="60px" align="center" prop="剩料率" /> -->
             <el-table-column sortable label="TMR干物质（%）" min-width="65px" align="center" prop="TMR干物质" />
             <el-table-column sortable label="配方干物质采食量（kg/头）" min-width="80px" align="center" prop="配方干物质采食量" />
             <el-table-column sortable label="实际干物质采食量（kg/头）" min-width="80px" align="center" prop="实际干物质采食量" />
@@ -57,9 +57,9 @@
             <el-table-column sortable label="配方理论成本" min-width="60px" align="center" prop="feedtempletPrice" />
             <el-table-column sortable label="配方成本(元/头)" min-width="65px" align="center" prop="配方成本" />
             <el-table-column sortable label="实际成本(元/头)" min-width="65px" align="center" prop="实际成本" />
-            <el-table-column sortable label="产奶量（kg/头）" min-width="65px" align="center" prop="产奶量" />
+            <!-- <el-table-column sortable label="产奶量（kg/头）" min-width="65px" align="center" prop="产奶量" />
             <el-table-column sortable label="饲料转化率(%)" min-width="60px" align="center" prop="饲料转化率" />
-            <el-table-column sortable label="公斤奶饲料成本" min-width="60px" align="center" prop="公斤奶饲料成本" />
+            <el-table-column sortable label="公斤奶饲料成本" min-width="60px" align="center" prop="公斤奶饲料成本" /> -->
           </el-table>
           <span v-if="tab.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab.table.total }}条</span>
         </div>
@@ -90,7 +90,7 @@
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
           </el-row>
-          <el-row :gutter="10" class="dashboard-editor-container">
+          <!-- <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
                 <h4 style="text-align:center;">干物质采食量</h4>
@@ -102,10 +102,10 @@
                     </el-select>
                     <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;margin-right: 10px;" @change="changeChartSpecificDate('chart1')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
+                      <el-radio-button label="2" border>周</el-radio-button>
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
-                    <!-- <br/> -->
+                    <br/>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-top: 5px;">
                       <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
                     </div>
@@ -162,7 +162,7 @@
                     <my-select ref="tenantselect" :model="tab.chart2.getdataListParm.parammaps.statisticsList" :option="tab.chart2.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart2" />
                     <el-radio-group v-model="tab.chart2.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart2')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
+                      <el-radio-button label="2" border>周</el-radio-button>
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -215,7 +215,7 @@
                 </div>
               </div>
             </el-col>
-          </el-row>
+          </el-row> -->
           <el-row :gutter="10" class="dashboard-editor-container">
             <el-col :span="12">
               <div class="grid-content">
@@ -336,7 +336,7 @@
               </div>
             </el-col>
           </el-row>
-          <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
+          <!-- <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
             <el-col :span="24">
               <div class="grid-content">
                 <h4 style="text-align:center;">成本分析</h4>
@@ -345,7 +345,7 @@
                     <my-select ref="tenantselect" :model="tab.chart5.getdataListParm.parammaps.statisticsList" :option="tab.chart5.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart5" />
                     <el-radio-group v-model="tab.chart5.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart5')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
+                      <el-radio-button label="2" border>周</el-radio-button>
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -396,15 +396,15 @@
                 </div>
               </div>
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
       </el-tab-pane>
-      <el-tab-pane label="牛群评估" name="second">
+      <!-- <el-tab-pane label="牛群评估" name="second">
         <div class="search">
           <el-date-picker v-model="tab2.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeTab2Date" />
           <el-button class="export" style="float: right;" icon="el-icon-upload2" @click="handleDownload2">导出</el-button>
-          <!-- <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
-          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" /> -->
+          <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
+          <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
         </div>
         <div class="table">
           <el-row :gutter="10">
@@ -495,7 +495,6 @@
                 <el-table-column sortable label="4+分（数量、百分比）" min-width="100px" align="center" prop="score4" />
               </el-table>
             </el-col>
-            <!-- 粪便评分 -->
             <el-col :span="12">
               <h4 style="text-align:center;">粪便评分</h4>
               <el-table
@@ -527,9 +526,8 @@
             </el-col>
           </el-row>
         </div>
-      </el-tab-pane>
+      </el-tab-pane> -->
     </el-tabs>
-    <!-- 导出 -->
     <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="20%">
     <div>
       <span>导出时间范围：</span>
@@ -1509,8 +1507,8 @@ export default {
         if (this.tab.radio == '1') {
           var excelDatas = [
             {
-              tHeader: ['配方模板', '实际牛头数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）', '转投剩料量（kg）', '今日剩料量（kg）', '剩料率（%）', 'TMR干物质（%）', '配方干物质采食量（kg/头）', '实际干物质采食量（kg/头）', '采食率（%）','配方理论成本', '配方成本(元/头 )', '实际成本(元/ 头)', '产奶量（kg /头）', '饲料转化率', '公斤奶饲料成本'],
-              filterVal: ['配方模板', '实际牛头数', '应混料量', '实际混料量', '撒料量', '混料时间', '转投剩料量', '今日剩料量', '剩料率', 'TMR干物质', '配方干物质采食量', '实际干物质采食量', '采食率','feedtempletPrice', '配方成本', '实际成本', '产奶量', '饲料转化率', '公斤奶饲料成本'],
+              tHeader: ['配方模板', '实际羊只数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）',  'TMR干物质（%）', '配方干物质采食量（kg/头）', '实际干物质采食量（kg/头）', '采食率（%）','配方理论成本', '配方成本(元/头 )', '实际成本(元/ 头)'],
+              filterVal: ['配方模板', '实际羊只数', '应混料量', '实际混料量', '撒料量', '混料时间',  'TMR干物质', '配方干物质采食量', '实际干物质采食量', '采食率','feedtempletPrice', '配方成本', '实际成本'],
               tableDatas: this.tab.table.list,
               sheetName: '配方'
             }
@@ -1519,8 +1517,8 @@ export default {
         } else if (this.tab.radio == '2') {
           var excelDatas2 = [
             {
-              tHeader: ['栏舍', '配方模板', '实际牛头数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）', '转投剩料量（kg）', '今日剩料量（kg）', '剩料率（%）', 'TMR干物质（%）', '配方干物质采食量（kg/头）', ' 实际干物质采食量（ kg/头）', '采食率 （%）','配方理论成本', '配方成本( 元/头)', '实际成本 (元/头)', '产奶量（kg/头）', '饲料转化率', '公斤奶饲料成本'],
-              filterVal: ['栏舍', '配方模板', '实际牛头数', '应混料量', '实际混料量', '撒料量', '混料时间', '转投剩料量', '今日剩料量', '剩料率', 'TMR干物质', '配方干物质采食量', '实际干物质采食量', '采食率','feedtempletPrice', '配方成本', '实际成本', '产奶量', '饲料转化率', '公斤奶饲料成本'],
+              tHeader: ['栏舍', '配方模板', '实际羊只数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）',  'TMR干物质（%）', '配方干物质采食量（kg/头）', ' 实际干物质采食量（ kg/头）', '采食率 （%）','配方理论成本', '配方成本( 元/头)', '实际成本 (元/头)'],
+              filterVal: ['栏舍', '配方模板', '实际羊只数', '应混料量', '实际混料量', '撒料量', '混料时间', 'TMR干物质', '配方干物质采食量', '实际干物质采食量', '采食率','feedtempletPrice', '配方成本', '实际成本'],
               tableDatas: this.tab.table.list,
               sheetName: '栏舍'
             }
@@ -1529,8 +1527,8 @@ export default {
         } else if (this.tab.radio == '3') {
           var excelDatas3 = [
             {
-              tHeader: ['牲畜类别', '实际牛头数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）', '转投剩料量（kg）', '今日剩料量（kg）', '剩料率（%）', 'TMR干物质（%）', '配方 物质采食量（kg/ 头）', '实际干物质采 食量（kg/头）', ' 采食率（%）','配方理论成本', '配方 成本(元/头)', '实际成本(元/头)', '产奶量（kg/头）', '饲料转化率', '公斤奶饲料成本'],
-              filterVal: ['牲畜类别', '实际牛头数', '应混料量', '实际混料量', '撒料量', '混料时间', '转投剩料量', '今日剩料量', '剩料率', 'TMR干物质', '配方干物质采食量', '实际干物质采食量', ' 采食率','feedtempletPrice', '配方成本', '实际成本', '产奶量', '饲料转化率', '公斤奶饲料成本'],
+              tHeader: ['牲畜类别', '实际羊只数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）','TMR干物质（%）', '配方 物质采食量（kg/ 头）', '实际干物质采 食量（kg/头）', ' 采食率（%）','配方理论成本', '配方 成本(元/头)', '实际成本(元/头)',],
+              filterVal: ['牲畜类别', '实际羊只数', '应混料量', '实际混料量', '撒料量', '混料时间',  'TMR干物质', '配方干物质采食量', '实际干物质采食量', ' 采食率','feedtempletPrice', '配方成本', '实际成本'],
               tableDatas: this.tab.table.list,
               sheetName: '牲畜类别'
             }
@@ -1539,8 +1537,8 @@ export default {
         }else if (this.tab.radio == '4') {
           var excelDatas3 = [
             {
-              tHeader: ['班次', '实际牛头数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）', '转投剩料量（kg）', '今日剩料量（kg）', '剩料率（%）', 'TMR干物质（%）', '配方 物质采食量（kg/ 头）', '实际干物质采 食量（kg/头）', ' 采食率（%）','配方理论成本', '配方 成本(元/头)', '实际成本(元/头)', '产奶量（kg/头）', '饲料转化率', '公斤奶饲料成本'],
-              filterVal: ['班次', '实际牛头数', '应混料量', '实际混料量', '撒料量', '混料时间', '转投剩料量', '今日剩料量', '剩料率', 'TMR干物质', '配方干物质采食量', '实际干物质采食量', ' 采食率', 'feedtempletPrice','配方成本', '实际成本', '产奶量', '饲料转化率', '公斤奶饲料成本'],
+              tHeader: ['班次', '实际羊只数', '应混料量（kg）', '实际混料量（kg）', '撒料量（kg）', '平均混料时间（min）','TMR干物质（%）', '配方 物质采食量（kg/ 头）', '实际干物质采 食量（kg/头）', ' 采食率（%）','配方理论成本', '配方 成本(元/头)', '实际成本(元/头)'],
+              filterVal: ['班次', '实际羊只数', '应混料量', '实际混料量', '撒料量', '混料时间',  'TMR干物质', '配方干物质采食量', '实际干物质采食量', ' 采食率', 'feedtempletPrice','配方成本', '实际成本'],
               tableDatas: this.tab.table.list,
               sheetName: '班次'
             }

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -35,7 +35,7 @@
             <a @click="clickFormulaTemplateIndex(row)">{{ row.tname }}</a>
           </template>
         </el-table-column>
-        <el-table-column sortable label="牛头数" prop="ccount" min-width="58px" align="center" />
+        <el-table-column sortable label="羊只数" prop="ccount" min-width="58px" align="center" />
         <el-table-column label="干物质(kg)" align="center">
           <el-table-column sortable prop="dry" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
@@ -49,7 +49,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="产奶净能(MJ)" align="center">
+        <!-- <el-table-column label="产奶净能(MJ)" align="center">
           <el-table-column sortable prop="nm" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
             <template slot-scope="scope">
@@ -74,7 +74,7 @@
               <span>{{ (scope.row.Srate * scope.row.nuint) | keepTreeNum }}</span>
             </template>
           </el-table-column>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="粗蛋白(g)" align="center">
           <el-table-column prop="cp" label="配方量" min-width="58" align="center" />
           <el-table-column label="TMR料" min-width="65" align="center">
@@ -101,7 +101,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column label="产奶净能(MCal/DM)" align="center">
+        <!-- <el-table-column label="产奶净能(MCal/DM)" align="center">
           <el-table-column sortable prop="nmd" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
             <template slot-scope="scope">
@@ -113,7 +113,7 @@
               <span>{{ (scope.row.Srate * scope.row.nmd) | keepTreeNum }}</span>
             </template>
           </el-table-column>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="粗蛋白(%DM)" align="center">
           <el-table-column sortable prop="cpd" label="配方量" min-width="58" align="center" />
           <el-table-column sortable label="TMR料" min-width="65" align="center">
@@ -275,14 +275,14 @@
                 <a @click="clickFormulaHurdlesIndex(row)">{{ row.barname }}</a>
               </template>
             </el-table-column>
-            <el-table-column label="牛头数" min-width="100px" align="center" prop="ccount" />
+            <el-table-column label="羊只数" min-width="100px" align="center" prop="ccount" />
             <el-table-column label="干物质(kg)" min-width="130px" align="center">
               <el-table-column prop="dry-nur" label="奶牛需要" min-width="70" align="center" />
               <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="产奶净能(M)" min-width="130px" align="center">
+            <!-- <el-table-column label="产奶净能(M)" min-width="130px" align="center">
               <el-table-column prop="nm-nur" label="奶牛需要" min-width="70" align="center" />
               <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
@@ -293,7 +293,7 @@
               <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
               <el-table-column prop="cp-nur" label="奶牛需要" min-width="70" align="center" />
               <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
@@ -306,12 +306,12 @@
               <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
+            <!-- <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
               <el-table-column prop="nmd-nur" label="奶牛需要" min-width="70" align="center" />
               <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
               <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
               <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
               <el-table-column prop="cpd-nur" label="奶牛需要" min-width="70" align="center" />
               <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
@@ -479,7 +479,7 @@
             <el-table-column label="饲料名称" min-width="100px" align="center" prop="fname" />
             <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
             <el-table-column label="搅拌延时(min)" min-width="100px" align="center" prop="autosecond" />
-            <el-table-column label="是否锁定牛头数比例" min-width="100" align="center">
+            <el-table-column label="是否锁定羊只数比例" min-width="100" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.islockcount == '0'">否</span>
                 <span v-if="scope.row.islockcount == '1'">是</span>