admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2024-04-30 01:47:07 +08:00
parent e20af1ad52
commit 12a39cf488
6 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/assets/js/api/quality.js
View File

@ -4,24 +4,37 @@
import {post, get} from '../http' import {post, get} from '../http'
// 标准中心 // 标准中心
export const addDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/add', data); export const addDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/add', data);
export const addSafeDangerTypeRecordApi = data => post('xmgl/xzSecurityDangerTypeRecord/add', data);
export const editDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/edit', data); export const editDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/edit', data);
export const editSafeDangerTypeRecordApi = data => post('xmgl/xzSecurityDangerTypeRecord/edit', data);
export const getDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/selectDangerTypeAndItemList', data); //项目质量问题库信息 列表信息---左边 export const getDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/selectDangerTypeAndItemList', data); //项目质量问题库信息 列表信息---左边
export const getSafeDangerTypeRecordApi = data => post('xmgl/xzSecurityDangerTypeRecord/selectDangerTypeAndItemList', data); //项目质量问题库信息 列表信息---左边
export const getCompanyDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/selectCompanyDangerTypeList', data); //企业质量问题库信息 列表信息---左边 export const getCompanyDangerTypeRecordApi = data => post('xmgl/dangerTypeRecord/selectCompanyDangerTypeList', data); //企业质量问题库信息 列表信息---左边
export const getSafeCompanyDangerTypeRecordApi = data => post('xmgl/xzSecurityDangerTypeRecord/selectCompanyDangerTypeList', data); //企业质量问题库信息 列表信息---左边
export const addDangerItemRecordApi = data => post('xmgl/dangerItemRecord/add', data); export const addDangerItemRecordApi = data => post('xmgl/dangerItemRecord/add', data);
export const addSafeDangerItemRecordApi = data => post('xmgl/xzSecurityDangerItemRecord/add', data);
export const editDangerItemRecordApi = data => post('xmgl/dangerItemRecord/edit', data); export const editDangerItemRecordApi = data => post('xmgl/dangerItemRecord/edit', data);
export const editSafeDangerItemRecordApi = data => post('xmgl/xzSecurityDangerItemRecord/edit', data);
export const getDangerItemRecordApi = data => post('xmgl/dangerItemRecord/list', data); //质量问题库信息 列表信息---右边 export const getDangerItemRecordApi = data => post('xmgl/dangerItemRecord/list', data); //质量问题库信息 列表信息---右边
export const getSafeDangerItemRecordApi = data => post('xmgl/xzSecurityDangerItemRecord/list', data); //质量问题库信息 列表信息---右边
export const getCompanyDangerItemRecordApi = data => post('xmgl/dangerItemRecord/selectCompanyDangerItemRecordList', data); //企业质量问题库信息 列表信息---右边 export const getCompanyDangerItemRecordApi = data => post('xmgl/dangerItemRecord/selectCompanyDangerItemRecordList', data); //企业质量问题库信息 列表信息---右边
export const getSafeCompanyDangerItemRecordApi = data => post('xmgl/xzSecurityDangerItemRecord/selectCompanyDangerItemRecordList', data); //企业质量问题库信息 列表信息---右边
export const delDangerItemRecordApi = data => post('xmgl/dangerItemRecord/delete', data); // 删除质量问题库—子项信息 export const delDangerItemRecordApi = data => post('xmgl/dangerItemRecord/delete', data); // 删除质量问题库—子项信息
export const delSafeDangerItemRecordApi = data => post('xmgl/xzSecurityDangerItemRecord/delete', data); // 删除质量问题库—子项信息
export const delDangerTypeRecordApi = data => get('/xmgl/dangerTypeRecord/deleteByDangerTypeId',data) // 删除 左边 export const delDangerTypeRecordApi = data => get('/xmgl/dangerTypeRecord/deleteByDangerTypeId',data) // 删除 左边
export const delSafeDangerTypeRecordApi = data => get('/xmgl/xzSecurityDangerTypeRecord/deleteByDangerTypeId',data) // 删除 左边
export const addQualityRectifyRecordApi = data => post('/xmgl/qualityRectifyRecord/add',data) // 整改回复新增 export const addQualityRectifyRecordApi = data => post('/xmgl/qualityRectifyRecord/add',data) // 整改回复新增
export const addSafeQualityRectifyRecordApi = data => post('/xmgl/xzSecurityQualityRectifyRecord/add',data) // 整改回复新增
export const singleEditStateApi = data => post('xmgl/dangerTypeRecord/updateDangerTypeRecordUsable', data); //质量问题库信息 列表信息---左边--启用 禁用 export const singleEditStateApi = data => post('xmgl/dangerTypeRecord/updateDangerTypeRecordUsable', data); //质量问题库信息 列表信息---左边--启用 禁用
export const singleSafeEditStateApi = data => post('xmgl/xzSecurityDangerTypeRecord/updateDangerTypeRecordUsable', data); //质量问题库信息 列表信息---左边--启用 禁用
export const editStateApi = data => post('xmgl/dangerItemRecord/updateDangerItemRecordUsable', data); //质量问题库信息 列表信息---右边--批量启用 禁用 export const editStateApi = data => post('xmgl/dangerItemRecord/updateDangerItemRecordUsable', data); //质量问题库信息 列表信息---右边--批量启用 禁用
export const editSafeStateApi = data => post('xmgl/xzSecurityDangerItemRecord/updateDangerItemRecordUsable', data); //质量问题库信息 列表信息---右边--批量启用 禁用
// 业务中心 // 业务中心
@ -35,10 +48,13 @@ export const editQualityRegionListApi = data => post('xmgl/qualityRegion/edit',
//数据中心 //数据中心
export const getInspectionRecordListApi = data=> post('xmgl/qualityInspectionRecord/list',data); //质量检查记录 列表查询 export const getInspectionRecordListApi = data=> post('xmgl/qualityInspectionRecord/list',data); //质量检查记录 列表查询
export const getSafeInspectionRecordListApi = data=> post('xmgl/xzSecurityQualityInspectionRecord/list',data); //质量检查记录 列表查询
export const getSubcontractListApi = data=> post('xmgl/projectEnterprise/list',data); //质量检查记录 获取分包公司列表 export const getSubcontractListApi = data=> post('xmgl/projectEnterprise/list',data); //质量检查记录 获取分包公司列表
export const addRecordApi = data=> post('xmgl/qualityInspectionRecord/add',data); //质量检查记录 新增记录 export const addRecordApi = data=> post('xmgl/qualityInspectionRecord/add',data); //质量检查记录 新增记录
export const addSafeRecordApi = data=> post('xmgl/xzSecurityQualityInspectionRecord/add',data); //质量检查记录 新增记录
export const getRoutineInspectApi = data=> post('xmgl/routineInspect/list',data); //质量检查记录 例行检查 export const getRoutineInspectApi = data=> post('xmgl/routineInspect/list',data); //质量检查记录 例行检查
export const selectRectifyRecordListApi = data=> post('xmgl/qualityRectifyRecord/selectRectifyRecordList',data); //质量整改记录 export const selectRectifyRecordListApi = data=> post('xmgl/qualityRectifyRecord/selectRectifyRecordList',data); //质量整改记录
export const selectSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualityRectifyRecord/selectRectifyRecordList',data); //质量整改记录
// 楼栋管理 // 楼栋管理

32
src/views/companyAdmin/basicSafeSetup/checkItem.vue
View File

@ -487,14 +487,14 @@
<script> <script>
// import moment from "moment"; // import moment from "moment";
import { import {
addDangerTypeRecordApi, addSafeDangerTypeRecordApi,
editDangerTypeRecordApi, editSafeDangerTypeRecordApi,
delDangerItemRecordApi, delSafeDangerItemRecordApi,
delDangerTypeRecordApi, delSafeDangerTypeRecordApi,
getCompanyDangerTypeRecordApi, getSafeCompanyDangerTypeRecordApi,
addDangerItemRecordApi, addSafeDangerItemRecordApi,
editDangerItemRecordApi, editSafeDangerItemRecordApi,
getCompanyDangerItemRecordApi, getSafeCompanyDangerItemRecordApi,
} from "@/assets/js/api/quality"; } from "@/assets/js/api/quality";
import axios from 'axios' import axios from 'axios'
@ -677,7 +677,7 @@ export default {
if (this.type == 1 || this.type == 2) { if (this.type == 1 || this.type == 2) {
if (this.title.indexOf("编辑") != -1) { if (this.title.indexOf("编辑") != -1) {
delete this.dialogdata.createTime delete this.dialogdata.createTime
editDangerTypeRecordApi(this.dialogdata).then((res) => { editSafeDangerTypeRecordApi(this.dialogdata).then((res) => {
// this.isloading = false; // this.isloading = false;
this.dialogVisible = false; this.dialogVisible = false;
this.dialogVisible2 = false; this.dialogVisible2 = false;
@ -686,7 +686,7 @@ export default {
this.$message.success("更新成功！"); this.$message.success("更新成功！");
}); });
} else { } else {
addDangerTypeRecordApi(this.dialogdata).then((res) => { addSafeDangerTypeRecordApi(this.dialogdata).then((res) => {
this.isloading = false; this.isloading = false;
this.dialogVisible = false; this.dialogVisible = false;
this.dialogVisible2 = false; this.dialogVisible2 = false;
@ -697,7 +697,7 @@ export default {
} }
} else { } else {
if (this.title.indexOf("编辑") != -1) { if (this.title.indexOf("编辑") != -1) {
editDangerItemRecordApi(this.dialogdata).then((res) => { editSafeDangerItemRecordApi(this.dialogdata).then((res) => {
this.isloading = false; this.isloading = false;
this.dialogVisible = false; this.dialogVisible = false;
this.dialogVisible2 = false; this.dialogVisible2 = false;
@ -706,7 +706,7 @@ export default {
this.$message.success("更新成功！"); this.$message.success("更新成功！");
}); });
} else { } else {
addDangerItemRecordApi(this.dialogdata).then((res) => { addSafeDangerItemRecordApi(this.dialogdata).then((res) => {
this.isloading = false; this.isloading = false;
this.dialogVisible = false; this.dialogVisible = false;
this.dialogVisible2 = false; this.dialogVisible2 = false;
@ -754,7 +754,7 @@ export default {
}, },
delSave1() { delSave1() {
if (this.type == 3) { if (this.type == 3) {
delDangerItemRecordApi({ id: this.editId }).then((res) => { delSafeDangerItemRecordApi({ id: this.editId }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: '删除成功', message: '删除成功',
@ -771,7 +771,7 @@ export default {
this.dialogVisible1 = false; this.dialogVisible1 = false;
}); });
} else { } else {
delDangerTypeRecordApi({ id: this.editId }).then((res) => { delSafeDangerTypeRecordApi({ id: this.editId }).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
message: '删除成功', message: '删除成功',
@ -866,7 +866,7 @@ export default {
// spinner: "el-icon-loading", // spinner: "el-icon-loading",
// background: "rgba(0, 0, 0, 0.7)" // background: "rgba(0, 0, 0, 0.7)"
// }); // });
getCompanyDangerTypeRecordApi(param).then((res) => { getSafeCompanyDangerTypeRecordApi(param).then((res) => {
this.dataList = res.result; this.dataList = res.result;
// if(res.result.length>0){ // if(res.result.length>0){
@ -884,7 +884,7 @@ export default {
// spinner: "el-icon-loading", // spinner: "el-icon-loading",
// background: "rgba(0, 0, 0, 0.7)" // background: "rgba(0, 0, 0, 0.7)"
// }); // });
getCompanyDangerItemRecordApi(param).then((res) => { getSafeCompanyDangerItemRecordApi(param).then((res) => {
this.threeData = res.result; this.threeData = res.result;
// if(res.result.length>0){ // if(res.result.length>0){

16
src/views/projectFront/safeSame/criterionModule/qualityProblemBank.vue
View File

@ -207,10 +207,10 @@
</template> </template>
<script> <script>
import { import {
getDangerTypeRecordApi, getSafeDangerTypeRecordApi,
getDangerItemRecordApi, getSafeDangerItemRecordApi,
editStateApi, editSafeStateApi,
singleEditStateApi singleSafeEditStateApi
} from '@/assets/js/api/quality' } from '@/assets/js/api/quality'
export default { export default {
name: 'qualityProblemBank', name: 'qualityProblemBank',
@ -253,7 +253,7 @@ export default {
projectSn: this.projectSn, projectSn: this.projectSn,
dangerName: this.dangerName dangerName: this.dangerName
} }
getDangerTypeRecordApi(data).then((res) => { getSafeDangerTypeRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
if (res.result.length > 0) { if (res.result.length > 0) {
this.listData = res.result this.listData = res.result
@ -276,7 +276,7 @@ export default {
recordStatus: type, recordStatus: type,
id: data.id id: data.id
} }
singleEditStateApi(newData).then((res) => { singleSafeEditStateApi(newData).then((res) => {
console.log(res) console.log(res)
if (res.code == 200) { if (res.code == 200) {
this.$message.success(res.message) this.$message.success(res.message)
@ -314,7 +314,7 @@ export default {
content: this.formInline.content, content: this.formInline.content,
recordStatus: this.formInline.recordStatus recordStatus: this.formInline.recordStatus
} }
getDangerItemRecordApi(data).then((res) => { getSafeDangerItemRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.tableData = res.result this.tableData = res.result
} }
@ -332,7 +332,7 @@ export default {
recordStatus: type, recordStatus: type,
idStr: this.checkboxId.join(',') idStr: this.checkboxId.join(',')
} }
editStateApi(data).then((res) => { editSafeStateApi(data).then((res) => {
console.log(data) console.log(data)
if (res.code == 200) { if (res.code == 200) {
this.$message.success(res.message) this.$message.success(res.message)

20
src/views/projectFront/safeSame/inspectionLedger.vue
View File

@ -1935,14 +1935,14 @@
</template> </template>
<script> <script>
import { import {
getInspectionRecordListApi, getSafeInspectionRecordListApi,
getQualityRegionListApi, getQualityRegionListApi,
getDangerTypeRecordApi, getSafeDangerTypeRecordApi,
getSubcontractListApi, getSubcontractListApi,
addRecordApi, addSafeRecordApi,
getRoutineInspectApi, getRoutineInspectApi,
selectRectifyRecordListApi, selectSafeRectifyRecordListApi,
addQualityRectifyRecordApi, addSafeQualityRectifyRecordApi,
} from "@/assets/js/api/quality.js"; } from "@/assets/js/api/quality.js";
import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage.js"; import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage.js";
import { VueCropper } from "vue-cropper"; import { VueCropper } from "vue-cropper";
@ -2202,7 +2202,7 @@ export default {
this.replyData.qualityId = valId; this.replyData.qualityId = valId;
this.replyData.createUser = this.userIdInfo; this.replyData.createUser = this.userIdInfo;
console.log("整改提交的表单数据：：：", this.replyData); console.log("整改提交的表单数据：：：", this.replyData);
addQualityRectifyRecordApi(this.replyData).then((res) => { addSafeQualityRectifyRecordApi(this.replyData).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success("提交成功"); this.$message.success("提交成功");
this.dialogDetil = false; this.dialogDetil = false;
@ -2464,7 +2464,7 @@ export default {
}, },
//整改记录 //整改记录
selectRectifyRecordList(id) { selectRectifyRecordList(id) {
selectRectifyRecordListApi({ selectSafeRectifyRecordListApi({
qualityId: id, qualityId: id,
}).then((res) => { }).then((res) => {
this.rectifyRecordList = res.result; this.rectifyRecordList = res.result;
@ -2590,7 +2590,7 @@ export default {
data.projectSn = this.projectSn; data.projectSn = this.projectSn;
data.pageNo = this.pageNo; data.pageNo = this.pageNo;
data.pageSize = this.pageSize; data.pageSize = this.pageSize;
getInspectionRecordListApi(data).then((res) => { getSafeInspectionRecordListApi(data).then((res) => {
console.log("res----", res); console.log("res----", res);
if (res.code == 200) { if (res.code == 200) {
this.statisticsValue = res.result.total; this.statisticsValue = res.result.total;
@ -2660,7 +2660,7 @@ export default {
projectSn: this.projectSn, projectSn: this.projectSn,
recordStatus: 0, recordStatus: 0,
}; };
getDangerTypeRecordApi(data).then((res) => { getSafeDangerTypeRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log(res); console.log(res);
this.classifyList = res.result; this.classifyList = res.result;
@ -3139,7 +3139,7 @@ export default {
data.projectSn = this.projectSn; data.projectSn = this.projectSn;
console.log("data", data); console.log("data", data);
data.inspectManId = this.$store.state.userInfo.userId; data.inspectManId = this.$store.state.userInfo.userId;
addRecordApi(data).then((res) => { addSafeRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success(this.$t("message.quality.newSuccess")); this.$message.success(this.$t("message.quality.newSuccess"));
this.$refs.addForm1.resetFields(); //清除所有验证 this.$refs.addForm1.resetFields(); //清除所有验证

20
src/views/projectFront/safeSame/recordsModule/inspectionRecord.vue
View File

@ -974,14 +974,14 @@
</template> </template>
<script> <script>
import { import {
getInspectionRecordListApi, getSafeInspectionRecordListApi,
getQualityRegionListApi, getQualityRegionListApi,
getDangerTypeRecordApi, getSafeDangerTypeRecordApi,
getSubcontractListApi, getSubcontractListApi,
addRecordApi, addSafeRecordApi,
getRoutineInspectApi, getRoutineInspectApi,
selectRectifyRecordListApi, selectSafeRectifyRecordListApi,
addQualityRectifyRecordApi addSafeQualityRectifyRecordApi
} from '@/assets/js/api/quality.js' } from '@/assets/js/api/quality.js'
import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage.js' import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage.js'
import { VueCropper } from 'vue-cropper' import { VueCropper } from 'vue-cropper'
@ -1258,7 +1258,7 @@ export default {
this.replyData.qualityId = valId this.replyData.qualityId = valId
this.replyData.createUser = this.userIdInfo this.replyData.createUser = this.userIdInfo
console.log('整改提交的表单数据：：：', this.replyData); console.log('整改提交的表单数据：：：', this.replyData);
addQualityRectifyRecordApi(this.replyData).then(res => { addSafeQualityRectifyRecordApi(this.replyData).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success('提交成功') this.$message.success('提交成功')
this.dialogDetil = false this.dialogDetil = false
@ -1511,7 +1511,7 @@ export default {
}, },
//整改记录 //整改记录
selectRectifyRecordList(id) { selectRectifyRecordList(id) {
selectRectifyRecordListApi({ selectSafeRectifyRecordListApi({
qualityId: id qualityId: id
}).then((res) => { }).then((res) => {
this.rectifyRecordList = res.result this.rectifyRecordList = res.result
@ -1636,7 +1636,7 @@ export default {
data.pageNo = this.pageNo data.pageNo = this.pageNo
data.pageSize = this.pageSize data.pageSize = this.pageSize
data.operatorId = this.userIdInfo data.operatorId = this.userIdInfo
getInspectionRecordListApi(data).then((res) => { getSafeInspectionRecordListApi(data).then((res) => {
console.log('res----', res); console.log('res----', res);
if (res.code == 200) { if (res.code == 200) {
this.statisticsValue = res.result.total this.statisticsValue = res.result.total
@ -1741,7 +1741,7 @@ export default {
projectSn: this.projectSn, projectSn: this.projectSn,
recordStatus: 0, recordStatus: 0,
} }
getDangerTypeRecordApi(data).then((res) => { getSafeDangerTypeRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log(res) console.log(res)
this.classifyList = res.result this.classifyList = res.result
@ -2151,7 +2151,7 @@ export default {
data.projectSn = this.projectSn data.projectSn = this.projectSn
console.log('data', data) console.log('data', data)
data.inspectManId = this.$store.state.userInfo.userId data.inspectManId = this.$store.state.userInfo.userId
addRecordApi(data).then((res) => { addSafeRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success(this.$t('message.quality.newSuccess')) this.$message.success(this.$t('message.quality.newSuccess'))
this.$refs.addForm1.resetFields() //清除所有验证 this.$refs.addForm1.resetFields() //清除所有验证

12
src/views/projectFront/safeSame/v2/projectSelfInspection.vue
View File

@ -380,9 +380,9 @@
<script> <script>
import { import {
getInspectTypeListApi, getInspectTypeListApi,
getinspectTaskRecordListApi, getSafeInspectTaskRecordListApi,
addinspectTaskRecordApi, addSafeInspectTaskRecordApi,
deleteinspectTaskRecordApi deleteSafeInspectTaskRecordApi
} from '@/assets/js/api/safeManage.js' } from '@/assets/js/api/safeManage.js'
import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage' import { getProjectChilderSystemUserListApi } from '@/assets/js/api/configManage'
import messageV2Vue from '../../../messageV2.vue' import messageV2Vue from '../../../messageV2.vue'
@ -578,7 +578,7 @@ export default {
json.createUser = this.$store.state.userInfo.userId json.createUser = this.$store.state.userInfo.userId
json.type = 2 json.type = 2
console.log('--------新增参数', json) console.log('--------新增参数', json)
addinspectTaskRecordApi(json).then((result) => { addSafeInspectTaskRecordApi(json).then((result) => {
this.$message.success('添加成功！') this.$message.success('添加成功！')
this.checkDaterange = [] this.checkDaterange = []
this.loadList() this.loadList()
@ -598,7 +598,7 @@ export default {
...this.searchForm, ...this.searchForm,
type: 2 type: 2
} }
getinspectTaskRecordListApi(requestData).then((result) => { getSafeInspectTaskRecordListApi(requestData).then((result) => {
this.rocordList = result.result.records this.rocordList = result.result.records
this.pageTotal = result.result.total this.pageTotal = result.result.total
}) })
@ -621,7 +621,7 @@ export default {
let data = { let data = {
id: item.id id: item.id
} }
deleteinspectTaskRecordApi(data).then((res) => { deleteSafeInspectTaskRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.loadList() this.loadList()
this.$message({ this.$message({