Xiugai

Your Name

2022-08-22 f12c45e54d27f27886d8bc9ee96624979fa7de2e

Xiugai

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_13_54_[Default_Changelist]/shelved.patch

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_13_54__Default_Changelist_.xml

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_17_08_[Default_Changelist]/shelved.patch

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_17_08__Default_Changelist_.xml

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_17_14_[Default_Changelist]/shelved.patch

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_17_14__Default_Changelist_.xml

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_17_48_[Default_Changelist]/shelved.patch

文件已删除

 .idea/shelf/Uncommitted_changes_before_Update_at_2022_8_13_17_48__Default_Changelist_.xml

文件已删除

 src/views/doublePrevent/riskCheckManage/hiddenManagement/hiddenRectify/index.vue

@@ -280,7 +280,6 @@

        // 初始化表格数据
        const initRectifyTableData = async () => {
            debugger;
            if (state.rectifyData.params.serialCode.toString().length === 0) {
                let res = await hiddenRectifyApi().getHiddenRectifyList(state.rectifyData.params);
                if (res.data.code === '200') {

 src/views/intellectInspect/inspectBasic/discriminate/components/RFIDDialog.vue

@@ -129,7 +129,6 @@

        const getUploadUrl = async (rawFile: any) => {
            const res = await RFIDApi().getUploadUrl(rawFile.name);
            debugger;
            state.RFIDForm.rfidImage = res.data.rfidImage;
            state.uploadUrl = res.data.uploadUrl;
        };

 src/views/intellectInspect/inspectRecordManage/inspectRecord/components/inspectRecordDialog.vue

@@ -238,7 +238,7 @@
            data.classGroupList = JSON.parse(JSON.stringify(classGroupList));
            data.ifShowInspectTaskDialog = true;
            data.inspectPointConfirm = false;
            data.title = '查看巡检任务';
            data.title = '查看巡检记录';
            inspectRecordApi()
                .getInspectRecordById({ id: value.id, uuid: value.uuid })
                .then((res) => {

 src/views/intellectInspect/inspectRecordManage/inspectRecord/index.vue

@@ -60,7 +60,7 @@
                        <el-table-column prop="execUserName" label="执行人" show-overflow-tooltip></el-table-column>
                        <el-table-column property="taskStatus" label="任务状态">
                            <template #default="scope">
                                <el-tag :type="scope.row.taskStatus === 1 ? 'info' : scope.row.taskStatus === 2 ? 'primary' : scope.row.taskStatus === 3 ? 'success' : 'danger'">
                                <el-tag :type="scope.row.taskStatus === 1 ? 'info' : scope.row.taskStatus === 2 ? '' : scope.row.taskStatus === 3 ? 'success' : 'danger'">
                                    <span>
                                        {{ parseNumber(scope.row.taskStatus, '任务状态') }}
                                    </span>
@@ -170,12 +170,12 @@
                }
            },
            workTypeList: [
                { id: 1, name: '日常任务' },
                { id: 1, name: '单次任务' },
                { id: 2, name: '周期任务' }
            ],
            resultStatusList: [
                { id: 0, name: '正常' },
                { id: 1, name: '异常' }
                { id: 1, name: '存在异常' }
            ],
            taskStatusList: [
                { id: 1, name: '待巡检' },

 src/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue

@@ -1,6 +1,6 @@
<template>
    <div class="system-add-menu-container">
        <el-dialog v-model="ifShowInspectTaskDialog" :title="title">
        <el-dialog v-model="ifShowInspectTaskDialog" :title="title" :close-on-click-modal="false">
            <el-form :model="inspectTaskForm" label-width="120px" ref="inspectTaskFormRef" :rules="inspectTaskFormRules">
                <el-row>
                    <el-col :span="12" style="margin-bottom: 20px">
@@ -27,13 +27,15 @@
                            </el-select>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12" style="margin-bottom: 20px">
                    <el-col :span="12" style="margin-bottom: 20px" v-if="inspectTaskForm.workType === 2">
                        <el-form-item label="巡检周期" prop="checkCycle">
                            <el-input v-model="inspectTaskForm.checkCycle" @input="onVerifiyNumberInteger($event, 'checkCycle')" :disabled="!inspectPointConfirm" placeholder="请输入巡检周期" class="input-add">
                                <template #append>
                                    <el-form-item prop="checkCycleUnit">
                                    <el-select v-model="inspectTaskForm.checkCycleUnit" :disabled="!inspectPointConfirm" placeholder="选择单位">
                                        <el-option v-for="item in timeList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                                    </el-select>
                                    </el-form-item>
                                </template>
                            </el-input>
                        </el-form-item>
@@ -42,9 +44,11 @@
                        <el-form-item label="提前通知时间" prop="noticeTime">
                            <el-input @input="onVerifiyNumberInteger($event, 'noticeTime')" v-model="inspectTaskForm.noticeTime" :disabled="!inspectPointConfirm" placeholder="请输入提前通知时间" class="input-add">
                                <template #append>
                                    <el-form-item prop="noticeTimeUnit">
                                    <el-select v-model="inspectTaskForm.noticeTimeUnit" :disabled="!inspectPointConfirm" placeholder="选择单位">
                                        <el-option v-for="item in timeList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                                    </el-select>
                                    </el-form-item>
                                </template>
                            </el-input>
                        </el-form-item>
@@ -53,16 +57,18 @@
                        <el-form-item label="有效时间" prop="validTime">
                            <el-input v-model="inspectTaskForm.validTime" @input="onVerifiyNumberInteger($event, 'validTime')" :disabled="!inspectPointConfirm" placeholder="请输入有效时间" class="input-add">
                                <template #append>
                                    <el-form-item prop="noticeTimeUnit">
                                    <el-select v-model="inspectTaskForm.validTimeUnit" :disabled="!inspectPointConfirm" placeholder="选择单位">
                                        <el-option v-for="item in timeList" :key="item.id" :value="item.id" :label="item.name"></el-option>
                                    </el-select>
                                    </el-form-item>
                                </template>
                            </el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12" style="margin-bottom: 20px">
                        <el-form-item label="周期开始时间" prop="firstStartTime">
                            <el-date-picker v-model="inspectTaskForm.firstStartTime" :disabled="!inspectPointConfirm" placeholder="请选择周期开始时间" type="datetime" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" class="input-add" />
                        <el-form-item label="任务开始时间" prop="firstStartTime">
                            <el-date-picker v-model="inspectTaskForm.firstStartTime" :disabled="!inspectPointConfirm" placeholder="请选择任务开始时间" type="datetime" format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" class="input-add" />
                        </el-form-item>
                    </el-col>

@@ -130,13 +136,15 @@
                        </el-form-item>
                    </el-col>
                </el-row>
                <div align="right" v-show="inspectPointConfirm">
                    <el-button type="warning" @click="inspectPointDialog = false" size="default" plain>取消</el-button>
            </el-form>
            <template #footer>
                <div v-if="inspectPointConfirm" class="dialog-footer">
                    <el-button type="warning" @click="ifShowInspectTaskDialog = false" size="default" plain>取消</el-button>
                    <el-button type="primary" @click="submitInspectTask()" size="default">确认</el-button>
                </div>
            </el-form>
            </template>
        </el-dialog>
        <el-dialog v-model="inspectPointDialog" :title="pointTitle">
        <el-dialog v-model="inspectPointDialog" :title="pointTitle" :close-on-click-modal="false">
            <el-form :model="inspectPointForm" label-width="150px" ref="inspectPointFormRef" :rules="inspectPointFormRules">
                <el-form-item label="选择巡检点" prop="pointId">
                    <el-select v-model="inspectPointForm.pointId" @change="giveRegionAndRFID" class="input-add">
@@ -196,11 +204,10 @@

<script lang="ts">
import { reactive, toRefs, ref } from 'vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { ElMessage } from 'element-plus/es';
import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask';
import { facilityAreaApi } from '/@/api/intellectInspectSystem/facilityAreaManage';
import { verifiyNumberInteger } from '/@/utils/toolsValidate';

interface dataState {
    title: string;
    pointTitle: string;
@@ -284,6 +291,7 @@
    name: 'inspectTaskDialog',
    setup(props: any, context: any) {
        const inspectTaskFormRef = ref();
        const inspectPointFormRef = ref();
        const data = reactive<dataState>({
            title: '',
            pointTitle: '',
@@ -332,11 +340,21 @@
                execClassgroupId: [{ required: true, message: '请选择巡检班组', trigger: 'change' }],
                execDepId: [{ required: true, message: '请选择巡检部门', trigger: 'blur' }],
                checkCycle: [{ required: true, message: '请填写巡检周期', trigger: 'blur' }],
                checkCycleUnit: [{ required: true, message: '请选择巡检周期单位', trigger: 'change' }],
                noticeTime: [{ required: true, message: '请填写提前通知时间', trigger: 'blur' }],
                noticeTimeUnit: [{ required: true, message: '请选择提前通知时间单位', trigger: 'change' }],
                validTime: [{ required: true, message: '请填写有效时间', trigger: 'blur' }],
                validTimeUnit: [{ required: true, message: '请选择有效时间单位', trigger: 'change' }],
                firstStartTime: [{ required: true, message: '请选择周期开始时间', trigger: 'change' }]
            },
            inspectPointFormRules: {},
            inspectPointFormRules: {
                pointId: [{ required: true, message: '请选择巡检点', trigger: 'change' }],
                regionId: [{ required: true, message: '', trigger: 'change' }],
                rfidId: [{ required: true, message: '', trigger: 'change' }],
                quotaId: [{ required: true, message: '请选择巡检指标', trigger: 'change' }],
                quotaUnit: [{ required: true, message: '请填写巡检指标单位', trigger: 'blur' }],
                dataReportType: [{ required: true, message: '请选择巡检指标单位', trigger: 'change' }]
            },
            workTypeList: [],
            departmentList: [],
            timeList: [],
@@ -461,7 +479,9 @@
            }
        };

        const submitInspectPoint = async () => {
        const submitInspectPoint = () => {
            inspectPointFormRef.value.validate(async (valid: Boolean) => {
                if (valid) {
            if (data.title === '新增巡检任务' && data.pointTitle === '新增巡检点') {
                if (data.inspectTaskForm.points.length === 0) {
                    data.inspectPointForm.execSequence = 1;
@@ -471,7 +491,6 @@
                data.inspectTaskForm.points.push(data.inspectPointForm);
                data.inspectPointDialog = false;
            } else if (data.title === '新增巡检任务' && data.pointTitle === '修改巡检点') {
                debugger;
                let result = data.inspectTaskForm.points.findIndex((item) => item.execSequence === data.inspectPointForm.execSequence);
                data.inspectTaskForm.points[result] = data.inspectPointForm;
                data.inspectPointDialog = false;
@@ -516,6 +535,13 @@
                    });
                }
            }
                } else {
                    ElMessage({
                        type: 'warning',
                        message: '请完善基本信息'
                    });
                }
            });
        };
        const deleteFlow = async (index: number, item: { id: number }) => {
            if (data.pointTitle === '新增巡检点') {
@@ -612,6 +638,7 @@
            deleteFlow,
            giveQuotaUnit,
            giveClassGroup,
            inspectPointFormRef,
            onVerifiyNumberInteger,
            submitInspectTask,
            submitInspectPoint,

 src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue

@@ -175,7 +175,7 @@
                }
            },
            workTypeList: [
                { id: 1, name: '日常任务' },
                { id: 1, name: '单次任务' },
                { id: 2, name: '周期任务' }
            ],
            quotaList: [],

 src/views/specialWorkSystem/workFlow/approveRule/components/approveRuleDialog.vue

@@ -85,7 +85,6 @@
                                        </el-card>
                                    </div>
                                    <div v-show="disabled">
                                        <!--                                <el-button type="primary" size="default" @click="addFlow(index)">新增下一区域</el-button>-->
                                        <el-button type="primary" style="margin-left: 12px" size="default" @click="openApproveLevelDialog('修改', item)">修改</el-button>
                                        <el-button type="danger" size="default" @click="deleteApproveLevel(index, item)">删除</el-button>
                                    </div>
@@ -94,11 +93,13 @@
                        </el-form-item>
                    </el-col>
                </el-row>
                <div align="right" v-show="disabled">
            </el-form>
            <template #footer>
                <div v-show="disabled" class="dialog-footer">
                    <el-button type="warning" @click="ifShowApproveRuleDialog = false" size="default" plain>取消</el-button>
                    <el-button type="primary" @click="submitApproveRule()" size="default">确认</el-button>
                </div>
            </el-form>
            </template>
        </el-dialog>
        <approve-level-dialog ref="approveLevelDialogRef" @addApprovalLevel="achieveApprovalLevel"></approve-level-dialog>
    </div>
@@ -325,7 +326,6 @@

        const parseNumber = (type: string, value: number) => {
            if (type === '时间单位') {
                debugger;
                return data.timeList.find((item) => item.id === value)?.name;
            }
        };

 src/views/specialWorkSystem/workFlow/approveRule/index.vue

@@ -248,7 +248,6 @@
                type: 'warning'
            })
                .then(async () => {
                    debugger;
                    let res = await approveRuleApi().deleteApproveRule(state.deleteList);
                    if (res.data.code === '200') {
                        ElMessage({
@@ -281,7 +280,6 @@
        };

        const handleSelectionChange = (val: Array<deleteType>) => {
            debugger;
            state.deleteList.ids = val.map((item) => {
                return item.ruleId;
            }) as [];