修改混-撒 实际重量、

src/api/common.js

@@ -481,3 +481,20 @@ export function whichWeek(year) {
         data
       })
     }
+
+
+export function editWeightHL(data) {
+  return request({
+    url: '/authdata/planexec/edit',
+    method: 'POST',
+    data
+  })
+}
+
+export function editWeightSL(data) {
+  return request({
+    url: '/authdata/plan2/edit',
+    method: 'POST',
+    data
+  })
+}

src/router/index.js

@@ -67,14 +67,14 @@ export const constantRoutes = [
     }]
   },
   // {
-  //   path: '/leftoverManagement',
+  //   path: '/drawDot',
   //   component: Layout,
-  //   redirect: '/leftoverManagement',
+  //   redirect: '/drawDot',
   //   children: [{
-  //     path: 'leftoverManagement',
-  //     name: 'leftoverManagement',
-  //     component: () => import('@/views/leftoverManagement/index.vue'),
-  //     meta: { title: '剩料配置',icon: '撒料计划'}
+  //     path: 'drawDot',
+  //     name: 'drawDot',
+  //     component: () => import('@/views/drawDot/index.vue'),
+  //     meta: { title: '画点图',icon: '撒料计划'}
   //   }]
   // },
 ]

src/views/drawDot/index.vue

@@ -1,19 +1,8 @@
 <template>
     <div id="app">
-      <h1>图片点击获取多个形状坐标</h1>
-  
-      <!-- 选择形状类型 -->
-      <!-- <div>
-        <label for="shape-type">选择形状类型：</label>
-        <select v-model="currentShapeType" id="shape-type" @change="resetShape">
-          <option value="single-bed">单床fo (4点)</option>
-          <option value="double-bed">双床 (8点)</option>
-          <option value="line">分割线 (n点)</option>
-        </select>
-        </div> -->
-  
+
       <!-- 图片区域 -->
- <div class="box">
+    <div class="box">
         <div
         ref="imageArea"
         class="image-area"
@@ -27,56 +16,74 @@
             :style="getPointStyle(point)"
             class="point-marker"
           ></div>
-          <div v-if="shape.type === 'single-bed' || shape.type === 'double-bed'"
+          <div v-if="shape.type === '1' || shape.type === '2'"
                :style="getRectangleStyle(shape.points)"
                class="rectangle"
           ></div>
-          <polyline v-if="shape.type === 'line'"
+          <polyline v-if="shape.type === '3'"
                     :points="getLinePoints(shape.points)"
-                    class="line"
+                    class="3"
                     fill="none" stroke="red" stroke-width="2"/>
         </template>
         </div>
 
       <!--  -->
       <div>
-        
-
+        <h3 style="padding-left: 20px;">鼠标点击获取图形坐标</h3>
         <el-form :model="formObj" ref="formObj" label-width="120px" class="demo-dynamic">
           <el-form-item label="区域类型:">
-              <el-radio-group v-model="currentShapeType">
-                <el-radio label="single">喷淋(4个点)</el-radio>
-                <el-radio label="single-bed">单卧床(4个点)</el-radio>
-                <el-radio label="double-bed">双卧床(8个点)</el-radio>
-                <el-radio label="line">水槽(8个点)</el-radio>
+              <el-radio-group v-model="currentShapeType" @change="changeType">
+                <el-radio label="1">卧床</el-radio>
+                <el-radio label="2">喷淋</el-radio>
+                <el-radio label="3">水槽</el-radio>
               </el-radio-group>
           </el-form-item>
+           <!-- 卧床 -->
           <el-form-item
-            prop="spray"
-            label="单卧床(4个点):"
+            label="卧床(1):"
             required
+             v-if=" currentShapeType == '1'"
           >
-            <el-input v-model="formObj.spray"></el-input>
-            <div>
-              <span v-for="(item, index) in currentPoints" :key="index">{{  `x:${item.x} y:${item.y}` }}</span>
+            <div v-if="formObj.bed.length>0"  key="1">
+              <div><span style="padding-right: 20px;">左上:{{ `X:${formObj.bed[0]?.x || ''}Y:${formObj.bed[0]?.y || ''}`}}</span>  <span>右上:{{ `X:${formObj.bed[1]?.x || ''}Y:${formObj.bed[1]?.y || ''}`}}</span></div>
+              <div><span style="padding-right: 20px;">左下:{{ `X:${formObj.bed[3]?.x || ''}Y:${formObj.bed[3]?.y || ''}`}}</span> <span>右下:{{ `X:${formObj.bed[2]?.x || ''}Y:${formObj.bed[2]?.y || ''}`}}</span></div>
             </div>
           </el-form-item>
