| src/api/fileManagement/bookshelf.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/fileManagement/bookshelf/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/safeProduction/accidentReportingRecord/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/safeProduction/dangerInvestigation/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/safeProduction/emergencyPlanReview/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/safeProduction/safetyTrainingAssessment/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/fileManagement/bookshelf.js
@@ -102,14 +102,15 @@ /** * 删除货架 * @description 根据货架ID删除指定的货架记录 * @param {string|number} id 货架ID * @description 根据货架ID删除指定的货架记录，后端要求传入 ID 数组（支持批量） * @param {Array<string|number>} data 货架ID数组 * @returns {Promise} 返回删除结果 */ export function deleteShelf(id) { export function deleteShelf(data) { return request({ url: `/warehouse/goodsShelves/delete/${id}`, url: `/warehouse/goodsShelves/delete/`, method: "delete", data, }); }
@@ -135,7 +135,7 @@ <el-col class="search_thing" :span="24"> <div class="search_label"><span class="required-span">* </span>货架层数：</div> <div class="search_input"> <el-input v-model="shelves.row" size="small"></el-input> <el-input-number v-model="shelves.row" size="small" :min="1" :max="10" :precision="0" :step="1" controls-position="right" style="width: 100%"></el-input-number> </div> </el-col> </el-row> @@ -143,7 +143,7 @@ <el-col class="search_thing" :span="24"> <div class="search_label"><span class="required-span">* </span>货架列数：</div> <div class="search_input"> <el-input v-model="shelves.col" size="small"></el-input> <el-input-number v-model="shelves.col" size="small" :min="1" :max="10" :precision="0" :step="1" controls-position="right" style="width: 100%"></el-input-number> </div> </el-col> </el-row> @@ -287,6 +287,16 @@ ElMessage.error('请填写货架列数') return } const rowNum = Number(shelves.row) const colNum = Number(shelves.col) if (rowNum < 1 || colNum < 1 || rowNum > 10 || colNum > 10) { ElMessage.error('货架层数和列数需为1-10的整数') return } if (!Number.isInteger(rowNum) || !Number.isInteger(colNum)) { ElMessage.error('货架层数和列数不能为小数') return } upLoadShelves.value = true if (currentEdit.value && currentEdit.value.id) { @@ -294,8 +304,8 @@ updateShelf({ id: currentEdit.value.id, name: shelves.name, row: Number(shelves.row), col: Number(shelves.col), row: rowNum, col: colNum, warehouseId: entity.warehouseId }).then(res => { upLoadShelves.value = false @@ -311,11 +321,10 @@ } else { // 新增 // 这里需要替换为实际的API调用 addShelf({ name: shelves.name, row: Number(shelves.row), col: Number(shelves.col), row: rowNum, col: colNum, warehouseId: entity.warehouseId }).then(res => { upLoadShelves.value = false @@ -341,16 +350,14 @@ type: "warning" }).then(() => { if (level == 1) { // 删除仓库 // 删除仓库（接口要求传 ID 数组） deleteWarehouse([row.id]).then(res => { ElMessage.success('删除成功') selectList() }) } else { // 删除货架 deleteShelf({ id: row.id }).then(res => { // 删除货架（接口同样要求传 ID 数组） deleteShelf([row.id]).then(res => { ElMessage.success('删除成功') selectList() }) src/views/safeProduction/accidentReportingRecord/index.vue
@@ -52,7 +52,8 @@ <el-form ref="formRef" :model="form" :rules="rules" label-width="140px"> label-position="top" label-width="150px"> <el-row :gutter="20"> <el-col :span="12"> <el-form-item label="事故编号" src/views/safeProduction/dangerInvestigation/index.vue
@@ -267,10 +267,11 @@ </el-col> </el-row> </el-form> <div v-if="operationType === 'edit2' || operationType === 'edit3'" class="classtitle">隐患详情</div> <el-descriptions :column="2" style="margin-bottom: 20px;" v-if="operationType === 'edit2' || operationType === 'edit3'" title="隐患详情" border> <el-descriptions-item label="隐患编号"> <span class="detail-title">{{ form.hiddenCode }}</span> @@ -306,10 +307,12 @@ <span class="detail-title">{{ form.rectifyTime }}</span> </el-descriptions-item> </el-descriptions> <div class="classtitle" v-if="operationType === 'edit3'" style="margin-top: 40px;">整改详情</div> <el-descriptions :column="2" style="margin-bottom: 20px;" v-if="operationType === 'edit3'" title="整改详情" border> <el-descriptions-item label="整改具体措施" :span="2"> @@ -319,6 +322,9 @@ <span class="detail-title">{{ form2.rectifyActualTime }}</span> </el-descriptions-item> </el-descriptions> <div class="classtitle" v-if="operationType === 'edit2' || operationType === 'edit3'" style="margin-top: 40px;margin-bottom: 30px;">验收情况</div> <el-form :model="form2" v-if="operationType === 'edit2'" label-width="140px" @@ -1272,4 +1278,12 @@ page-break-after: avoid; } } .classtitle { font-size: 16px; font-weight: 600; color: #303133; border-left: 4px solid #409eff; padding-left: 12px; margin-bottom: 12px; } </style> src/views/safeProduction/emergencyPlanReview/index.vue
@@ -52,17 +52,18 @@ <el-form ref="formRef" :model="form" :rules="rules" label-width="120px"> label-position="top" label-width="150px"> <el-row :gutter="20"> <el-col :span="12"> <el-form-item label="应急预案编码" <el-form-item label="应急预案编码：" prop="planCode"> <el-input v-model="form.planCode" placeholder="请输入应急预案编码" /> </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="应急预案名称" <el-form-item label="应急预案名称：" prop="planName"> <el-input v-model="form.planName" placeholder="请输入应急预案名称" /> @@ -99,7 +100,7 @@ </el-row> <el-row :gutter="20"> <el-col :span="12"> <el-form-item label="预案类型" <el-form-item label="预案类型：" prop="planType"> <el-select v-model="form.planType" placeholder="请选择预案类型" @@ -112,14 +113,14 @@ </el-form-item> </el-col> <el-col :span="12"> <el-form-item label="备注" <el-form-item label="备注：" prop="remark"> <el-input v-model="form.remark" placeholder="请输入备注" /> </el-form-item> </el-col> </el-row> <el-form-item label="适用范围" <el-form-item label="适用范围：" prop="applyScope"> <el-checkbox-group v-model="form.applyScope"> <el-checkbox label="all">全体员工</el-checkbox> @@ -129,7 +130,7 @@ <el-checkbox label="tech">技术部门</el-checkbox> </el-checkbox-group> </el-form-item> <el-form-item label="应急处置步骤" <el-form-item label="应急处置步骤：" prop="execSteps"> <div class="exec-steps-container" style="width:100%"> @@ -216,7 +217,7 @@ <div v-for="(step, index) in JSON.parse(currentKnowledge.execSteps)" :key="index" class="exec-step-view"> <span class="step-number">{{ index + 1 }}.</span> <!-- <span class="step-number">{{ index + 1 }}.</span> --> <span class="step-title">{{ step.step }}：</span> <span>{{ step.description }}</span> </div> @@ -764,45 +765,83 @@ .exec-steps-container { border: 1px solid #e4e7ed; border-radius: 4px; padding: 15px; border-radius: 8px; padding: 20px; background-color: #f9fafc; margin-top: 10px; } .exec-step-item { margin-bottom: 10px; padding: 10px; margin-bottom: 12px; padding: 12px; background-color: #ffffff; border: 1px solid #e4e7ed; border-radius: 4px; border-radius: 6px; transition: all 0.3s ease; } .exec-step-item:hover { box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); border-color: #c6e2ff; } .step-header { display: flex; align-items: flex-start; flex-direction: column; gap: 8px; } .exec-step-view { margin-bottom: 8px; padding-left: 20px; margin-bottom: 16px; padding-left: 24px; position: relative; line-height: 1.6; } .exec-step-view::before { content: ""; position: absolute; left: 10px; top: 20px; bottom: -16px; width: 2px; background-color: #eaeaea; } .exec-step-view:last-child::before { display: none; } .step-number { position: absolute; left: 0; top: 0; width: 20px; height: 20px; line-height: 20px; text-align: center; font-weight: bold; color: #409eff; color: #ffffff; background-color: #409eff; border-radius: 50%; font-size: 12px; z-index: 1; } .step-title { font-weight: bold; margin-right: 5px; font-weight: 600; margin-right: 8px; color: #395a9c; } .no-data { color: #909399; font-style: italic; text-align: center; padding: 20px; background-color: #f8f9fa; border-radius: 4px; margin-top: 10px; } </style> src/views/safeProduction/safetyTrainingAssessment/index.vue
@@ -56,7 +56,8 @@ <el-form ref="formRef" :model="form" :rules="rules" label-width="120px"> label-position="top" label-width="150px"> <el-row :gutter="20"> <el-col :span="12"> <el-form-item label="培训日期" @@ -85,6 +86,7 @@ prop="openingTime"> <el-time-picker v-model="form.openingTime" placeholder="请选择" style="width: 100%" value-format="HH:mm:ss" format="HH:mm:ss" clearable /> @@ -95,6 +97,7 @@ prop="endTime"> <el-time-picker v-model="form.endTime" placeholder="请选择" style="width: 100%" value-format="HH:mm:ss" format="HH:mm:ss" clearable /> @@ -190,8 +193,9 @@ width="900px" :close-on-click-modal="false"> <div class="knowledge-detail"> <div class="classtitle">课程详情</div> <el-descriptions size="mini" style="margin-left: 60px;" border :column="3"> <el-descriptions-item label="课程编号:">{{ currentKnowledge.courseCode }}</el-descriptions-item> <el-descriptions-item label="培训内容:">{{ currentKnowledge.trainingContent }}</el-descriptions-item> @@ -238,11 +242,14 @@ @click="downLoadFile(endform)">附件列表</el-button> </el-descriptions-item> </el-descriptions> <el-divider style="margin: 20px 0;" /> <!-- <el-divider style="margin: 20px 0;" /> --> <div class="classtitle" style="margin-top: 40px;margin-bottom: 30px;">课程评价</div> <el-form ref="formRef" :model="form" :rules="rules" label-width="130px"> label-position="top" label-width="150px"> <el-row :gutter="20"> <el-col :span="12"> <el-form-item label="评价人:" @@ -317,10 +324,13 @@ </el-col> </el-row> --> </el-form> <div class="classtitle" style="margin-top: 40px;">考核列表</div> <el-table style="margin-top: 20px;" :data="endform.safeTrainingDetailsDtoList" border fit stripe highlight-current-row> <el-table-column prop="nickName" label="姓名" /> @@ -616,7 +626,7 @@ { name: "结果明细", type: "text", // disabled: row => row.state !== 2, disabled: row => row.state == 0, clickFun: row => { viewResultDetail(row); }, @@ -1235,4 +1245,12 @@ :deep(.danger-row td) { color: #e95a66 !important; } .classtitle { font-size: 16px; font-weight: 600; color: #303133; border-left: 4px solid #409eff; padding-left: 12px; margin-bottom: 12px; } </style>
