Ver Fonte

更细过程分析、饲喂效率优化

Epans há 3 anos atrás
pai
commit
e6cb97b82e

+ 35 - 690
src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -3,7 +3,7 @@
     <div class="operation">
    
 
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">设置推料时间</el-button>
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate1">设置推料时间</el-button>
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">设置允许误差时间</el-button>
 
       
@@ -75,518 +75,12 @@
       </el-table>
       <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
     </div>
-    <!-- 历史记录 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="history.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[history.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
-      <div class="app-history">
-        <div class="search">
-          <el-date-picker v-model="history.getdataListParm.parammaps.date" type="date" placeholder="请选择历史记录时间" :clearable="false" style="width: 180px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeDate" />
-          <!-- <el-select v-model="history.getdataListParm.parammaps.barid" clearable filterable placeholder="请选择栏舍" style="width: 180px;" class="filter-item">
-            <el-option v-for="item in barList" :key="item.id" :label="item.bname" :value="item.id" />
-          </el-select>
-          <el-input v-model="history.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" />
-          <el-button class="successBorder" @click="handleHistorySearch">查询</el-button> -->
-          <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
-        </div>
-        <div class="table">
-          <el-table
-            :key="history.tableKey"
-            v-loading="history.listLoading"
-            element-loading-text="给我一点时间"
-            :data="history.list"
-            border
-            fit
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
-            :span-method="objectSpanMethod"
-          >
-            <el-table-column :key="1" label="序号" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left">
-              <template slot-scope="scope">
-                <span>{{ scope.$index + (history.pageNum-1) * history.pageSize + 1 }}</span>
-              </template>
-            </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="实际牛头数" prop="ccount" min-width="70px" align="center" />
-            <el-table-column :key="6" label="系数(%)" prop="ratio" min-width="70px" align="center" />
-            <el-table-column :key="7" label="系数头数" prop="ccountratio" min-width="70px" align="center" />
-            <el-table-column :key="8" label="配方模板" prop="ptname" min-width="70px" align="center" />
-            <el-table-column v-if="table.isPtsfname" :key="9" label="补料配方" prop="ptsname" min-width="70px" align="center" />
-            <el-table-column :key="10" label="班次比例" prop="tratio" min-width="70px" align="center" />
-            <el-table-column :key="11" label="班次重量" prop="weight" min-width="70px" align="center" />
-            <el-table-column :key="12" label="配方重量" prop="pweight" min-width="70px" align="center" />
-            <el-table-column v-if="table.isPtsfname" :key="13" label="补料重量" prop="ptweight" min-width="70px" align="center" />
-            <el-table-column :key="14" label="配方干物质量" prop="dryweight" min-width="70px" align="center" />
-            <el-table-column :key="15" label="饲喂干物质量" prop="swdryw" min-width="70px" align="center" />
-            <el-table-column :key="16" label="采样干物质量" prop="cydryw" min-width="70px" align="center" />
-            <el-table-column :key="17" label="日投喂量" prop="sumweight" min-width="70px" align="center" />
-          </el-table>
-          <pagination2 v-show="history.total>0" :total="history.total" :page.sync="history.getdataListParm.offset" :limit.sync="history.getdataListParm.pagecount" @pagination="getHistoryList" />
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">关闭</el-button>
-      </div>
-    </el-dialog>
+    
 
