hdy
2024-03-12 9a80017dfb643f66af44c142f84d8a6d8af42682
设备保养新增修改
已修改2个文件
333 ■■■■ 文件已修改
jcdm-ui/src/views/main/em/inspectionItems/index.vue 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/em/inspectionPlan/index.vue 221 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jcdm-ui/src/views/main/em/inspectionItems/index.vue
@@ -18,26 +18,16 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
<!--          <el-form-item label="项目类型" prop="itemsType">-->
<!--            <el-select v-model="queryParams.itemsType" placeholder="请选择项目类型" clearable>-->
<!--              <el-option-->
<!--                v-for="dict in dict.type.${dictType}"-->
<!--                :key="dict.value"-->
<!--                :label="dict.label"-->
<!--                :value="dict.value"-->
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
<!--          <el-form-item label="是否启用" prop="status">-->
<!--            <el-select v-model="queryParams.status" placeholder="请选择是否启用" clearable>-->
<!--              <el-option-->
<!--                v-for="dict in dict.type.${dictType}"-->
<!--                :key="dict.value"-->
<!--                :label="dict.label"-->
<!--                :value="dict.value"-->
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
          <el-form-item label="项目类型" prop="itemsType">
            <el-select v-model="queryParams.itemsType" placeholder="请选择项目类型" clearable>
              <el-option
                v-for="dict in dict.type.spotmaintenance"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -94,20 +84,23 @@
        <el-table border v-loading="loading" :data="inspectionItemsList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="ID" align="center" prop="id" />
          <el-table-column label="项目编号" align="center" prop="itemsCode">
          </el-table-column>
          <el-table-column label="项目名称" align="center" prop="itemsName">
          </el-table-column>
          <el-table-column label="项目编号" align="center" prop="itemsCode">
          </el-table-column>
          <el-table-column label="项目类型" align="center" prop="itemsType">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.spotmaintenance" :value="scope.row.itemsType"/>
            </template>
          </el-table-column>
          <el-table-column label="是否启用" align="center" prop="status">
          </el-table-column>
          <el-table-column label="标准" align="center" prop="standard">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.status"/>
            </template>
          </el-table-column>
          <el-table-column label="项目内容" align="center" prop="itemsContent">
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remark">
          <el-table-column label="标准" align="center" prop="standard">
          </el-table-column>
          <el-table-column label="创建人" align="center" prop="createUser">
          </el-table-column>