-          <!-- <el-form-item
-            v-for="(domain, index) in formObj.bedList"
-            :label="'卧床区域' + index"
-            :key="domain.key"
-            :prop="'bedList.' + index + '.value'"
-            :rules="{
-              required: true, message: '卧床点不能为空', trigger: 'blur'
-            }"
+          <el-form-item
+            label="卧床(2):"
+            required
+            v-if=" currentShapeType == '1'"
           >
-            <el-input v-model="domain.value"></el-input><el-button @click.prevent="removeDomain(domain)">删除
-              <el-button @click="addDomain">新增</el-button>
-            </el-button>
-          </el-form-item> -->
+            <div v-if="formObj.bed1.length>0 " key="2">
+              <div><span style="padding-right: 20px;">左上:{{ `X:${formObj.bed1[0]?.x || ''}Y:${formObj.bed1[0]?.y || ''}`}}</span>  <span>右上:{{ `X:${formObj.bed1[1]?.x || ''}Y:${formObj.bed1[1]?.y || ''}`}}</span></div>
+              <div><span style="padding-right: 20px;">左下:{{ `X:${formObj.bed1[3]?.x || ''}Y:${formObj.bed1[3]?.y || ''}`}}</span> <span>右下:{{ `X:${formObj.bed1[2]?.x || ''}Y:${formObj.bed1[2]?.y || ''}`}}</span></div>
+            </div>
+          </el-form-item>
+          <!--喷淋  -->
+          <el-form-item
+            label="喷淋:"
+            required
+                   v-if=" currentShapeType == '2'"
+          >
+            <div v-if="formObj.spray.length>0 && currentShapeType == '2' " key="1">
+              <div><span style="padding-right: 20px;">左上:{{ `X:${formObj.spray[0]?.x || ''}Y:${formObj.spray[0]?.y || ''}`}}</span>  <span>右上:{{ `X:${formObj.spray[1]?.x || ''}Y:${formObj.spray[1]?.y || ''}`}}</span></div>
+              <div><span style="padding-right: 20px;">左下:{{ `X:${formObj.spray[3]?.x || ''}Y:${formObj.spray[3]?.y || ''}`}}</span> <span>右下:{{ `X:${formObj.spray[2]?.x || ''}Y:${formObj.spray[2]?.y || ''}`}}</span></div>
+            </div>
+          </el-form-item>
+          <!--水槽  -->
+          <el-form-item
+            label="水槽:"
+            required
+            v-if=" currentShapeType == '3'"
+          >
+            <div v-if="formObj.sprayList.length>0  " key="1">
+              <div v-for="(item,index) in formObj.sprayList" :key="index"><span style="padding-right: 20px;" >第{{index+1}}点:{{ `X:${item?.x || ''}Y:${item?.y || ''}`}}</span> </div>
+            </div>
+          </el-form-item>
+
           <el-form-item>
