chengxiangling
2025-05-16 444ba76f4cca8a9df3faf61ab33ec631aec7fbba
提交right-toolbar组件事件调用计划运行模块
已修改30个文件
390 ■■■■■ 文件已修改
src/layout/components/Navbar.vue 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/i18n/locales/plan/index.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/apsPlant/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/apsShop/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/bom/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/calendar/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/event/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/gasMaterialUsage/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/materialManagement/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/materialStorageManagement/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/processRouteDataPreparate/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicData/resourceGroup/index.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/demand/planManage/index.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/abnormalPartNumberReport/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/abnormalProcessAnalysis/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/gasPiping/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/gasPlanning/index.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/gasProduceStatics/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/pipePlanning/index.vue 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/pipeProduceStatics/index.vue 163 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/platePlan/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/platePlanList/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/plateProcessStat/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/sheetMetalOrderManage/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/sheetMetalRedundantReport/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/sheetMetalSupplyGap/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/weldSeam/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/weldSeamEcharts/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mainPlan/workOrderJobLog/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/partPlan/index.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/layout/components/Navbar.vue
@@ -20,18 +20,30 @@
    <div class="right-menu">
      <template v-if="appStore.device !== 'mobile'"> </template>
      <div class="mt5">
        <!-- <el-button @click="changeLanguage('zh')">中文</el-button>
          <el-button @click="changeLanguage('en')">English</el-button> -->
        <!-- <el-dropdown>
          <img class="zh_icon" v-if="locale==='zh'" src="@/assets/images/zh.svg" alt="zh" />
          <img class="zh_icon" v-if="locale==='en'" src="@/assets/images/en.svg" alt="en" />
        <el-dropdown>
          <img
            class="zh_icon"
            v-if="locale === 'zh'"
            src="@/assets/images/zh.svg"
            alt="zh"
          />
          <img
            class="zh_icon"
            v-if="locale === 'en'"
            src="@/assets/images/en.svg"
            alt="en"
          />
          <template #dropdown>
            <el-dropdown-menu>
              <el-dropdown-item  @click="changeLanguage('zh','zh-CN')">{{ $t(`common.topNav.zh`) }}</el-dropdown-item>
              <el-dropdown-item @click="changeLanguage('en','en-US')">{{ $t(`common.topNav.en`) }}</el-dropdown-item>
              <el-dropdown-item @click="changeLanguage('zh', 'zh-CN')">{{
                $t(`common.topNav.zh`)
              }}</el-dropdown-item>
              <el-dropdown-item @click="changeLanguage('en', 'en-US')">{{
                $t(`common.topNav.en`)
              }}</el-dropdown-item>
            </el-dropdown-menu>
          </template>
        </el-dropdown> -->
        </el-dropdown>
      </div>
      <div class="avatar-container">
        <el-dropdown
@@ -46,7 +58,9 @@
          <template #dropdown>
            <el-dropdown-menu>
              <router-link to="/user/profile">
                <el-dropdown-item>{{ $t(`common.topNav.center`) }}</el-dropdown-item>
                <el-dropdown-item>{{
                  $t(`common.topNav.center`)
                }}</el-dropdown-item>
              </router-link>
              <!-- <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
                <span>布局设置</span>
@@ -76,7 +90,7 @@
import useUserStore from "@/store/modules/user";
import useSettingsStore from "@/store/modules/settings";
import useLanguageStore from "@/store/modules/language";
import { VxeUI } from 'vxe-table'
import { VxeUI } from "vxe-table";
import { useI18n } from "vue-i18n"; //要在js中使用国际化
const { t, locale } = useI18n();
const appStore = useAppStore();
@@ -84,10 +98,10 @@
const settingsStore = useSettingsStore();
const languageStore = useLanguageStore();
const { proxy } = getCurrentInstance();
function changeLanguage(type1,type2) {
function changeLanguage(type1, type2) {
  proxy.$i18n.locale = type1;
  languageStore.setLocale(type1);
  VxeUI.setLanguage(type2)
  VxeUI.setLanguage(type2);
  // console.log(VxeUI.getLanguage(),'VxeUI.getLanguage()')
}
@@ -177,7 +191,7 @@
      .zh_icon {
        width: 35px;
        height: 35px;
        border:none;
        border: none;
        outline: none;
      }
    }
