ud页面新增

.env.development

@@ -6,11 +6,14 @@ ENV = 'development'
 #VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
 # 白少后台本地
-#VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
+#VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
-线上
+# 线上
 VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
 
+线上
+#VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
+
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().

.env.production

@@ -6,4 +6,4 @@ ENV = 'production'
 # VUE_APP_BASE_API = ':8081/'
 # VUE_APP_BASE_API = 'http://192.168.1.70:8088/'
 # VUE_APP_BASE_API = 'http://127.0.0.1:8081/'
-VUE_APP_BASE_API = '/'
+VUE_APP_BASE_API = '/'

src/utils/request.js

@@ -16,7 +16,7 @@ var browserUrl = window.location.hostname
 console.log("========url===", reg.test(browserUrl))
 if (reg.test(browserUrl)) {
     // URL = window.location.protocol +"//"+ browserUrl + ":8082"
-    URL = window.location.protocol + "//" + browserUrl + ":8082/"
+    URL = window.location.protocol + "//" + browserUrl + ":80/"
 }
 
 Cookies.set("url", URL);

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

@@ -205,6 +205,14 @@
               </el-select>
            </el-form-item>
         </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="用料分析统计方式" prop="theoryOrPractice">
+              <el-select v-model="createTemp.theoryOrPractice" :disabled="isRoleEdit==false" filterable placeholder="用料分析统计方式" class="filter-item" style="width:100%">
+                <el-option v-for="item in dosageList" :key="item.id" :label="item.name" :value="item.id" />
+              </el-select>
+           </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="bottom: 10px;">
@@ -265,6 +273,7 @@ export default {
     return {
       weightList:[{ id: '0', name: '手动' }, { id: '1', name: '自动' }],
       volumeList:[{ id: '0', name: 'TMR' }, { id: '1', name: '容积' }],
+      dosageList:[{ id: '0', name: '理论重量' }, { id: '1', name: '实际重量' }],
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
       planNextDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取后一天计划
@@ -385,7 +394,8 @@ export default {
         yhautosecond: this.createTemp.yhautosecond,
         isConcentrate: this.createTemp.isConcentrate,
         excess:this.createTemp.excess,
-        tmrOrVolume :this.createTemp.tmrOrVolume
+        tmrOrVolume :this.createTemp.tmrOrVolume,
+        theoryOrPractice :this.createTemp.theoryOrPractice
       }}
       this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
         pastureid: this.createTemp.pastureid

src/views/formulationPlan/recipeTemplate/index.vue

@@ -425,6 +425,36 @@
                 </el-select>
               </template>
             </el-table-column>
+
+
+            <el-table-column label="最少搅拌分钟" min-width="90px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.NoEdit">{{ scope.row.minminutes }}</span>
+                <el-input
+                  v-if="scope.row.Edit"
+                  v-model="scope.row.minminutes"
+                  type="textarea"
+                  :autosize="{ minRows: 1.3, maxRows: 4 }"
+                  maxlength="255"
+                  style="width: 95%; padding: 10px 0"
+                />
+              </template>
+            </el-table-column>
+
+            <el-table-column label="继续搅拌分钟" min-width="90px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.NoEdit">{{ scope.row.continueminutes }}</span>
+                <el-input
+                  v-if="scope.row.Edit"
+                  v-model="scope.row.continueminutes"
+                  type="textarea"
+                  :autosize="{ minRows: 1.3, maxRows: 4 }"
+                  maxlength="255"
+                  style="width: 95%; padding: 10px 0"
+                />
+              </template>
+            </el-table-column>
+
             <el-table-column
               label="操作"
               align="center"
@@ -2981,6 +3011,8 @@ export default {
       this.table.temp.source = row.source;
       this.table.temp.remark = row.remark;
       this.table.temp.enable = row.enable;
+      this.table.temp.minminutes = row.minminutes;
+      this.table.temp.continueminutes = row.continueminutes;
       // this.table.temp.surplusId = row.surplusId
       if (this.table.temp.volume == "" || this.table.temp.volume == null) {
         this.table.temp.volume = 0;
@@ -3184,8 +3216,9 @@ export default {
       this.table.temp.id = row.id;
       this.table.temp.cattle = row.cattle;
       this.table.temp.autozone = row.autozone;
-
       this.table.temp.surplusId = row.surplusId;
+      this.table.temp.continueminutes = row.continueminutes;
+      this.table.temp.minminutes = row.minminutes;
       this.table.temp.surplus = row.surplus;
       if (
         this.table.temp.volume == "" ||
@@ -6346,3 +6379,7 @@ $left: 325px;
   display: none !important;
 }
 </style>
+minminutes，continueminutes
+
+`minminutes` varchar(50) DEFAULT NULL,
+  `continueminutes` varchar(50) DEFAULT NULL

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

@@ -48,7 +48,7 @@
             <el-table-column sortable label="撒料量（kg）" align="center" prop="撒料量" />
             <el-table-column sortable label="平均混料时间" align="center" prop="混料时间" />
             <el-table-column sortable label="转投剩料量（kg）"  align="center" prop="转投剩料量" />
-            <el-table-column sortable label="昨日剩料量（kg）" align="center" prop="今日剩料量" />
+            <el-table-column sortable label="剩料量（kg）" align="center" prop="今日剩料量" />
             <el-table-column sortable label="剩料率（%）" align="center" prop="剩料率" />
             <el-table-column sortable label="TMR干物质（%）"  align="center" prop="TMR干物质" />
             <el-table-column sortable label="配方干物质采食量（kg/头）" min-width="80px" align="center" prop="配方干物质采食量" />

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

@@ -67,6 +67,7 @@
           <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="TMR设备编号" />
           <el-input v-if="tab2.isRadio5" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="班次" />
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="车次" />
+          <el-input v-if="tab2.isRadio7" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="同步数据" />
           <el-select v-model="tab2.table.getdataListParm.parammaps.typea" clearable placeholder="列表显示" class="filter-item" style="width: 120px;">
             <el-option v-for="item in displayList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
@@ -305,7 +306,8 @@ export default {
         isRadio3: false,
         isRadio4: false,
         isRadio5: false,
-        isRadio6: false
+        isRadio6: false,
+        isRadio7: false
       },
       tab3: {
         chartDate: [],
@@ -344,7 +346,7 @@ export default {
       rowHeight: 30,
       isDispayTable2:false,
       isDispayTable3:false,
-      statisticalTypeList2: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }, { id: '5', name: 'TMR班次' }, { id: '6', name: '车次' }],
+      statisticalTypeList2: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }, { id: '5', name: 'TMR班次' }, { id: '6', name: '车次' }, { id: '7', name: '同步数据' }],
       statisticalTypeList3: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }],
       frequencyList: [], // 班次
       isTable1:true,
