liuhairui пре 1 година
родитељ
комит
19d021c5e2

+ 13 - 3
src/view/DecisionSupport/outputsum/index.vue

@@ -41,15 +41,22 @@
                         :cell-class-name="tableDataCellClass"
                         :cell-class-name="tableDataCellClass"
                         @row-dblclick="updateCompanyFunc"
                         @row-dblclick="updateCompanyFunc"
                         @selection-change="handleSelectionChange"
                         @selection-change="handleSelectionChange"
-                        :show-overflow-tooltip="true">
+                        :show-overflow-tooltip="true"       
+						   show-summary
+          :summary-method="getSummaries">
                         <!-- 多选框 -->
                         <!-- 多选框 -->
                         <!-- <el-table-column type="selection" width="30" /> -->
                         <!-- <el-table-column type="selection" width="30" /> -->
                 <el-table-column align="left" label="设备编号"   prop="sczl_jtbh"  width="81" />
                 <el-table-column align="left" label="设备编号"   prop="sczl_jtbh"  width="81" />
                 <el-table-column align="left" sortable label="班组编号"   prop="sczl_bzdh" width="110" />
                 <el-table-column align="left" sortable label="班组编号"   prop="sczl_bzdh" width="110" />
                 <el-table-column align="left" sortable label="产量合计"   prop="total_cl" width="110" />
                 <el-table-column align="left" sortable label="产量合计"   prop="total_cl" width="110" />
 
 
-                <el-table-column :label="item.slice(5,10)" align="center" v-for="item in datelist" :key="item.label" :prop= "item" >
-                </el-table-column>
+    <el-table-column 
+        v-for="item in datelist" 
+        :key="item" 
+        :label="item.slice(5,10)" 
+        align="center" 
+        :prop="item">
+    </el-table-column>
 
 
               </el-table>
               </el-table>
               <!-- 分页 -->
               <!-- 分页 -->
@@ -203,6 +210,8 @@ const scfjfpxsCancel = () => {
   scfjfpxslist.value = false;
   scfjfpxslist.value = false;
 };
 };
 
 
+
+
 //=========工序产量核查===========
 //=========工序产量核查===========
 const gd_gxclhclist = ref(false);
 const gd_gxclhclist = ref(false);
 const gxclhc_Data = ref([]);
 const gxclhc_Data = ref([]);
@@ -1555,6 +1564,7 @@ const handleNodeClick = async (node) => {
        item.forEach(element => {
        item.forEach(element => {
         tabledate2.value.push(element)
         tabledate2.value.push(element)
        });
        });
+	   console.log('111',tabledate2.value)
     });
     });
     tabledate2.value = tabledate2.value.map(item => {  
     tabledate2.value = tabledate2.value.map(item => {  
     // 使用扩展运算符(...)来合并原始对象(排除day_total)和day_total对象  
     // 使用扩展运算符(...)来合并原始对象(排除day_total)和day_total对象  

+ 1 - 1
src/view/login/index.vue

@@ -306,7 +306,7 @@ const GetAddr = () => {
   xmlhttp.send();
   xmlhttp.send();
 };
 };
 // 在页面加载时获取MAC地址并进行自动登录
 // 在页面加载时获取MAC地址并进行自动登录
-// GetAddr();
+GetAddr();
 
 
 
 
 
 

+ 1 - 0
src/view/performance/chejianbaogong.vue

@@ -4301,6 +4301,7 @@ const FieldInspectionRecord = async () => {
 const GetMachineMac = async (addr) => {
 const GetMachineMac = async (addr) => {
   console.log(addr);
   console.log(addr);
   const response = await getMachineMac({ addr: addr });
   const response = await getMachineMac({ addr: addr });
+  console.log("获取机台数据",response)
   if (response.code === 0) {
   if (response.code === 0) {
     if(response.data===null){
     if(response.data===null){
       // JTMC = 'JY01#';
       // JTMC = 'JY01#';

+ 4 - 3
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -5589,7 +5589,8 @@ const tablebllickHandlerlist = async (row, column, event) => {
  }
  }
  //日报表上传
  //日报表上传
  const SubmitDailyProduction = async () => {
  const SubmitDailyProduction = async () => {
-
+// console.log(formdata3.value.rq)
+// return
     const rate1=(parseFloat(formdata3.value.组员1['比例']) / 100).toFixed(5)
     const rate1=(parseFloat(formdata3.value.组员1['比例']) / 100).toFixed(5)
     const rate2=(parseFloat(formdata3.value.组员2['比例']) / 100).toFixed(5)
     const rate2=(parseFloat(formdata3.value.组员2['比例']) / 100).toFixed(5)
     const rate3=(parseFloat(formdata3.value.组员3['比例']) / 100).toFixed(5)
     const rate3=(parseFloat(formdata3.value.组员3['比例']) / 100).toFixed(5)
@@ -5639,8 +5640,8 @@ const tablebllickHandlerlist = async (row, column, event) => {
     sczl_异常工时1:formdata3.value.异常补时,
     sczl_异常工时1:formdata3.value.异常补时,
 	sczl_保养工时:formdata3.value.保养工时,
 	sczl_保养工时:formdata3.value.保养工时,
     sczl_dedh:formdata3.value.dedh,
     sczl_dedh:formdata3.value.dedh,
-
-    sczl_rq: date,
+	sczl_rq: formdata3.value.rq,
+    // sczl_rq: date,
     sczl_num: formdata3.value.num,
     sczl_num: formdata3.value.num,
     // sczl_rq: formData3.value.sczl_rq,
     // sczl_rq: formData3.value.sczl_rq,
     sczl_cl: formdata3.value.产量,
     sczl_cl: formdata3.value.产量,