@@ -116,28 +109,6 @@
          <el-table-column label="更新人" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column label="更新时间" align="center" prop="updateTime">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="success"
                plain
                style="width: 72px"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['em:inspectionItems:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['em:inspectionItems:remove']"
              >删除</el-button>
            </template>
          </el-table-column>
        </el-table>
    </el-card>
@@ -157,39 +128,35 @@
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="项目编号" prop="itemsCode">
          <el-input v-model="form.itemsCode" placeholder="请输入项目编号" />
        </el-form-item>
        <el-form-item label="项目名称" prop="itemsName">
          <el-input v-model="form.itemsName" placeholder="请输入项目名称" />
        </el-form-item>
        <el-form-item label="项目编号" prop="itemsCode">
          <el-input v-model="form.itemsCode" placeholder="请输入项目编号" />
        </el-form-item>
        <el-form-item label="项目类型" prop="itemsType">
<!--          <el-select v-model="form.itemsType" placeholder="请选择项目类型">-->
<!--            <el-option-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            ></el-option>-->
<!--          </el-select>-->
          <el-radio-group v-model="form.itemsType">
            <el-radio
              v-for="dict in dict.type.spotmaintenance"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="是否启用" prop="status">
<!--          <el-radio-group v-model="form.status">-->
<!--            <el-radio-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.value"-->
<!--            >{{dict.label}}</el-radio>-->
<!--          </el-radio-group>-->
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in dict.type.sys_yes_no"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="项目内容"prop="itemsContent"  >
          <el-input v-model="form.itemsContent" placeholder="请输入项目内容"/>
        </el-form-item>
        <el-form-item label="标准" prop="standard">
          <el-input v-model="form.standard" placeholder="请输入标准" />
        </el-form-item>
        <el-form-item label="项目内容">
          <editor v-model="form.itemsContent" :min-height="192"/>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -205,6 +172,7 @@
export default {
  name: "InspectionItems",
  dicts: ['sys_yes_no','spotmaintenance'],
  data() {
    return {
      // 遮罩层
jcdm-ui/src/views/main/em/inspectionPlan/index.vue
@@ -18,39 +18,27 @@
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
<!--          <el-form-item label="计划类型" prop="planType">-->
<!--            <el-select v-model="queryParams.planType" placeholder="请选择计划类型" clearable>-->
<!--              <el-option-->
<!--                v-for="dict in dict.type.${dictType}"-->
<!--                :key="dict.value"-->
<!--                :label="dict.label"-->
<!--                :value="dict.value"-->
<!--              />-->
<!--            </el-select>-->
<!--          </el-form-item>-->
          <el-form-item label="状态" prop="state">
            <el-input
              v-model="queryParams.state"
              placeholder="请输入状态"
              clearable
              @keyup.enter.native="handleQuery"
            />
          <el-form-item label="状态" prop="status">
            <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
              <el-option
                v-for="dict in dict.type.plan_status"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            </el-select>
          </el-form-item>
          <el-form-item label="频率" prop="frequency">
            <el-input
              v-model="queryParams.frequency"
              placeholder="请输入频率"
              clearable
              @keyup.enter.native="handleQuery"
            />
          </el-form-item>
          <el-form-item label="维度" prop="dimension">
            <el-input
              v-model="queryParams.dimension"
              placeholder="请输入维度"
              clearable
              @keyup.enter.native="handleQuery"
            />
          <el-form-item label-width="130" label="开始时间" prop="startTime">
            <el-date-picker
              v-model="queryParams.startTime"
              type="datetimerange"
              :picker-options="pickerOptions"
              value-format="yyyy-MM-dd HH:mm:ss"
              range-separator="至"
              start-placeholder="开始日期"
              end-placeholder="结束日期"
              align="right">
            </el-date-picker>
          </el-form-item>
          <el-form-item style="float: right">
            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -108,24 +96,23 @@
        <el-table border v-loading="loading" :data="inspectionPlanList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="55" align="center" />
          <el-table-column label="ID" align="center" prop="id" />
          <el-table-column label="计划编号" align="center" prop="planCode">
          </el-table-column>
          <el-table-column label="计划名称" align="center" prop="planName">
          </el-table-column>
          <el-table-column label="计划类型" align="center" prop="planType">
          <el-table-column label="计划编号" align="center" prop="planCode">
          </el-table-column>
          <el-table-column label="状态" align="center" prop="state">
          <el-table-column label="计划类型" align="center" prop="planType">
          </el-table-column>
          <el-table-column label="频率" align="center" prop="frequency">
          </el-table-column>
          <el-table-column label="维度" align="center" prop="dimension">
          </el-table-column>
          <el-table-column label="上次生成时间" align="center" prop="lastGenerationTime">
          </el-table-column>
          <el-table-column label="开始时间" align="center" prop="startTime">
          </el-table-column>
          <el-table-column label="结束时间" align="center" prop="endTime">
          </el-table-column>
          <el-table-column label="状态" align="center" prop="state">
          </el-table-column>
          <el-table-column label="上次生成时间" align="center" prop="lastGenerationTime">
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remarks">
          </el-table-column>
@@ -136,28 +123,6 @@
          <el-table-column label="修改时间" align="center" prop="updateTime">
          </el-table-column>
          <el-table-column label="修改人" align="center" prop="updateUser">
          </el-table-column>
          <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width">
            <template slot-scope="scope">
              <el-button
                size="mini"
                type="success"
                plain
                style="width: 72px"
                icon="el-icon-edit"
                @click="handleUpdate(scope.row)"
                v-hasPermi="['em:inspectionPlan:edit']"
              >修改</el-button>
              <el-button
                size="mini"
                type="danger"
                plain
                style="width: 72px"
                icon="el-icon-delete"
                @click="handleDelete(scope.row)"
                v-hasPermi="['em:inspectionPlan:remove']"
              >删除</el-button>
            </template>
          </el-table-column>
        </el-table>
    </el-card>
@@ -171,39 +136,72 @@
    />
    <!-- 添加或修改点检保养计划对话框 -->
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="500px" append-to-body>
    <el-dialog v-dialogpop-up :title="title" :visible.sync="open" width="1200px" append-to-body>
      <span slot="title">
        <i class="el-icon-s-order"></i>
        {{titleName}}
      </span>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      <el-form ref="form" inline :model="form" :rules="rules" label-width="80px" >
        <el-form-item label="计划名称" prop="planName" >
          <el-input style="width: 450px" v-model="form.planName" placeholder="请输入计划名称" />
        </el-form-item>
        <el-form-item label="计划编号" prop="planCode">
          <el-input v-model="form.planCode" placeholder="请输入计划编号" />
          <el-input style="width: 450px" v-model="form.planCode" placeholder="请输入计划编号" />
        </el-form-item>
        <el-form-item label="计划名称" prop="planName">
          <el-input v-model="form.planName" placeholder="请输入计划名称" />
        </el-form-item>
<!--        <el-form-item label="计划类型" prop="planType">-->
<!--          <el-select v-model="form.planType" placeholder="请选择计划类型">-->
<!--            <el-option-->
<!--              v-for="dict in dict.type.${dictType}"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="dict.value"-->
<!--            ></el-option>-->
<!--          </el-select>-->
<!--        </el-form-item>-->
        <el-form-item label="状态" prop="state">
          <el-input v-model="form.state" placeholder="请输入状态" />
          <el-radio-group style="width: 450px" v-model="form.status">
            <el-radio
              v-for="dict in dict.type.plan_status"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="计划类型" prop="state">
          <el-radio-group style="width: 450px" v-model="form.planType">
            <el-radio
              v-for="dict in dict.type.plan_type"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="频率" prop="frequency">
          <el-input v-model="form.frequency" placeholder="请输入频率" />
          <el-input style="width: 450px" v-model="form.frequency" placeholder="请输入频率" />
        </el-form-item>
        <el-form-item label="维度" prop="dimension">
          <el-input v-model="form.dimension" placeholder="请输入维度" />
          <el-select v-model="form.dimension" placeholder="请选择维度" style="width: 450px">
            <el-option
              v-for="dict in dict.type.dimension"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value">
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="开始时间" prop="startTime">
          <el-date-picker
            style="width: 450px"
            clearable
            v-model="form.startTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择出站时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="结束时间" prop="endTime">
          <el-date-picker
            style="width: 450px"
            clearable
            v-model="form.endTime"
            type="date"
            value-format="yyyy-MM-dd"
            placeholder="请选择出站时间">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" placeholder="请输入备注" />
          <el-input style="width: 1000px" v-model="form.remarks" placeholder="请输入备注" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -219,6 +217,7 @@
export default {
  name: "InspectionPlan",
  dicts: ['plan_status','plan_type','dimension'],
  data() {
    return {
      // 遮罩层
@@ -258,9 +257,65 @@
      // 表单校验
      rules: {
        id: [
          { required: true, message: "ID不能为空", trigger: "blur" }
          { required: true, message: "id不能为空", trigger: "blur" }
        ],
      }
        planName: [
          { required: true, message: "计划名称不能为空", trigger: "blur" }
        ],
        planCode: [
          { required: true, message: "计划编号不能为空", trigger: "blur" }
        ],
        planType: [
          { required: true, message: "计划类型不能为空", trigger: "blur" }
        ],
        dimension: [
          { required: true, message: "维度不能为空", trigger: "blur" }
        ],
        frequency: [
          { required: true, message: '频率不能为空', trigger: 'blur' },
          {
            validator: (rule, value, callback) => {
              if (value === '' || value === undefined || value === null) {
                callback(new Error('频率不能为空'));
              } else if (!Number.isInteger(Number(value))) {
                callback(new Error('频率必须是整数'));
              } else {
                callback();
              }
            },
            trigger: 'blur'
          }
        ],
      },
      pickerOptions: {
        shortcuts: [{
          text: '最近一周',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
            picker.$emit('pick', [start, end]);
          },
          class: 'custom-shortcut' // 添加class属性
        }, {
          text: '最近一个月',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
            picker.$emit('pick', [start, end]);
          },
          class: 'custom-shortcut' // 添加class属性
        }, {
          text: '最近三个月',
          onClick(picker) {
            const end = new Date();
            const start = new Date();
            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
            picker.$emit('pick', [start, end]);
          },
        }]
      },
    };
  },
  created() {