Default Changelist

Admin

2022-08-23 86687e3e362499b05587ec4d83a6b1133ce0d2b5

Default Changelist

 src/api/intellectInspectSystem/inspectRecord/index.ts

@@ -24,6 +24,20 @@
                method: 'post',
                data: data
            });
        },
        getInspectRecordSum: (data: object) => {
            return request({
                url: import.meta.env.VITE_API_URL + `/SafeCheckTask/select/listTaskQuotaGbRegionGbQuotaGbPoint`,
                method: 'post',
                data: data
            });
        },

        getDayRecord: () => {
            return request({
                url: import.meta.env.VITE_API_URL + `/SafeCheckTask/select/listTaskByNoCheckTaskAndAbnormalTask`,
                method: 'get',
            });
        }
    };
}

 src/views/doublePrevent/dpIndex/index.vue

@@ -583,18 +583,6 @@
                align-items: center;
                min-height: 36px;
            }

            .topInfo {
                display: flex;
                align-items: center;
                font-size: 16px;
                font-weight: bold;

                & > div {
                    white-space: nowrap;
                    margin-right: 20px;
                }
            }
        }
    }
    .el-input {

 src/views/intellectInspect/inspectIndex/components/inspectRecordDialog.vue

@@ -17,14 +17,19 @@
                    </el-col>
                    <el-col :span="12" style="margin-bottom: 20px">
                        <el-form-item label="巡检部门" prop="execDepId">
                            <el-cascader @change="giveClassGroup" :disabled="!inspectPointConfirm" placeholder="请选择巡检部门" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" clearable filterable class="input-add" v-model="inspectTaskForm.execDepId"> </el-cascader>
                            <el-cascader @change="giveClassGroup" :disabled="!inspectPointConfirm" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" clearable filterable class="input-add" v-model="inspectTaskForm.execDepId"> </el-cascader>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12" style="margin-bottom: 20px">
                        <el-form-item label="巡检班组" prop="execClassgroupId">
                            <el-select v-model="inspectTaskForm.execClassgroupId" :disabled="!inspectPointConfirm" placeholder="请选择巡检班组" class="input-add">
                            <el-select v-model="inspectTaskForm.execClassgroupId" :disabled="!inspectPointConfirm" class="input-add">
                                <el-option v-for="item in classGroup" :key="item.id" :value="item.id" :label="item.groupName"></el-option>
                            </el-select>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12" style="margin-bottom: 20px">
                        <el-form-item label="巡检人" prop="execUserName">
                            <el-input v-model="inspectTaskForm.execUserName" :disabled="!inspectPointConfirm" class="input-add"> </el-input>
                        </el-form-item>
                    </el-col>
                    <el-col :span="12" style="margin-bottom: 20px">
@@ -38,10 +43,12 @@
                    <el-tabs class="active" v-model="activeName">
                        <el-tab-pane label="巡检链" name="inspectChain">
                            <el-table :data="inspectTaskForm.points" fit style="width: 100%">
                                <el-table-column type="index" label="序号" width="60" />
                                <el-table-column prop="region" label="巡检点" show-overflow-tooltip align="center"></el-table-column>
                                <el-table-column type="index" label="序号"/>
                                <el-table-column prop="point" label="巡检点" show-overflow-tooltip align="center"></el-table-column>
                                <el-table-column prop="region" label="所属设备" show-overflow-tooltip align="center"></el-table-column>
                                <el-table-column prop="rfid" label="RFID" show-overflow-tooltip align="center"></el-table-column>
                                <el-table-column prop="quotaContent" label="指标作业" show-overflow-tooltip align="center"></el-table-column>
                                <el-table-column prop="secondReferenceResult" label="参数值" show-overflow-tooltip align="center">
                                <el-table-column prop="secondReferenceResult" label="记录值" show-overflow-tooltip align="center">
                                    <template #default="scope">
                                        <div :style="{ color: scope.row.reportResult == 1 ? '#ff0000' : '#409eff' }">
                                            {{ scope.row.dataReportType == 1 ? '无' : scope.row.secondReferenceResult }}
@@ -52,7 +59,7 @@
                                <el-table-column prop="reportResult" label="结果" show-overflow-tooltip align="center">
                                    <template #default="scope">
                                        <div :style="{ color: scope.row.reportResult == 1 ? '#ff0000' : '#409eff' }">
                                            {{ scope.row.reportResult == 0 ? '正常' : scope.row.reportResult == 1 ? '异常' : '无' }}
                                            {{ scope.row.reportResult == 0 ? '正常' : scope.row.reportResult == 1 ? '存在异常' : '无' }}
                                        </div>
                                    </template>
                                </el-table-column>
@@ -62,6 +69,9 @@
                                <!--                                    </template>-->
                                <!--                                </el-table-column>-->
                            </el-table>
                        </el-tab-pane>
                        <el-tab-pane label="统计数据" name="allData">
                            <sum-data :sumData="taskAndQuotas"></sum-data>
                        </el-tab-pane>
                    </el-tabs>
                </div>
@@ -75,7 +85,7 @@
</template>

<script lang="ts">
import { reactive, toRefs, ref } from 'vue';
import { toRefs, reactive, defineComponent, ref, onMounted, defineAsyncComponent } from 'vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { ElMessage } from 'element-plus/es';
import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask';
@@ -83,6 +93,7 @@
import { inspectRecordApi } from '/@/api/intellectInspectSystem/inspectRecord';
interface dataState {
    title: string;
    taskAndQuotas: [],
    pointTitle: string;
    activeName: string;
    inspectPointConfirm: boolean;
@@ -93,6 +104,7 @@
        execClassgroupId: number | null;
        execDepId: number | null;
        id: number | null;
        execUserName: string;
        startTime: string | null;
        taskName: string | null;
        taskType: number | null;
@@ -150,12 +162,16 @@
    thirdReferenceSign: number | null;
    thirdReferenceValue: number | null;
}
export default {
export default defineComponent({
    name: 'inspectTaskDialog',
    components: {
        SumData: defineAsyncComponent(() => import('/@/views/intellectInspect/inspectIndex/components/sum.vue'))
    },
    setup(props: any, context: any) {
        const inspectTaskFormRef = ref();
        const data = reactive<dataState>({
            title: '',
            taskAndQuotas: [],
            pointTitle: '',
            activeName: 'inspectChain',
            inspectPointConfirm: false,
@@ -187,6 +203,7 @@
                execDepId: null,
                id: null,
                points: [],
                execUserName: '',
                startTime: null,
                taskName: null,
                taskType: null,
@@ -206,7 +223,7 @@
            ],
            firstReferenceValueList: [
                { id: 0, name: '正常' },
                { id: 1, name: '异常' }
                { id: 1, name: '存在异常' }
            ],
            secondReferenceSignList: [
                { id: 1, name: '>' },
@@ -249,7 +266,7 @@
            }
        };

        const showInspectRecordDialog = (type: string, item: { id: number; uuid: string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: []) => {
        const showInspectRecordDialog = (type: string, item: { id: number; uuid: string; execUserName:string }, workTypeList: [], department: [], timeType: [], classGroupList: [], quotaList: [], inspectPointAllList: []) => {
            data.quotaList = JSON.parse(JSON.stringify(quotaList));
            data.timeList = JSON.parse(JSON.stringify(timeType));
            data.inspectPointAllList = JSON.parse(JSON.stringify(inspectPointAllList));
@@ -258,7 +275,8 @@
            data.classGroupList = JSON.parse(JSON.stringify(classGroupList));
            data.ifShowInspectTaskDialog = true;
            data.inspectPointConfirm = false;
            data.title = '查看巡检任务';
            data.title = '查看巡检记录';
            getSum(item.id)
            inspectRecordApi()
                .getInspectRecordById({ id: item.id, uuid: item.uuid })
                .then((res) => {
@@ -266,7 +284,7 @@
                        data.inspectTaskForm.execDepId = res.data.data.execDepId;
                        giveClassGroup();
                        data.inspectTaskForm = JSON.parse(JSON.stringify(res.data.data));
                        console.log(data.inspectTaskForm, 'this data');
                        data.inspectTaskForm.execUserName = item.execUserName;
                    } else {
                    }
                })
@@ -277,6 +295,19 @@
        // const toRefer =(row, column, cellValue, index)=>{
        //     return row.secondReferenceResult==0?'正常':(row.reportResult==1?'异常':'无')
        // }

        const getSum = async (id) =>{
            let res = await inspectRecordApi().getInspectRecordSum({id:id});
            if (res.data.code === '200') {
                data.taskAndQuotas = JSON.parse(JSON.stringify(res.data.data.taskAndQuotas))
                console.log(data.taskAndQuotas,'666666666666')
            } else {
                ElMessage({
                    type: 'warning',
                    message: res.data.msg
                });
            }
        }

        const submitInspectPoint = async () => {
            if (data.title === '新增巡检任务' && data.pointTitle === '新增巡检点') {
@@ -415,6 +446,7 @@
            ...toRefs(data),
            inspectTaskFormRef,
            deleteFlow,
            getSum,
            // toRefer,
            giveQuotaUnit,
            giveClassGroup,
@@ -425,7 +457,7 @@
            openInspectPointDialog
        };
    }
};
});
</script>

<style scoped lang="scss">

 src/views/intellectInspect/inspectIndex/components/sum.vue

对比新文件
@@ -0,0 +1,131 @@
<template>
    <div style="height: 100%">
        <div class="sum-info">
            <div v-for="item in sumData" class="region-card">
                <div class="region-tit">{{item[0][0].region}}</div>
                <div class="unit-card">
                    <div v-for="i in item">
                        <div class="unit-tit">{{i[0].quotaContent}}（{{i[0].quotaUnit}}）</div>
                        <div class="points">
                            <div v-for="t in i" >
                                <span class="point-tit">{{t.point}}</span>
                                <span>{{t.dataReportType == 1 ? '无' : t.secondReferenceResult}}</span>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </div>
</template>

<script lang="ts">
    import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
    import { storeToRefs } from 'pinia';
    import { initBackEndControlRoutes } from '/@/router/backEnd';
    import {useUserInfo} from "/@/stores/userInfo";
    import { Session } from '/@/utils/storage';
    import { ElMessage } from 'element-plus'
    import type { FormInstance, FormRules } from 'element-plus'
    import { workApplyApi } from '/@/api/specialWorkSystem/workApply';


    interface stateType {

    }
    export default defineComponent({
        name: 'SumData',
        components: {},
        props:['sumData'],
        setup() {
            const userInfo = useUserInfo()
            const { userInfos } = storeToRefs(userInfo);
            return {

            };
        },
    });
</script>

<style scoped lang="scss">
    .home-container {
        height: 100%;
        overflow: hidden;
        position: relative;

        .sum-info{
            width: 100%;
            border: 1px solid #ccc;

            .region-card{
                width: 100%;
                border-bottom: 1px solid #ccc;
                display: flex;
                font-size: 16px;
                align-items: center;
                .region-tit{
                    width: 25%;
                    text-align: center;
                }
                .unit-card{
                    width: 75%;
                    height: 100%;
                    border-left: 1px solid #ccc;

                    &>div{
                        width: 100%;
                        display: flex;
                        align-items: center;
                        border-bottom: 1px solid #ccc;

                        &:last-of-type{
                            border-bottom: none;
                        }

                        .unit-tit{
                            width: 40%;
                            padding-left: 10px;
                        }
                        .points{
                            width: 60%;
                            height: 100%;
                            border-left: 1px solid #ccc;

                            &>div{
                                width: 100%;
                                display: flex;
                                align-items: center;
                                span{
                                    text-align: center;
                                    width: 50%;
                                }
                                .point-tit{
                                    border-right: 1px solid #ccc;
                                    padding: 10px;
                                }
                            }
                        }
                    }
                }
            }
        }
        .el-row{
            margin-bottom: 20px;
        }
        .el-row:last-child {
            margin-bottom: 0;
        }
        .el-input{
            width: 100% !important;
        }
        .el-date-editor::v-deep{
            width: 100%;
        }
        .el-select{
            width: 100%;
        }
        .el-cascader{
            width: 100% !important;
        }
    }
</style>

 src/views/intellectInspect/inspectIndex/index.vue

@@ -1,9 +1,15 @@
<template>
    <div class="home-container">
        <div style="height: 100%">
            <div class="homeCard">
            <div class="homeCard topCard">
                <div class="title">
                    当前巡检任务
                </div>
                <div class="top-info" v-if="unchecked!=0||unusual!=0">
                    <el-icon :size="18" color="#F3001E" style="margin-right: 4px"><BellFilled /></el-icon>
                    预警消息：
                    <div v-if="unchecked!=0">当日超期未巡检任务<span @click="toOverTime(4)">{{unchecked}}</span>个</div><span v-if="unchecked!=0&&unusual!=0">，</span>
                    <div v-if="unusual!=0">存在异常任务<span @click="toUnusual(1)">{{unusual}}</span>个</div>。
                </div>
            </div>
            <div class="homeCard">
@@ -47,9 +53,14 @@
import { inspectRecordApi } from '/@/api/intellectInspectSystem/inspectRecord';
import { useRouter } from 'vue-router';
import inspectRecordDialog from './components/inspectRecordDialog.vue';
import {departmentApi} from "/@/api/systemManage/department";
// 定义接口来定义对象的类型
interface stateType {
    tableData: Array<string>;
    unchecked: null | number,
    unusual: null | number,
    uncheckedList: [],
    abnormalList: [],
    pageIndex: number;
    pageSize: number;
    totalSize: number;
@@ -78,6 +89,10 @@
            pageSize: 10,
            totalSize: 0,
            tableData: [],
            unchecked: null,
            unusual: null,
            uncheckedList: [],
            abnormalList: [],
            workTypeList: [
                { id: 1, name: '日常任务' },
                { id: 2, name: '周期任务' }
@@ -105,6 +120,8 @@
        // 页面载入时执行方法
        onMounted(() => {
            getInspectRecord();
            getDayData();
            getDepartmentData()
        });

        // 分页获取工作时段列表
@@ -112,9 +129,37 @@
            const data = { pageSize: state.pageSize, pageIndex: state.pageIndex};
            let res = await inspectRecordApi().getInspectRecordByIndex(data);
            if (res.data.code === '200'){
                console.log(res.data.data)
                state.tableData = res.data.data.records
                state.totalSize = res.data.data.total
            } else {
                ElMessage({
                    type: 'warning',
                    message: res.data.msg
                });
            }
        };
        //获取部门
        const getDepartmentData = async () => {
            let res = await departmentApi().getDepartmentList();
            if (res.data.code === '200') {
                state.departmentList = res.data.data;
            } else {
                ElMessage({
                    type: 'warning',
                    message: res.data.msg
                });
            }
        };

        //获取当日数据
        const getDayData = async () => {
            let res = await inspectRecordApi().getDayRecord();
            if (res.data.code === '200') {
                state.unchecked = res.data.data.noCheckTaskCount
                state.unusual = res.data.data.abnormalTaskCount
                state.uncheckedList = res.data.data.noCheckTasks
                console.log(state.uncheckedList,'555555555555555')
                state.abnormalList = JSON.parse(JSON.stringify(res.data.data.abnormalTasks))
            } else {
                ElMessage({
                    type: 'warning',
@@ -141,6 +186,29 @@
                }
            });
        }

        const toOverTime = (id) =>{
            console.log(state.uncheckedList,'list')
            router.push({
                path: 'inspectRecord',
                query: {
                    id: id,
                    dataList: state.uncheckedList,
                    total: state.uncheckedList.length
                }
            });
        }

        // const toUnusual = (status) =>{
        //     router.push({
        //         path: 'inspectRecord',
        //         query: {
        //             status: status,
        //             dataList: state.abnormalList,
        //             total: state.abnormalList.length
        //         }
        //     });
        // }
        const toDetails = (type: string, item) => {
            inspectRecordDialogRef.value.showInspectRecordDialog(type, item, state.workTypeList, state.departmentList, state.timeType, state.classGroupList, state.quotaList, state.inspectPointAllList);
        }
@@ -153,6 +221,7 @@
            router,
            inspectRecordDialogRef,
            toLine,
            toOverTime,
            toDetails,
            handleSizeChange,
            handleCurrentChange,
@@ -165,6 +234,33 @@
<style scoped lang="scss">
$homeNavLengh: 8;
@media screen and (min-width: 1366px) {
    .topCard{
        display: flex;
        align-items: center;
        justify-content: space-between;
        font-weight: bolder;

        .top-info{
            display: flex;
            font-size: 16px;
            align-items: center;
            padding: 10px 15px;
            background: #FFD057;
            border-radius: 8px;
            border: 1px solid #F3001E;

            &>div{
                vertical-align: middle;
                white-space: nowrap;
                span{
                    font-size: 22px;
                    color: #F3001E;
                    margin: 0 4px;
                    cursor: pointer;
                }
            }
        }
    }
    .left-info {
        width: 70%;
        display: flex;
@@ -400,18 +496,6 @@
            align-items: center;
            min-height: 36px;
        }

        .topInfo {
            display: flex;
            align-items: center;
            font-size: 16px;
            font-weight: bold;

            & > div {
                white-space: nowrap;
                margin-right: 20px;
            }
        }
    }
}
.el-input {
@@ -423,4 +507,14 @@
.el-select {
    width: 100%;
}
:deep(.el-textarea.is-disabled .el-textarea__inner) {
    background-color: var(--el-card-bg-color);
    color: var(--el-input-text-color, var(--el-text-color-regular));
}
:deep(.el-input.is-disabled .el-input__inner) {
    color: var(--el-input-text-color, var(--el-text-color-regular));
}
:deep(.el-input.is-disabled .el-input__wrapper) {
    background-color: var(--el-card-bg-color);
}
</style>

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

@@ -66,7 +66,7 @@
                            </el-table>
                        </el-tab-pane>
                        <el-tab-pane label="统计数据" name="allData">
                            alldata
                            <sum-data :sumData="taskAndQuotas"></sum-data>
                        </el-tab-pane>
                    </el-tabs>
                </div>

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

对比新文件
@@ -0,0 +1,131 @@
<template>
    <div style="height: 100%">
        <div class="sum-info">
            <div v-for="item in sumData" class="region-card">
                <div class="region-tit">{{item[0][0].region}}</div>
                <div class="unit-card">
                    <div v-for="i in item">
                        <div class="unit-tit">{{i[0].quotaContent}}（{{i[0].quotaUnit}}）</div>
                        <div class="points">
                            <div v-for="t in i" >
                                <span class="point-tit">{{t.point}}</span>
                                <span>{{t.dataReportType == 1 ? '无' : t.secondReferenceResult}}</span>
                            </div>
                        </div>
                    </div>
                </div>
            </div>
        </div>
    </div>
</template>

<script lang="ts">
    import { toRefs, reactive, defineComponent, ref, defineAsyncComponent } from 'vue';
    import { storeToRefs } from 'pinia';
    import { initBackEndControlRoutes } from '/@/router/backEnd';
    import {useUserInfo} from "/@/stores/userInfo";
    import { Session } from '/@/utils/storage';
    import { ElMessage } from 'element-plus'
    import type { FormInstance, FormRules } from 'element-plus'
    import { workApplyApi } from '/@/api/specialWorkSystem/workApply';


    interface stateType {

    }
    export default defineComponent({
        name: 'SumData',
        components: {},
        props:['sumData'],
        setup() {
            const userInfo = useUserInfo()
            const { userInfos } = storeToRefs(userInfo);
            return {

            };
        },
    });
</script>

<style scoped lang="scss">
    .home-container {
        height: 100%;
        overflow: hidden;
        position: relative;

        .sum-info{
            width: 100%;
            border: 1px solid #ccc;

            .region-card{
                width: 100%;
                border-bottom: 1px solid #ccc;
                display: flex;
                font-size: 16px;
                align-items: center;
                .region-tit{
                    width: 25%;
                    text-align: center;
                }
                .unit-card{
                    width: 75%;
                    height: 100%;
                    border-left: 1px solid #ccc;

                    &>div{
                        width: 100%;
                        display: flex;
                        align-items: center;
                        border-bottom: 1px solid #ccc;

                        &:last-of-type{
                            border-bottom: none;
                        }

                        .unit-tit{
                            width: 40%;
                            padding-left: 10px;
                        }
                        .points{
                            width: 60%;
                            height: 100%;
                            border-left: 1px solid #ccc;

                            &>div{
                                width: 100%;
                                display: flex;
                                align-items: center;
                                span{
                                    text-align: center;
                                    width: 50%;
                                }
                                .point-tit{
                                    border-right: 1px solid #ccc;
                                    padding: 10px;
                                }
                            }
                        }
                    }
                }
            }
        }
        .el-row{
            margin-bottom: 20px;
        }
        .el-row:last-child {
            margin-bottom: 0;
        }
        .el-input{
            width: 100% !important;
        }
        .el-date-editor::v-deep{
            width: 100%;
        }
        .el-select{
            width: 100%;
        }
        .el-cascader{
            width: 100% !important;
        }
    }
</style>

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

@@ -100,6 +100,7 @@
import { teamManageApi } from '/@/api/systemManage/personShiftManage/teamManage';
import { inspectPointApi } from '/@/api/intellectInspectSystem/inspectPointManage';
import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask';
import {useRoute} from "vue-router";
let global: any = {
    homeChartOne: null,
    homeChartTwo: null,
@@ -149,6 +150,7 @@
    components: { inspectRecordDialog },
    setup() {
        const inspectRecordDialogRef = ref();
        const route = useRoute();
        const state = reactive<stateType>({
            tableData: {
                inspectRecordData: [],
@@ -181,7 +183,7 @@
                { id: 1, name: '待巡检' },
                { id: 2, name: '巡检中' },
                { id: 3, name: '已巡检' },
                { id: 4, name: '超时未巡检' }
                { id: 4, name: '超时未完成巡检' }
            ],
            quotaList: [],
            departmentList: [],
@@ -310,7 +312,13 @@

        // 页面加载时
        onMounted(() => {
            getInspectRecord();
            if(route.query.id){
                console.log(route.query.dataList,'list')
                state.tableData.params.taskStatus = Number(route.query.id)
                state.tableData.inspectRecordData = route.query.dataList
                state.tableData.total = Number(route.query.total)
            }
            // getInspectRecord();
            getQuotaList();
            getDepartmentData();
            getClassGroupData();

 src/views/specialWorkSystem/workTicket/myApproval/index.vue

@@ -45,7 +45,7 @@
                                    <template #default="scope">
                                        <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
                                        <el-button link type="success" size="small" :icon="Finished" @click="viewStatus(scope.row)">进度</el-button>
                                        <el-button link type="warning" size="small" :icon="Delete" @click="deleteRecordBtn(scope.row)">终止</el-button>
<!--                                        <el-button link type="warning" size="small" :icon="Delete" @click="deleteRecordBtn(scope.row)">终止</el-button>-->
                                    </template>
                                </el-table-column>
                            </el-table>