@@ -596,6 +598,7 @@ export default {
         this.tab2.isRadio4 = false,
         this.tab2.isRadio5 = false,
         this.tab2.isRadio6 = false,
+        this.tab2.isRadio7 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisSC'
         this.tab2.table.getdataListParm.offset = 1
         this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -608,6 +611,7 @@ export default {
         this.tab2.isRadio4 = false,
         this.tab2.isRadio5 = false,
         this.tab2.isRadio6 = false,
+        this.tab2.isRadio7 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisLS'
         this.tab2.table.getdataListParm.offset = 1
         this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -620,6 +624,7 @@ export default {
         this.tab2.isRadio4 = false,
         this.tab2.isRadio5 = false,
         this.tab2.isRadio6 = false,
+        this.tab2.isRadio7 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisRQ'
         this.tab2.table.getdataListParm.offset = 1
         this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -632,6 +637,7 @@ export default {
         this.tab2.isRadio4 = true,
         this.tab2.isRadio5 = false,
         this.tab2.isRadio6 = false,
+        this.tab2.isRadio7 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisTMR'
         this.tab2.table.getdataListParm.offset = 1
         this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -656,11 +662,25 @@ export default {
         this.tab2.isRadio4 = false,
         this.tab2.isRadio5 = false,
         this.tab2.isRadio6 = true,
+        this.tab2.isRadio7 = false,
         this.tab2.table.getdataListParm.name = 'getMaterialAnalysisCC'
         this.tab2.table.getdataListParm.offset = 1
         this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
         this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
         this.getTab2List()
+      } else if (this.tab2.radio == '7') {
+        this.tab2.isRadio1 = false,
+        this.tab2.isRadio2 = false,
+        this.tab2.isRadio3 = false,
+        this.tab2.isRadio4 = false,
+        this.tab2.isRadio5 = false,
+        this.tab2.isRadio6 = false,
+        this.tab2.isRadio7 = true,
+        this.tab2.table.getdataListParm.name = 'getMaterialAnalysisUD'
+        this.tab2.table.getdataListParm.offset = 1
+        this.tab2.table.getdataListParm.parammaps.startTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.tab2.table.getdataListParm.parammaps.stopTime = parseTime(this.tab2.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+        this.getTab2List()
       }
     },
     // 价格分析