src/utils/i18n/locales/plan/index.js
@@ -28,8 +28,8 @@
    errorMonthEmpty: "请选择年月",
  },
  placeholder: {
    startDate: "开始日期",
    endDate: "结束日期",
    startDate: "开始",
    endDate: "结束",
    startMonth: "开始月份",
    endMonth: "结束月份",
    to: "至",
@@ -254,8 +254,8 @@
    errorMonthEmpty: "Please select year and month",
  },
  placeholder: {
    startDate: "Start date",
    endDate: "End date",
    startDate: "Start",
    endDate: "End",
    startMonth: "Start Month",
    endMonth: "End Month",
    to: "To",
src/views/basicData/apsPlant/index.vue
@@ -40,7 +40,9 @@
          v-hasPermi="['plant:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
      <right-toolbar :search="false"
        @refreshTable="getList"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -95,7 +97,7 @@
const { proxy } = getCurrentInstance();
const { aps_plant_status } = proxy.useDict('aps_plant_status');
const height = ref(document.documentElement.clientHeight - 170 + "px;");
const height = ref(document.documentElement.clientHeight - 160 + "px;");
const plantNameRules = ref(null);
const plantCodeRules = ref(null);
const dataForm = ref();
src/views/basicData/apsShop/index.vue
@@ -31,7 +31,7 @@
          v-hasPermi="['shop:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
      <right-toolbar :search="false"  @refreshTable="getList"></right-toolbar>
    </el-row>
    <HxlhTable
@@ -102,7 +102,7 @@
const { proxy } = getCurrentInstance();
const { aps_plant_status } = proxy.useDict('aps_plant_status');
const height = ref(document.documentElement.clientHeight - 170 + "px;");
const height = ref(document.documentElement.clientHeight - 160 + "px;");
const shopNameRules = ref(null);
const shopCodeRules = ref(null);
const plantCodeRules = ref(null);
src/views/basicData/bom/index.vue
@@ -70,7 +70,7 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
         @refreshTable="getList"
      ></right-toolbar>
    </el-row>
src/views/basicData/calendar/index.vue
@@ -94,7 +94,8 @@
      </el-col> -->
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
src/views/basicData/event/index.vue
@@ -94,7 +94,9 @@
          v-hasPermi="['core:event:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"></right-toolbar>
    </el-row>
    <HxlhTable
@@ -222,7 +224,7 @@
const processList = ref([]);
const calendarList = ref([]);
const height = ref(document.documentElement.clientHeight - 230 + "px;")
const height = ref(document.documentElement.clientHeight - 210 + "px;")
// 多选框选中数据
const handleCheckboxChange = (data) => {
src/views/basicData/gasMaterialUsage/index.vue
@@ -68,7 +68,9 @@
        >导入
        </el-button>
      </el-col>
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"></right-toolbar>
    </el-row>
    <HxlhTable
        style="width: 100%"
@@ -156,7 +158,7 @@
const total = ref(0);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 270 + "px;")
const height = ref(document.documentElement.clientHeight - 210 + "px;")
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);
src/views/basicData/materialManagement/index.vue
@@ -22,7 +22,10 @@
    </el-form>
    <el-row :gutter="10" class="mb8">
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -63,7 +66,7 @@
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 230 + "px;")
const height = ref(document.documentElement.clientHeight - 210 + "px;")
const data = reactive({
  form: {},
src/views/basicData/materialStorageManagement/index.vue
@@ -22,7 +22,10 @@
    </el-form>
    <el-row :gutter="10" class="mb8">
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -55,7 +58,7 @@
const single = ref(true);
const multiple = ref(true);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 230 + "px;")
const height = ref(document.documentElement.clientHeight - 210 + "px;")
const queryPlants = ref({status: 1});
const plantList = ref([]);
src/views/basicData/processRouteDataPreparate/index.vue
@@ -72,7 +72,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
src/views/basicData/resourceGroup/index.vue
@@ -56,7 +56,10 @@
          v-hasPermi="['ApsResourceGroup:ApsResourceGroup:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -175,7 +178,7 @@
const title = ref("");
const daterangeRequestDate = ref([]);
//弹窗相关
const height = ref(document.documentElement.clientHeight - 230 + "px;")
const height = ref(document.documentElement.clientHeight - 210 + "px;")
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);
src/views/demand/planManage/index.vue
@@ -10,7 +10,7 @@
      label-position="left"
    >
      <el-row type="flex" justify="left" :gutter="20">
        <el-col :span="5">
        <el-col :span="6">
          <el-form-item label="计划名称" prop="name">
            <el-input
              style="width: 140px"
