Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-04-28 8b66ef0d6c44636306f99a502f8bf8cf679a55b0

Merge remote-tracking branch 'origin/dev' into dev

 src/views/mainPlan/gasPlanning/index.vue

@@ -7,7 +7,7 @@
      :inline="true"
      label-width="68px"
    >
      <el-row type="flex" justify="left" @click.stop="handleCancleStaus">
      <el-row type="flex" justify="left">
        <el-col :span="6">
          <el-form-item label="选择月份" prop="description">
            <el-date-picker
@@ -32,10 +32,16 @@
    </el-form>
    <div class="box_container">
      <el-row>
        <el-col :span="22" @click="handleCancleStaus">
        <el-col :span="!clickedTableRef?22:20">
          <div class="title_text">管路规划产能</div>
        </el-col>
        <el-col :span="2">
        <el-col :span="1" v-if="!clickedTableRef">
          <el-button 
            class="title_btn"
            type="default"
            @click="editRowEvent" >编辑</el-button>
        </el-col>
        <el-col :span="1.8" v-if="clickedTableRef">
          <el-button
            class="title_btn"
            type="primary"
@@ -44,6 +50,12 @@
          >
            保存
          </el-button>
        </el-col>
        <el-col :span="1" v-if="clickedTableRef"> 
          <el-button 
            class="title_btn ml20"
            type="default"
            @click="handleCancleStaus">取消</el-button>
        </el-col>
      </el-row>

@@ -75,7 +87,7 @@
          size="small"
          @cell-click="cellClickEvent"
        >
          <vxe-column field="processName" title="标准工序名称" min-width="150">
          <vxe-column field="processName" title="标准工序名称" min-width="150" fixed="left">
          </vxe-column>
          <vxe-column
            field="dayProduceType"
@@ -275,10 +287,16 @@
    </div>
    <div class="box_container">
      <el-row>
        <el-col :span="22" @click="handleCancleStausGas">
        <el-col :span="!clickedTableRefGas?22:20">
          <div class="title_text">气柜规划产能</div>
        </el-col>
        <el-col :span="2">
        <el-col :span="1" v-if="!clickedTableRefGas">
          <el-button 
            class="title_btn"
            type="default"
            @click="editRowEventGas" >编辑</el-button>
        </el-col>
        <el-col :span="1.8" v-if="clickedTableRefGas">
          <el-button
            class="title_btn"
            type="primary"
@@ -287,6 +305,12 @@
          >
            保存
          </el-button>
        </el-col>
        <el-col :span="1" v-if="clickedTableRefGas"> 
          <el-button 
            class="title_btn ml20"
            type="default"
            @click="handleCancleStausGas">取消</el-button>
        </el-col>
      </el-row>
      <div class="tabel_container">
@@ -309,7 +333,7 @@
          :data="gasPlanList"
          @cell-click="cellClickEventGas"
        >
          <vxe-column field="processName" title="标准工序名称" min-width="150">
          <vxe-column field="processName" title="标准工序名称" min-width="150" fixed="left">
          </vxe-column>
          <vxe-column
            field="dayProduceType"
@@ -624,12 +648,12 @@
//     return $table.isEditByRow(row);
//   }
// };
// const editRowEvent = (row) => {
//   const $table = tableRef.value;
//   if ($table) {
//     $table.setEditRow(row);
//   }
// };
const editRowEvent = () => {
  clickedTableRef.value = true;
};
const editRowEventGas = () => {
  clickedTableRefGas.value = true;
};
const saveRowEvent = (row) => {
  if (!queryParams.value.date) {
    ElMessage({
@@ -657,9 +681,16 @@
}
const handleCancleStaus = () => {
  clickedTableRef.value = false;
  const year = queryParams.value.date.split("-")[0];
  const month = parseInt(queryParams.value.date.split("-")[1]);
  getRouteList(year, month);

};
const handleCancleStausGas = () => {
  clickedTableRefGas.value = false;
  const year = queryParams.value.date.split("-")[0];
  const month = parseInt(queryParams.value.date.split("-")[1]);
  getGasList(year, month);
}
// const cancelRowEvent = () => {
//   const $table = tableRef.value;
@@ -768,12 +799,10 @@
  loading2.value = false;
}
function cellClickEvent({ row, column }) {
  clickedTableRef.value = true;
  row.dayProduceAllNum = row.dayProduceNum * row.personnelNumber;
  row.monthProduceAllNum = row.dayProduceAllNum * row.days;
}
function cellClickEventGas({ row, column }) {
  clickedTableRefGas.value = true;
  row.dayProduceAllNum = row.dayProduceNum * row.personnelNumber;
  row.monthProduceAllNum = row.dayProduceAllNum * row.days;
}
@@ -877,6 +906,9 @@
  }
  .title_btn {
    margin-top: 20px;
    &.ml20{
      margin-left:20px;
    }
  }
  .tabel_container {
    width: 98%;

 src/views/mainPlan/gasProduceStatics/index.vue

@@ -69,6 +69,7 @@
          icon="Refresh"
          @click="handleRefresh"
          v-hasPermi="['aps:apsGasPipingRouteStat:computeCapacity']"
          :disabled="loading"
          >更新</el-button
        >
      </el-col>
@@ -275,6 +276,7 @@
          // item[`resourceName`] = flag
          //   ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>`
          //   : key;
          item[`resourceName`] = key;
        }
        exportData.value.push(data);
        dataList.push(item);

 src/views/mainPlan/pipeProduceStatics/index.vue

@@ -69,6 +69,7 @@
          icon="Refresh"
          @click="handleRefresh"
          v-hasPermi="['aps:apsGasPipingRouteStat:computeCapacity']"
          :disabled="loading"
          >更新</el-button
        >
      </el-col>
@@ -290,6 +291,7 @@
          // item[`resourceName`] = flag
          //   ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>`
          //   : key;
          item[`resourceName`] =  key;
        }
        exportData.value.push(data);
        dataList.push(item);