-            <el-button type="primary" @click="submitForm('formObj')">提交</el-button>
-            <el-button @click="resetForm('formObj')">重置</el-button>
+            <el-button type="primary" @click="submitForm('formObj')">确认提交</el-button>
+            <el-button @click="handleConfirm">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -92,19 +99,24 @@
   export default {
     data() {
       return {
-        currentShapeType: 'single-bed',
+        currentShapeType: '1',
         shapes: [],
         currentPoints: [],
+        
         formObj: {
           type:'1',
-          bedList: [{
-            value: ''
-          }],
-          spray: ''
+          bed:[],
+          bed1:[],
+          spray:[],
+          sprayList:[]
         }
       };
     },
     methods: {
+      changeType(val){
+        this.currentShapeType = val;
+        this.currentPoints = [];
+      },
       resetShape() {
         this.currentPoints = [];
       },
@@ -113,7 +125,18 @@
         const x = event.clientX - rect.left;
         const y = event.clientY - rect.top;
         this.currentPoints.push({ x, y });
-  
+        if(this.currentShapeType == '1'){
+            if(this.formObj.bed.length < 4){
+              this.formObj.bed.push({ x, y });
+            }else{
+              this.formObj.bed1.push({ x, y });
+            }
+            console.log( this.formObj.bed,'hss')
+          } else if (this.currentShapeType == '2') {
+            this.formObj.spray=[...this.currentPoints]
+          } else if(this.currentShapeType == '3'){
+            this.formObj.sprayList = [...this.currentPoints]
+          }
         const requiredPoints = this.getRequiredPointsForShape(this.currentShapeType);
   
         if (this.currentPoints.length === requiredPoints) {
@@ -121,17 +144,18 @@
             type: this.currentShapeType,
             points: [...this.currentPoints],
           });
+         
           this.currentPoints = [];
         }
       },
       getRequiredPointsForShape(shapeType) {
         switch (shapeType) {
-          case 'single-bed':
+          case '1':
+            return 4;
+          case '2':
             return 4;
-          case 'double-bed':
-            return 8;
-          case 'line':
-            return 10; // Example: 10 points for the line
+          case '3':
+            return 8; // Example: 10 points for the 3
           default:
             return 4;
         }
@@ -151,7 +175,7 @@
         if (points.length < 4) return {};
         const [leftup, leftdown, rightup, rightdown] = points;
         const width = Math.abs(rightup.x - leftup.x);
-        const height = Math.abs(leftdown.y - leftup.y);
+        const height = Math.abs(leftdown.y - rightdown.y);
         return {
           top: `${leftup.y}px`,
           left: `${leftup.x}px`,
@@ -164,9 +188,22 @@
       getLinePoints(points) {
         return points.map(point => `${point.x},${point.y}`).join(' ');
       },
-
+  // 重置
+  handleConfirm(){
+    this.currentPoints = []
+    this.shapes= []
+    this.currentShapeType = '1';
+    this.formObj ={
+      bed:[],
+      bed1:[],
+      spray:[],
+      sprayList:[]
+    }
+    
+  },
       // 
       submitForm(formName) {
+      console.log(this.formObj,'提交')
         this.$refs[formName].validate((valid) => {
           if (valid) {
             alert('submit!');
@@ -198,6 +235,9 @@
   </script>
   
   <style scoped>
+  .el-button {
+    padding:10px;
+  }
   .box{ 
     display: flex;
     
@@ -221,7 +261,7 @@
   .point-marker {
     position: absolute;
   }
-  .line {
+  .3 {
     position: absolute;
     fill: none;
     stroke: red;

src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -75,7 +75,7 @@
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>混料详情11</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -101,6 +101,14 @@
             <el-table-column label="跳转方式" min-width="70px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="70px" align="center" prop="lastactualweight" />
             <el-table-column label="结束重量" min-width="70px" align="center" prop="actualweight" />
+            <el-table-column
+              fixed="right"
+              label="操作"
+              width="100">
+              <template slot-scope="scope">
+                <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </el-col>

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

@@ -138,10 +138,18 @@
             <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
             <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column
+              fixed="right"
+              label="操作"
+              width="80px">
+              <template slot-scope="scope">
+                <el-button @click="handleClick(scope.row)" type="text" size="small">编辑</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </el-col>
-      <!-- 撒料计划 -->
+      <!-- 撒料计划 3-->
       <el-col v-if="isSpreadingPlan" :span="16">
         <div class="title">
           <b>过程详情</b>
@@ -178,7 +186,7 @@
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>混料详情3</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -209,11 +217,18 @@
             <el-table-column label="跳转方式" min-width="70px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="70px" align="center" prop="lastactualweight" />
             <el-table-column label="结束重量" min-width="70px" align="center" prop="actualweight" />
+            <el-table-column
+              label="操作"
+              width="90px">
+              <template slot-scope="scope"  >
+                <el-button v-if="scope.row.sort != '合计'"   @click="handleClick(scope.row,1)" type="text" size="small">编辑</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
 
         <div class="SpreadingMaterials">
-          <h4>撒料详情</h4>
+          <h4>撒料详情3</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -244,6 +259,13 @@
             <el-table-column label="跳转方式" min-width="70px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="70px" align="center" prop="lastactualweight" />
             <el-table-column label="结束重量" min-width="70px" align="center" prop="actualweight" />
+            <el-table-column
+              label="操作"
+              width="90px">
+              <template slot-scope="scope"  >
+                <el-button v-if="scope.row.sort != '合计'"   @click="handleClick(scope.row,2)" type="text" size="small">编辑</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="ControlChart">
@@ -251,7 +273,7 @@
           <div id="chartLine" style="width: 100%;height:300px;" />
         </div>
       </el-col>
-      <!-- 剩料计划 -->
+      <!-- 剩料计划 2-->
       <el-col v-if="isResidualMaterialPlan" :span="16">
         <div class="title">
           <b>过程详情</b>
@@ -326,7 +348,7 @@
           </el-table>
         </div>
       </el-col>
-      <!-- 撒料计划-混料 -->
+      <!-- 撒料计划-混料 1-->
       <el-col v-if="isSpreadingPlanSH" :span="16">
         <div class="title">
           <b>过程详情</b>
@@ -363,7 +385,7 @@
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>混料详情1</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -379,8 +401,8 @@
             max-height="270px"
 
           >
-            <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="饲料名称" min-width="60px" align="center" prop="fname" />
+            <el-table-column  label="操作编号" min-width="60px" align="center" prop="sort" />
+            <el-table-column label="饲料名称" min-width="80px" align="center" prop="fname" />
             <el-table-column label="计划重量" min-width="60px" align="center" prop="lweight" />
             <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
@@ -395,11 +417,18 @@
             <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
             <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column
+              label="操作"
+              width="90">
+              <template slot-scope="scope"  >
+                <el-button v-if="scope.row.sort != '合计'"   @click="handleClick(scope.row,1)" type="text" size="small">编辑1</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
 
         <div class="SpreadingMaterials">
-          <h4>撒料详情</h4>
+          <h4>撒料详情1</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -414,10 +443,10 @@
             class="elTable table-fixed"
             max-height="260px"
           >
-            <el-table-column label="操作编号" min-width="60px" align="center" prop="sort" />
-            <el-table-column label="撒料车辆" min-width="60px" align="center" prop="fname" />
+            <el-table-column label="操作编号"  min-width="60px" align="center" prop="sort" />
+            <el-table-column label="撒料车辆" min-width="80px" align="center" prop="fname" />
             <el-table-column label="计划重量" min-width="60px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column label="实际重量" min-width="70px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
@@ -430,6 +459,13 @@
             <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
             <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column
+              label="操作"
+              width="90">
+              <template slot-scope="scope"  >
+                <el-button v-if="scope.row.sort != '合计'"   @click="handleClick(scope.row,2)" type="text" size="small">编辑1</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="ControlChart">
@@ -474,7 +510,7 @@
           </div>
         </div>
         <div class="Mixture">
-          <h4>混料详情</h4>
+          <h4>混料详情2</h4>
           <el-table
             :key="table3.tableKey"
             v-loading="table3.listLoading"
@@ -505,11 +541,18 @@
             <el-table-column label="跳转方式" min-width="60px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="60px" align="center" prop="lastactualweight" />
             <el-table-column label="结束重量" min-width="60px" align="center" prop="actualweight" />
+            <el-table-column
+              label="操作"
+              width="90px">
+              <template slot-scope="scope"  >
+                <el-button v-if="scope.row.sort != '合计'"   @click="handleClick(scope.row,1)" type="text" size="small">编辑</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
 
         <div class="SpreadingMaterials">
-          <h4>撒料详情</h4>
+          <h4>撒料详情2</h4>
           <el-table
             :key="table4.tableKey"
             v-loading="table4.listLoading"
@@ -527,7 +570,7 @@
             <el-table-column label="操作编号" min-width="70px" align="center" prop="sort" />
             <el-table-column label="撒料车辆" min-width="70px" align="center" prop="fname" />
             <el-table-column label="计划重量" min-width="70px" align="center" prop="lweight" />
-            <el-table-column label="实际重量" min-width="60px" align="center" prop="actualweightminus">
+            <el-table-column label="实际重量" min-width="80px" align="center" prop="actualweightminus">
               <template slot-scope="{row}">
                 <a v-if="row.actualweightminus == 0" style="color: red;">{{ row.actualweightminus }}</a>
                 <a v-else>{{ row.actualweightminus }}</a>
@@ -539,7 +582,14 @@
             <el-table-column label="过程时间" min-width="70px" align="center" prop="proesstime" />
             <el-table-column label="跳转方式" min-width="70px" align="center" prop="buttontype" />
             <el-table-column label="开始重量" min-width="70px" align="center" prop="lastactualweight" />
-            <el-table-column label="结束重量" min-width="70px" align="center" prop="actualweight" />
+            <el-table-column label="结束重量" min-width="80px" align="center" prop="actualweight" />
+            <el-table-column
+              label="操作"
+              width="90px">
+              <template slot-scope="scope"  >
+                <el-button v-if="scope.row.sort != '合计'"   @click="handleClick(scope.row,2)" type="text" size="small">编辑</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
         <div class="ControlChart">
@@ -549,6 +599,22 @@
       </el-col>
     </el-row>
 
+    <!-- 修改实际重量 -->
+    <el-dialog title="修改实际重量" :visible.sync="dialogFormVisible" width="40%">
+  <el-form :model="form">
+    <el-form-item label="原实际重量"  label-width="120px">
+      <el-input v-model="form.weightOld" disabled  type="number"></el-input>
+    </el-form-item>
+    <el-form-item label="现实际重量"  label-width="120px">
+      <el-input v-model="form.weight"  type="number"></el-input>
+    </el-form-item>
+  </el-form>
+  <div slot="footer" class="dialog-footer">
+    <el-button style="padding:10px"  @click="dialogFormVisible = false">取 消</el-button>
+    <el-button  style="padding:10px"   type="primary" @click="handleUpdateWg">确 定</el-button>
+  </div>
+</el-dialog>
+
   </div>
 
 </template>
@@ -557,13 +623,18 @@
 import echarts from 'echarts'
 
 require('echarts/theme/macarons')
-import { GetDataByName, GetReportform, formatNum,processAnalysist } from '@/api/common'
+import { GetDataByName, GetReportform, formatNum,processAnalysist,editWeightHL,editWeightSL } from '@/api/common'
 import Cookies from 'js-cookie'
 import { parseTime } from '@/utils/index.js'
 export default {
   name: 'PastureProcessAnalysis',
   data() {
     return {
+      dialogFormVisible:false,
+      form:{
+        weightOld:'',
+        weight:""
+      },
       hlwc1:undefined ,
       hlwc2:undefined ,
       hlzq1:undefined ,
@@ -633,7 +704,7 @@ export default {
             pastureid: Cookies.get('pastureid'),
             startTime: parseTime(new Date(), '{y}-{m}-{d}'),
             stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            inputDatetime: [new Date(), new Date()],
+            inputDatetime:  [new Date(), new Date()], //['2023-06-05','2023-06-15'],
             iscompleted: '',
             tmrtname: '',
             lpplantype: '',
@@ -741,6 +812,58 @@ export default {
     this.getList()
   },
   methods: {
+    // 编辑实际重量
+    handleClick(row,type){
+      this.dialogFormVisible = true;
+      this.form.weight = row.actualweightminus;
+      this.form.weightOld = row.actualweightminus;
+      this.form.pid =  this.table3.getdataListParm.parammaps.pid;
+      this.form.sort = row.sort;
+      this.form.userId = Cookies.get('employeid')
+      this.form.type = type;
+      console.log(row,'实际重量');
+      
+
+    },
+    // 点击确认修改
+    handleUpdateWg(){
+      if(this.form.weight == this.form.weightOld ){
+        this.dialogFormVisible = false
+        return
+      }
+      // 1:混料 2:撒料
+     if(this.form.type == 1){
+       this.handleEditWgHL(this.form)
+     } else{
+      this.handleEditWgSL(this.form)
+     }
+    },
+   
+    // 混料
+    async handleEditWgHL(obj){
+      const {data} =await editWeightHL(obj);
+      console.log(data,'=====混hss')
+      if(data == true){
+        this.$message({ type: 'success', message: '混料实际重量修改成功', duration: 2000 })
+      } else{
+        this.$message({ type: 'error', message: '修改失败,请重新修改', duration: 2000 })
+      }
+      this.getList3()
+      this.dialogFormVisible = false
+    },
+    // 撒料
+    async handleEditWgSL(obj){
+      const {data} =await editWeightSL(obj);
+      console.log(data,'=====撒hss')
+      if(data == true){
+        this.$message({ type: 'success', message: '撒料实际重量修改成功', duration: 2000 })
+      } else{
+        this.$message({ type: 'error', message: data, duration: 2000 })
+      }
+      this.getList4()
+      this.dialogFormVisible = false
+   
+    },
     change_date(e){
       console.log(e)
       this.getDownList()
@@ -1373,7 +1496,7 @@ export default {
       }
     },
     rowStyle({ row, rowIndex }) {
-        console.log(row, rowIndex,'777777');
+        // console.log(row, rowIndex,'777777');s
         let stylejson = {};
         if (row.abnormal == 1) {
             stylejson.background = "#fb8072";// 背景颜色