-    <!-- 营养评估 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="nutritional.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[nutritional.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
-      <div class="app-nutritional">
-        <h4 style="position: absolute;top:-5px;left:140px;font:16px/30px '' ;color:#303133;">栏舍:{{ nutritional.tab1.temp.barname }}</h4>
-        <el-tabs v-model="nutritional.activeName" @tab-click="handleNutritionalTab">
-          <el-tab-pane label="营养评估" name="first">
-            <el-form ref="temp" :rules="rules" :model="nutritional.tab1.temp" label-position="right" label-width="95px" style="width: 100%;margin-bottom:30px">
-              <el-row>
-                <el-col :span="4">
-                  <el-form-item label="类别" prop="cowclassid">
-                    <el-select v-model="nutritional.tab1.temp.cowclassid" :disabled="nutritional.tab1.disabledCowclass" filterable placeholder="" class="filter-item" style="width:100%;">
-                      <el-option v-for="item in livestockTypeList" :key="item.id" :label="item.mixname" :value="item.id" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="月龄" prop="avgmonthage">
-                    <el-input ref="avgmonthage" v-model="nutritional.tab1.temp.avgmonthage" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="体重(kg)" prop="bw">
-                    <el-input ref="bw" v-model="nutritional.tab1.temp.bw" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="日增重(kg)" prop="dayw">
-                    <el-input ref="dayw" v-model="nutritional.tab1.temp.dayw" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="胎次(次)" prop="fetal">
-                    <el-input ref="fetal" v-model="nutritional.tab1.temp.fetal" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="泌乳天数(天)" prop="avgdim">
-                    <el-input ref="avgdim" v-model="nutritional.tab1.temp.avgdim" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="4">
-                  <el-form-item label="怀孕天数(天)" prop="dayspre">
-                    <el-input ref="dayspre" v-model="nutritional.tab1.temp.dayspre" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="产奶量(kg)" prop="product">
-                    <el-input ref="product" v-model="nutritional.tab1.temp.product" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="乳脂率(%)" prop="fat">
-                    <el-input ref="fat" v-model="nutritional.tab1.temp.fat" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="乳蛋白率(%)" prop="pro">
-                    <el-input ref="pro" v-model="nutritional.tab1.temp.pro" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="乳糖率(%)" prop="lactose">
-                    <el-input ref="lactose" v-model="nutritional.tab1.temp.lactose" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="4">
-                  <el-form-item label="温度(℃)" prop="tem">
-                    <el-input ref="tem" v-model="nutritional.tab1.temp.tem" class="filter-item" placeholder="" style="width:100%;" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-            <div style="height: 50px;">
-              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" />
-              <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
-              <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-              <el-button class="successBorder" :disabled="isokDisable" @click="assessmentData()">评估</el-button>
-            </div>
-            <div class="table">
-              <el-table
-                :key="nutritional.tab1.tableKey"
-                v-loading="nutritional.tab1.listLoading"
-                element-loading-text="给我一点时间"
-                :data="nutritional.tab1.list"
-                border
-                fit
-                highlight-current-row
-                style="width: 100%;margin-bottom:60px;"
-                :row-style="rowStyle"
-                :cell-style="cellStyle"
-                class="elTable table-fixed"
-                :row-class-name="tableRowClassName"
-              >
-                <el-table-column label="序号" align="center" type="index" width="50px" />
-                <el-table-column label="指标" min-width="130px" align="center">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.standard }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="奶牛需要" min-width="130px" align="center">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.cowneed }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="配方量" min-width="130px" align="center">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.ftpro }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="TMR料" min-width="130px" align="center">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.hprov }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column label="采食量" min-width="130px" align="center">
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.sprov }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </el-tab-pane>
-          <el-tab-pane label="牛群评估" name="second">
-            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
-            <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
-            <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-            <el-row>
-              <el-col :span="24">
-                <h3 style="text-align: center;">宾州筛分析</h3>
-                <div class="table">
-                  <el-table
-                    :key="nutritional.tab2.tableKey1"
-                    v-loading="nutritional.tab2.listLoading1"
-                    element-loading-text="给我一点时间"
-                    :data="nutritional.tab2.list1"
-                    border
-                    fit
-                    highlight-current-row
-                    style="width: 100%;margin-bottom:60px;"
-                    :row-style="rowStyle"
-                    :cell-style="cellStyle"
-                    class="elTable table-fixed"
-                  >
-                    <el-table-column label="日期" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.operatetime }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第一层重量(g)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.oneweight }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.onerate }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第二层重量(g)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.twoweight }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.tworate }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第三层重量(g)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.threeweight }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.threerate }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第四层重量(g)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.fourweight }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第四层百分比" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.fourrate }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.standard }}</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <h3 style="text-align: center;">粪便筛分析</h3>
-                <div class="table">
-                  <el-table
-                    :key="nutritional.tab2.tableKey2"
-                    v-loading="nutritional.tab2.listLoading2"
-                    element-loading-text="给我一点时间"
-                    :data="nutritional.tab2.list2"
-                    border
-                    fit
-                    highlight-current-row
-                    style="width: 100%;margin-bottom:60px;"
-                    :row-style="rowStyle"
-                    :cell-style="cellStyle"
-                    class="elTable table-fixed"
-                  >
-                    <el-table-column label="日期" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.operatetime }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第一层重量(g)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.oneweight }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第一层百分比" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.onerate }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第二层重量(g)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.twoweight }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第二层百分比" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.tworate }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第三层重量(g)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.threeweight }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="第三层百分比" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.threerate }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="参考标准" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.standard }}</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <h3 style="text-align: center;">BCS评分</h3>
-                <div class="table">
-                  <el-table
-                    :key="nutritional.tab2.tableKey3"
-                    v-loading="nutritional.tab2.listLoading3"
-                    element-loading-text="给我一点时间"
-                    :data="nutritional.tab2.list3"
-                    border
-                    fit
-                    highlight-current-row
-                    style="width: 100%;margin-bottom:60px;"
-                    :row-style="rowStyle"
-                    :cell-style="cellStyle"
-                    class="elTable table-fixed"
-                  >
-                    <el-table-column label="日期" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.operatetime }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.sumcowcount }}</span>
-                      </template>
-                    </el-table-column>
-                    <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">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.cowneed }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.avgdim }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.standardscore }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="2.75-分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score25 }}({{ scope.row.score25rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="2.75分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score275 }}({{ scope.row.score275rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="3分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score3 }}({{ scope.row.score3rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="3.25分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score325 }}({{ scope.row.score325rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="3.5分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score35 }}({{ scope.row.score35rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="3.75分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score375 }}({{ scope.row.score375rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="4+分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score4 }}({{ scope.row.score4rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="24">
-                <h3 style="text-align: center;">粪便评分</h3>
-                <div class="table">
-                  <el-table
-                    :key="nutritional.tab2.tableKey4"
-                    v-loading="nutritional.tab2.listLoading4"
-                    element-loading-text="给我一点时间"
-                    :data="nutritional.tab2.list4"
-                    border
-                    fit
-                    highlight-current-row
-                    style="width: 100%;margin-bottom:60px;"
-                    :row-style="rowStyle"
-                    :cell-style="cellStyle"
-                    class="elTable table-fixed"
-                  >
-                    <el-table-column label="日期" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.operatetime }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="抽查样本数" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.sumcowcount }}</span>
-                      </template>
-                    </el-table-column>
-                    <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">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.cowneed }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="泌乳天数" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.avgdim }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="标准分数" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.cowneed }}</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="1分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score1 }}({{ scope.row.score1rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="2分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score2 }}({{ scope.row.score2rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="3分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score3 }}({{ scope.row.score3rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="4分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score4 }}({{ scope.row.score4rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="5分(数量、百分比)" min-width="130px" align="center">
-                      <template slot-scope="scope">
-                        <span>{{ scope.row.score5 }}({{ scope.row.score5rate }}%)</span>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </el-col>
-            </el-row>
-          </el-tab-pane>
-        </el-tabs>
-        <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose cancelClose1" @click="nutritional.dialogFormVisible = false; ">关闭</el-button>
-        </div>
-      </div>
-    </el-dialog>
 
     
+ 
+    
   </div>
 </template>
 
@@ -687,10 +181,7 @@ export default {
             inforname: 'isEnableSupplyFeed'
           }
         },
-        isRW1: false, // 第一班
-        isRW2: false, // 第二班
-        isRW3: false, // 第三班
-        isRW4: false, // 第四班
+        
         getdataListParm3: {
           name: 'getSysoptEnable1',
           page: 1,
@@ -705,181 +196,8 @@ export default {
         RWLength: '' // 班次长度
       },
       selectList: [],
-      // 营养评估
-      nutritional: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        activeName: 'first ',
-        tab1: {
-          // inputDatetime: [new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 1), new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 1)],
-          inputDatetime: [new Date(), new Date()],
-          listLoading1: true,
-          getdataListParm1: {
-            name: 'getnurj',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              barid: ''
-            }
-          },
-          disabledCowclass: false,
-          temp: {},
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading2: true,
-          getdataListParm2: {
-            name: 'GETNurJudge',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              cowclassid: ''
-            }
-          }
-        },
-        tab2: {
-          // inputDatetime: [new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 1), new Date().setTime(new Date().getTime() - 3600 * 1000 * 24 * 1)],
-          inputDatetime: [new Date(), new Date()],
-          listLoading1: true,
-          tableKey1: 0,
-          list1: [],
-          total1: 0,
-          getdataListParm1: {
-            name: 'getPennsieveList',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              barid: '',
-              startTime: '',
-              stopTime: '',
-              inputDatetime: ''
-            }
-          },
-          listLoading2: true,
-          tableKey2: 0,
-          list2: [],
-          total2: 0,
-          getdataListParm2: {
-            name: 'getDungsieveList',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              barid: '',
-              startTime: '',
-              stopTime: '',
-              inputDatetime: ''
-            }
-          },
-          listLoading3: true,
-          tableKey3: 0,
-          list3: [],
-          total3: 0,
-          getdataListParm3: {
-            name: 'getBodyscoreList',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              barid: '',
-              startTime: '',
-              stopTime: '',
-              inputDatetime: ''
-            }
-          },
-          listLoading4: true,
-          tableKey4: 0,
-          list4: [],
-          total4: 0,
-          getdataListParm4: {
-            name: 'getDungscoreList',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              barid: '',
-              startTime: '',
-              stopTime: '',
-              inputDatetime: ''
-            }
-          }
-        }
-      },
-      history: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: {},
-        rules: {},
-        tableKey: 0,
-        list: [],
-        total: 0,
-        listLoading: true,
-        getdataListParm: {
-          name: 'getPlanModifyFPlist',
-          page: 1,
-          offset: 1,
-          pagecount: 12,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            date: '',
-            barid: '',
-            tname: ''
-          }
-        },
-        isPtsfname: false, // 补料配方/补料重量
-        getdataListParm2: {
-          name: 'getSysoptEnable',
-          page: 1,
-          offset: 1,
-          pagecount: 1,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'isEnableSupplyFeed'
-          }
-        },
-        isRW1: false, // 第一班
-        isRW2: false, // 第二班
-        isRW3: false, // 第三班
-        isRW4: false, // 第四班
-        getdataListParm3: {
-          name: 'getSysoptEnable1',
-          page: 1,
-          offset: 1,
-          pagecount: 1,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'times'
-          }
-        },
-        getdataDateParm: {
-          name: 'getFPMaxDate',
-          page: 1,
-          offset: 1,
-          pagecount: 10,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid')
-          }
-        }
-      },
+   
+     
       textMap: {
         Nutritional: '营养评估',
         history: '历史记录'
@@ -911,7 +229,22 @@ export default {
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
       myHeight: document.documentElement.clientHeight - 85 - 140,
-      oldRowList:{}
+      oldRowList:{},
+
+
+      create1: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '', sort: '' },
+        rules: {
+          // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        }
+      },
+
+
+
     }
   },
   computed: {
@@ -939,6 +272,18 @@ export default {
         this.getIsDisplay()
       })
     },