@@ -21,14 +21,14 @@
            />
          </el-form-item>
        </el-col>
        <el-col :span="19" style="text-align: right">
        <!-- <el-col :span="19" style="text-align: right">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery"
              >查询</el-button
            >
            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-col>
        </el-col> -->
      </el-row>
    </el-form>
src/views/mainPlan/abnormalPartNumberReport/index.vue
@@ -61,7 +61,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -103,7 +104,7 @@
});
const { queryParams, form, rules } = toRefs(data);
const plantList = ref([]);
const height = ref(document.documentElement.clientHeight - 220 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
// 表格配置-列表
const columns = ref([]);
// 分页属性
src/views/mainPlan/abnormalProcessAnalysis/index.vue
@@ -10,7 +10,7 @@
          v-hasPermi="['abnormalAnalysis:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
      <right-toolbar :search="false" @refreshTable="getList"></right-toolbar>
    </el-row>
    <HxlhTable
        style="width: 100%"
@@ -40,7 +40,7 @@
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 180 + "px;")
const height = ref(document.documentElement.clientHeight - 160 + "px;")
const data = reactive({
  form: {},
src/views/mainPlan/gasPiping/index.vue
@@ -116,7 +116,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
@@ -282,7 +283,7 @@
const total = ref(0);
const daterangePlanStartDay = ref([]);
const daterangePlanEndDay = ref([]);
const height = ref(document.documentElement.clientHeight - 270 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);
src/views/mainPlan/gasPlanning/index.vue
@@ -57,16 +57,13 @@
      </el-row>
    </el-form>
    <!-- <div class="box_container"> -->
    <el-row v-if="!clickedTableRefGas">
      <el-col :span="24" style="text-align: right; margin-bottom: 10px">
        <el-button class="title_btn" type="default" @click="editRowEventGas">{{
    <el-row>
      <el-col :span="12" style="margin-bottom: 10px">
        <el-button v-if="!clickedTableRefGas" class="title_btn" plain type="default" @click="editRowEventGas">{{
          $t("common.common.edit")
        }}</el-button>
      </el-col>
    </el-row>
    <el-row v-if="clickedTableRefGas">
      <el-col :span="24" style="text-align: right; margin-bottom: 10px">
        <el-button
          v-if="clickedTableRefGas"
          class="title_btn"
          type="primary"
          @click="saveRowEvent1"
@@ -75,12 +72,18 @@
          {{ $t("common.common.save") }}
        </el-button>
        <el-button
          v-if="clickedTableRefGas"
          class="title_btn ml20"
          type="default"
          @click="handleCancleStausGas"
          >{{ $t("common.common.cancel") }}</el-button
        >
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <!-- <div class="tabel_container"> -->
    <!-- <HxlhTable
@@ -319,7 +322,7 @@
// import { ElMessage } from "element-plus";
import { listGasPlan, getGasPlanSave } from "@/api/mainPlan/gasPlanning";
import { useI18n } from "vue-i18n"; //要在js中使用国际化
const height = ref(document.documentElement.clientHeight - 230 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
const { t, locale } = useI18n();
const { proxy } = getCurrentInstance();
const { aps_factory } = proxy.useDict("aps_factory");
src/views/mainPlan/gasProduceStatics/index.vue
@@ -9,7 +9,7 @@
      label-position="left"
    >
      <el-row :gutter="20">
        <el-col :span="8">
        <el-col :span="6">
          <el-form-item :label="$t('plan.query.statistical')" :style="{ width: '100%' }">
            <el-select
              v-model="queryParams.searchType"
@@ -25,9 +25,9 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="8">
        <el-col :span="6">
          <el-form-item
            :style="{ width: '100%' }"
            :style="{ width: '250px' }"
            :label="
              !dayCom
                ? $t('plan.query.selectDateRange')
@@ -36,6 +36,7 @@
          >
            <div v-if="!dayCom">
              <el-date-picker
               :style="{ width: '100%' }"
                v-model="queryParams.monthRange"
                type="monthrange"
                :range-separator="$t('plan.placeholder.to')"
@@ -45,6 +46,7 @@
            </div>
            <div v-else>
              <el-date-picker
                 :style="{ width: '100%' }"
                v-model="queryParams.monthDays"
                type="month"
                :placeholder="$t('plan.placeholder.selectMonth')"
@@ -52,7 +54,7 @@
            </div>
          </el-form-item>
        </el-col>
        <el-col :span="8" v-if="dayCom">
        <el-col :span="6" v-if="dayCom">
          <el-form-item
            :label="$t('basic.table.applicableFactories')"
            prop="plant"
@@ -131,7 +133,7 @@
const { aps_factory } = proxy.useDict("aps_factory");
const loading = ref(false);
const gridRef = ref();
const height = ref(document.documentElement.clientHeight - 180 + "px;");
const height = ref(document.documentElement.clientHeight - 170 + "px;");
const headers = ref([]);
// const exportData = ref([]);
const showSearch = ref(true);
src/views/mainPlan/pipePlanning/index.vue
@@ -53,22 +53,13 @@
      </el-row>
    </el-form>
    <!-- <div class="box_container"> -->
    <el-row v-if="!clickedTableRef">
      <!-- <el-col :span="!clickedTableRef?22:20">
          <div class="title_text">{{$t('plan.title.pipePlanCapacity')}}</div>
        </el-col> -->
      <el-col
        :span="24"
        style="text-align: right; margin-bottom: 10px"
      >
        <el-button class="title_btn" type="default" @click="editRowEvent">{{
    <el-row>
      <el-col :span="12" style="margin-bottom: 10px">
        <el-button v-if="!clickedTableRef" class="title_btn" plain type="default" @click="editRowEvent">{{
          $t("common.common.edit")
        }}</el-button>
      </el-col>
    </el-row>
    <el-row v-if="clickedTableRef">
      <el-col :span="24" style="text-align: right; margin-bottom: 10px" >
        <el-button
          v-if="clickedTableRef"
          class="title_btn"
          type="primary"
          @click="saveRowEvent"
@@ -77,12 +68,18 @@
          {{ $t("common.common.save") }}
        </el-button>
        <el-button
          v-if="clickedTableRef"
          class="title_btn ml20"
          type="default"
          @click="handleCancleStaus"
          >{{ $t("common.common.cancel") }}</el-button
        >
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <vxe-table
      border
@@ -309,7 +306,7 @@
<script setup name="GasPlanning">
// import { ElMessage } from "element-plus";
import { listGasPlan, getGasPlanSave } from "@/api/mainPlan/gasPlanning";
const height = ref(document.documentElement.clientHeight - 230 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
import { useI18n } from "vue-i18n"; //要在js中使用国际化
const { t, locale } = useI18n();
const { proxy } = getCurrentInstance();
src/views/mainPlan/pipeProduceStatics/index.vue
@@ -8,72 +8,84 @@
      v-show="showSearch"
      label-position="left"
    >
      <el-row :gutter="20">
        <el-col :span="8">
          <el-form-item :label="$t('plan.query.statistical')" :style="{ width: '100%' }">
            <el-select
              v-model="queryParams.searchType"
              placeholder="Select"
              @change="handleChangeSelectType"
      <el-form
        class="responsive-form"
        :model="queryParams"
        ref="queryRef"
        :inline="true"
        v-show="showSearch"
        label-position="left"
      >
        <el-row :gutter="20">
          <el-col :span="6">
            <el-form-item
              :label="$t('plan.query.statistical')"
              :style="{ width: '100%' }"
            >
              <el-option
                v-for="item in options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item
            :label="
              !dayCom
                ? $t('plan.query.selectDateRange')
                : $t('plan.query.selectDateMonth')
            "
            :style="{ width: '100%' }"
          >
            <div v-if="!dayCom">
              <el-date-picker
                v-model="queryParams.monthRange"
                type="monthrange"
                :range-separator="$t('plan.placeholder.to')"
                :start-placeholder="$t('plan.placeholder.startMonth')"
                :end-placeholder="$t('plan.placeholder.endMonth')"
              />
            </div>
            <div v-else>
              <el-date-picker
                v-model="queryParams.monthDays"
                type="month"
                :placeholder="$t('plan.placeholder.selectMonth')"
              />
            </div>
          </el-form-item>
        </el-col>
        <el-col :span="8" v-if="dayCom">
          <el-form-item
            :label="$t('basic.table.applicableFactories')"
            prop="plant"
            :style="{ width: '100%' }"
          >
            <el-select
              clearable
              v-model="queryParams.applicableFactory"
              :placeholder="$t('basic.table.applicableFactories')"
              <el-select
                v-model="queryParams.searchType"
                placeholder="Select"
                @change="handleChangeSelectType"
              >
                <el-option
                  v-for="item in options"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item
              :style="{ width: '100%' }"
              :label="
                !dayCom
                  ? $t('plan.query.selectDateRange')
                  : $t('plan.query.selectDateMonth')
              "
            >
              <el-option
                v-for="item in aps_factory"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              />
            </el-select>
          </el-form-item>
        </el-col>
        <!-- <el-col :span="6" style="text-align:right;">
              <div v-if="!dayCom">
                <el-date-picker
                  :style="{ width: '250px' }"
                  v-model="queryParams.monthRange"
                  type="monthrange"
                  :range-separator="$t('plan.placeholder.to')"
                  :start-placeholder="$t('plan.placeholder.startMonth')"
                  :end-placeholder="$t('plan.placeholder.endMonth')"
                />
              </div>
              <div v-else>
                <el-date-picker
                  :style="{ width: '100%' }"
                  v-model="queryParams.monthDays"
                  type="month"
                  :placeholder="$t('plan.placeholder.selectMonth')"
                />
              </div>
            </el-form-item>
          </el-col>
          <el-col :span="6" v-if="dayCom">
            <el-form-item
              :label="$t('basic.table.applicableFactories')"
              prop="plant"
              :style="{ width: '100%' }"
            >
              <el-select
                clearable
                v-model="queryParams.applicableFactory"
                :placeholder="$t('basic.table.applicableFactories')"
              >
                <el-option
                  v-for="item in aps_factory"
                  :key="item.value"
                  :label="item.label"
                  :value="item.value"
                />
              </el-select>
            </el-form-item>
          </el-col>
          <!-- <el-col :span="6" style="text-align:right;">
          <el-form-item class="column-with-margin">
            <el-button type="primary" icon="Search" @click="handleQuery">{{
              $t("common.common.query")
@@ -83,7 +95,8 @@
            }}</el-button>
          </el-form-item>
        </el-col> -->
      </el-row>
        </el-row>
      </el-form>
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
@@ -136,7 +149,7 @@
const { aps_factory } = proxy.useDict("aps_factory");
const loading = ref(false);
const gridRef = ref();
const height = ref(document.documentElement.clientHeight - 180 + "px;");
const height = ref(document.documentElement.clientHeight - 170 + "px;");
const headers = ref([]);
const exportData = ref([]);
const showSearch = ref(true);
@@ -236,9 +249,7 @@
  if (list) {
    return list
      .map((type) => {
        const item = aps_factory.value.find(
          (item) => item.value === type
        );
        const item = aps_factory.value.find((item) => item.value === type);
        return item ? item.label : type;
      })
      .join("");
@@ -295,7 +306,7 @@
          ],
          width: 160,
        });
      }else{
      } else {
        colList.push({
          field: "dateCol",
          title: t("plan.table.dateYearMonth"),
@@ -306,7 +317,7 @@
              title: t("plan.table.processName"),
              width: 250,
              type: "html",
            }
            },
          ],
          width: 160,
        });
@@ -364,11 +375,13 @@
          //   ? `<div class='el-badge'><sup class="el-badge__content is-fixed is-dot"></sup>${key}</div>`
          //   : key;
          if (!dayCom.value) {
            const lastIndex = key.lastIndexOf('_');
            const lastIndex = key.lastIndexOf("_");
            item[`resourceName`] = key.slice(0, lastIndex);
            item[`resourceGroupName`] = formatTypeLabelPlant([key.slice(lastIndex + 1)]);
          }else{
            item[`resourceName`] = key
            item[`resourceGroupName`] = formatTypeLabelPlant([
              key.slice(lastIndex + 1),
            ]);
          } else {
            item[`resourceName`] = key;
          }
        }
        dataList.push(item);
src/views/mainPlan/platePlan/index.vue
@@ -282,7 +282,7 @@
const daterangePlanStartDay = ref([]);
const daterangePlanEndDay = ref([]);
const height = ref(document.documentElement.clientHeight - 270 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);
src/views/mainPlan/platePlanList/index.vue
@@ -55,7 +55,7 @@
        >
      </el-col>
      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
      <right-toolbar :search="false" @refreshTable="getList"></right-toolbar>
    </el-row>
    <HxlhTable
src/views/mainPlan/plateProcessStat/index.vue
@@ -128,7 +128,7 @@
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const height = ref(document.documentElement.clientHeight - 220 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
const data = reactive({
  // form: {},
src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -104,7 +104,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -318,7 +319,7 @@
const shopList = ref([]);
const allShopList = ref([]);
const processList = ref([]);
const height = ref(document.documentElement.clientHeight - 320 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
const heightSub = ref(document.documentElement.clientHeight - 200 + "px;");
const heightSubUpdate = ref(document.documentElement.clientHeight - 270 + "px;");
// 表格配置-列表
src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -63,7 +63,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -103,7 +104,7 @@
});
const { queryParams } = toRefs(data);
const plantList = ref([]);
const height = ref(document.documentElement.clientHeight - 220 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
// 表格配置-列表
const columns = ref([]);
// 分页属性
src/views/mainPlan/sheetMetalSupplyGap/index.vue
@@ -61,7 +61,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -109,7 +110,7 @@
});
const { queryParams } = toRefs(data);
const plantList = ref([]);
const height = ref(document.documentElement.clientHeight - 220 + "px;");
const height = ref(document.documentElement.clientHeight - 210 + "px;");
// 表格配置-列表
const columns = ref([]);
// 分页属性
src/views/mainPlan/weldSeam/index.vue
@@ -21,7 +21,7 @@
          >{{ $t("common.common.export") }}</el-button
        >
      </el-col>
      <right-toolbar :search="false" @queryTable="getList"></right-toolbar>
      <right-toolbar :search="false" @refreshTable="getList"></right-toolbar>
    </el-row>
    <HxlhTable
@@ -268,7 +268,7 @@
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);
const height = ref(document.documentElement.clientHeight - 170 + "px;");
const height = ref(document.documentElement.clientHeight - 160 + "px;");
const exampleHeight = ref("500px");
const uploadRef = ref();
const exampleList = ref([]);
src/views/mainPlan/weldSeamEcharts/index.vue
@@ -30,6 +30,13 @@
                    </el-row>
                </el-form>
            </el-col>
            <el-col style="display:flex; justify-content:flex-end; align-items:center; margin-bottom:10px;">
                <right-toolbar
                    v-model:showSearch="showSearch"
                    @queryTable="handleQuery"
                    @resetTable="resetQuery"
                ></right-toolbar>
            </el-col>
            <el-col>
                <div ref="chartRef" :style="{ width:width,height:height,border: '1px solid #ccc' }" v-loading="loading">
                    <div style="text-align: center;margin-top: 50px;color: #999;">暂无数据</div>
@@ -53,10 +60,10 @@
    });
    const { queryParams } = toRefs(data);
    const chartRef = ref(null);
    const height = ref(document.documentElement.clientHeight - 180 + "px");
    const height = ref(document.documentElement.clientHeight - 220 + "px");
    const width = ref(document.documentElement.clientWidth - 240 + "px");
    
    const showSearch = ref(false);
    const showSearch = ref(true);
    const loading = ref(false);
    /* const dataList = [
src/views/mainPlan/workOrderJobLog/index.vue
@@ -28,7 +28,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="请求结果" prop="result">
          <el-form-item label="请求结果" prop="result" style="width: 100%;">
            <el-input
                v-model="queryParams.result"
                placeholder="请输入请求结果"
@@ -38,7 +38,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="响应数据" prop="requestData">
          <el-form-item label="响应数据" prop="requestData" style="width: 100%;">
            <el-input
                v-model="queryParams.responseData"
                placeholder="请输入响应数据"
@@ -73,7 +73,10 @@
        >查看</el-button>
      </el-col>
      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
      <right-toolbar v-model:showSearch="showSearch"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
    <HxlhTable
@@ -219,8 +222,6 @@
/** 搜索按钮操作 */
function handleQuery() {
  getList();
}
src/views/partPlan/index.vue
@@ -114,7 +114,8 @@
      </el-col>
      <right-toolbar
        v-model:showSearch="showSearch"
        @queryTable="getList"
        @queryTable="handleQuery"
        @resetTable="resetQuery"
      ></right-toolbar>
    </el-row>
@@ -305,7 +306,7 @@
const total = ref(0);
const daterangePlanStartDay = ref([]);
const daterangePlanEndDay = ref([]);
const height = ref(document.documentElement.clientHeight - 270 + "px;");
const height = ref(document.documentElement.clientHeight - 220 + "px;");
const isVisible = ref(false);
const isError = ref(false);
const planned = ref(true);