Default Changelist

Admin

2022-08-24 14a03de477e4fa38239a78cbb95efa1096bb8929

Default Changelist

 src/views/specialWorkSystem/foundationSet/safetyAction/index.vue

@@ -27,13 +27,13 @@
                <div class="main-card">
                    <el-row class="cardTop">
                        <el-col :span="12" class="mainCardBtn">
                            <el-button type="primary" :icon="Plus" size="default" @click="openSafetyActionDialog('新增', {})">新建</el-button>
                            <el-button type="primary" :icon="Plus" size="default" @click="openSafetyActionDialog('新增', {})">新增</el-button>
                            <!--                            <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>-->
                        </el-col>
                        <el-button type="primary" :icon="Refresh" size="default" />
                    </el-row>
                    <el-table ref="multipleTableRef" :data="tableData.safetyActionData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }" @selection-change="handleSelectionChange">
                        <el-table-column type="selection" width="55" />
                    <el-table ref="multipleTableRef" :data="tableData.safetyActionData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }">
<!--                        <el-table-column type="selection" width="55" />-->
                        <el-table-column property="workType" label="作业类型">
                            <template #default="scope">
                                <span>
@@ -48,7 +48,7 @@
                                </span>
                            </template>
                        </el-table-column>
                        <el-table-column property="context" label="措施内容"></el-table-column>
                        <el-table-column :show-overflow-tooltip="true" property="context" label="措施内容"></el-table-column>
                        <el-table-column prop="correctVal" label="正确值" show-overflow-tooltip>
                            <template #default="scope">
                                <span>

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

@@ -263,9 +263,9 @@
            if (data.approveRuleForm.workType === 1) {
                data.approveRuleForm.workLevel = null;
                data.workLevelList = [
                    { id: 3, name: '特级动火作业' },
                    { id: 1, name: '一级动火作业' },
                    { id: 2, name: '二级动火作业' },
                    { id: 3, name: '三级动火作业' }
                    { id: 2, name: '二级动火作业' }
                ];
            } else if (data.approveRuleForm.workType === 3) {
                data.approveRuleForm.workLevel = null;
@@ -277,10 +277,10 @@
            } else if (data.approveRuleForm.workType === 6) {
                data.approveRuleForm.workLevel = null;
                data.workLevelList = [
                    { id: 7, name: '特级高处作业' },
                    { id: 4, name: '一级高处作业' },
                    { id: 5, name: '二级高处作业' },
                    { id: 6, name: '三级高处作业' },
                    { id: 7, name: '四级高处作业' }
                ];
            } else if (data.approveRuleForm.workType === 8) {
                data.approveRuleForm.workLevel = null;
@@ -297,9 +297,9 @@
        const setValue = (workType: number) => {
            if (workType === 1) {
                data.workLevelList = [
                    { id: 3, name: '特级动火作业' },
                    { id: 1, name: '一级动火作业' },
                    { id: 2, name: '二级动火作业' },
                    { id: 3, name: '三级动火作业' }
                ];
            } else if (workType === 3) {
                data.workLevelList = [
@@ -309,10 +309,10 @@
                ];
            } else if (workType === 6) {
                data.workLevelList = [
                    { id: 7, name: '四级高处作业' },
                    { id: 4, name: '一级高处作业' },
                    { id: 5, name: '二级高处作业' },
                    { id: 6, name: '三级高处作业' },
                    { id: 7, name: '四级高处作业' }
                    { id: 6, name: '三级高处作业' }
                ];
            } else if (workType === 8) {
                data.workLevelList = [

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

@@ -148,13 +148,13 @@
                { id: 8, name: '盲板抽堵作业' }
            ],
            workLevelList: [
                { id: 3, name: '特级动火作业' },
                { id: 1, name: '一级动火作业' },
                { id: 2, name: '二级动火作业' },
                { id: 3, name: '三级动火作业' },
                { id: 7, name: '特级高处作业' },
                { id: 4, name: '一级高处作业' },
                { id: 5, name: '二级高处作业' },
                { id: 6, name: '三级高处作业' },
                { id: 7, name: '四级高处作业' },
                { id: 8, name: '一级吊装作业' },
                { id: 9, name: '二级吊装作业' },
                { id: 10, name: '三级吊装作业' },

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

@@ -4,7 +4,8 @@
<!--            <el-tab-pane label="申请中" name="1">-->
                <div style="height: 100%">
                    <el-row class="homeCard">
                        <el-col :span="8">
                        <span>作业类型：</span>
                        <el-col :span="10">
                            <div class="grid-content topInfo">
                                <el-select v-model="searchWord">
                                    <el-option
@@ -36,9 +37,9 @@
                                <el-table-column property="workTypeDesc" label="作业类型" />
                                <el-table-column property="workLevelDesc" label="作业等级" />
                                <el-table-column property="applyTime" label="申请时间" width="180" />
                                <el-table-column label="申请状态" width="180">
                                <el-table-column label="审批状态" align="center" width="180">
                                    <template #default="scope">
                                        <el-tag type="success">{{ scope.row.statusDesc }}</el-tag>
                                        <el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
                                    </template>
                                </el-table-column>
                                <el-table-column fixed="right" label="操作" align="center" width="250">

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

@@ -4,7 +4,8 @@
<!--            <el-tab-pane label="申请中" name="1">-->
                <div style="height: 100%">
                    <el-row class="homeCard">
                        <el-col :span="8">
                        <span>作业类型：</span>
                        <el-col :span="10">
                            <div class="grid-content topInfo">
                                <el-select v-model="searchWord">
                                    <el-option
@@ -37,9 +38,9 @@
                                <el-table-column property="workTypeDesc" label="作业类型" />
                                <el-table-column property="workLevelDesc" label="作业等级" />
                                <el-table-column property="applyTime" label="申请时间" width="180" />
                                <el-table-column label="申请状态" width="180">
                                <el-table-column label="申请状态" align="center" width="180">
                                    <template #default="scope">
                                        <el-tag type="success">{{ scope.row.statusDesc }}</el-tag>
                                        <el-tag :type="scope.row.status==2?'success':(scope.row.status==8||scope.row.status==9)?'warning':'danger'">{{ scope.row.statusDesc }}</el-tag>
                                    </template>
                                </el-table-column>
                                <el-table-column fixed="right" label="操作" align="center" width="250">