+
+     // 新增
+    handleCreate1() {
+      console.log('点击了新增')
+      this.resetTemp1()
+      this.dialogFull = false
+      this.create1.dialogStatus = 'create'
+      this.create1.dialogFormVisible = true
+    },
+
+
+
     getFeedTempletNameList() {
       GetDataByName(this.getFeedTempletNameListParm).then(response => {
         if (response.data.list !== null) {

+ 20 - 0
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -5,6 +5,9 @@
         <div class="search">
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
         
+
+<!-- 等待对接中…… -->
+        <!-- <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/> -->
         
           <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
@@ -707,6 +710,23 @@ export default {
 
   },
   methods: {
+
+
+    
+    change_date(e){
+      console.log(e)
+      this.getDownList()
+    },
+
+    // getDownList() {
+    //   this.downTMR.parammaps.startdate = this.table.getdataListParm.parammaps.startTime
+    //   this.downTMR.parammaps.enddate = this.table.getdataListParm.parammaps.stopTime
+    //   GetDataByName(this.downTMR).then(response => {
+    //     console.log(response.data.list)
+    //      this.TMRList = response.data.list
+    //   })
+    // },
+
     getTimeFn() {
       const that = this
       const end = new Date()

+ 7 - 2
src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -1148,7 +1148,12 @@ export default {
         color: ['#ff0000', '#5199e5', '#fdb06a', '#fb8b73'], // 关键加上这句话,legend的颜色和折线的自定义颜色就一致了
         legend: [{
           itemWidth: 15, itemHeight: 7, right: '25%', textStyle: { fontSize: 12 },
-          data: [{ name: '设计重量' }, { name: '实际重量' }]
+          data: [{ name: '设计重量' }, { name: '实际重量' , itemStyle: {
+                        normal: {
+                            color: '#ff0000'
+                        }
+                    } 
+          }]
         }, {
           itemWidth: 15, itemHeight: 15, right: '0', textStyle: { fontSize: 12 },
           data: [
@@ -1198,7 +1203,7 @@ export default {
           {type:'slider' },  //用于添加滑动条缩放,
         ],
         series: [
-          { symbol: 'none', name: '实际重量', type: 'line', data: chartLine_data.data3, itemStyle: { normal: { lineStyle: { color: '#38c193' }}}},
+          { symbol: 'none', name: '实际重量', type: 'line', data: chartLine_data.data3, itemStyle: { normal: { lineStyle: { color: '#ff0000' }}}},
           { symbol: 'none', name: '设计重量', type: 'line', step: 'middle', data: chartLine_data.data2 },
           // { name: '开始重量', symbol: 'image://https://kptyun.cn:8081/file/pic/3.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data4 },
           // { name: '结束重量', symbol: 'image://https://kptyun.cn:8081/file/pic/4.png', symbolSize: 10, type: 'scatter', data: chartLine_data.data5 }