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

企业后台bug修复

Browse Source
This commit is contained in:
骆乐 2022-09-22 15:30:27 +08:00
parent 8804a0eff8
commit 244e976f0a
7 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist.zip
View File

Binary file not shown.

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

@ -13,6 +13,7 @@ export const addDangerItemRecordApi = data => post('xmgl/dangerItemRecord/add',
export const editDangerItemRecordApi = data => post('xmgl/dangerItemRecord/edit', data);
export const getDangerItemRecordApi = data => post('xmgl/dangerItemRecord/list', data); //质量问题库信息 列表信息---右边
export const getCompanyDangerItemRecordApi = data => post('xmgl/dangerItemRecord/selectCompanyDangerItemRecordList', data); //企业质量问题库信息 列表信息---右边
export const delDangerItemRecordApi = data => post('xmgl/dangerItemRecord/delete', data); // 删除质量问题库—子项信息

4
src/assets/js/http.js
View File

@ -41,10 +41,10 @@ if (process.env.NODE_ENV == 'development') {
// tag: 本地
// axios.defaults.baseURL = 'http://192.168.34.174:6023/' // 老大本地
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
// axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
// axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
// axios.defaults.baseURL = 'http://192.168.34.216:18070/' // 邱平毅本地
// axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';

63
src/views/companyAdmin/basicSetup/checkItem.vue
View File

@ -258,7 +258,7 @@
>
<span style="font-size: 14px">编辑</span>
</el-button>
<!-- <el-button
<el-button
@click="del1(scope.row.id,3)"
type="text"
size="small"
@ -266,7 +266,7 @@
icon="el-icon-delete"
>
<span style="font-size:14px">删除</span>
</el-button> -->
</el-button>
</template>
</el-table-column>
</el-table>
@ -281,9 +281,9 @@
width="30%"
>
<p>你确定要删除该项吗</p>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogVisible1 = false">取 消</el-button>
<el-button type="primary" @click="delSave1">确 定</el-button>
<div slot="footer" style="margin-top:0px;" class="dialog-footer">
<el-button size="medium" @click="dialogVisible1 = false">取 消</el-button>
<el-button size="medium" type="primary" @click="delSave1">确 定</el-button>
</div>
</el-dialog>
<el-dialog
@ -431,6 +431,7 @@
import {
addDangerTypeRecordApi,
editDangerTypeRecordApi,
delDangerItemRecordApi,
getCompanyDangerTypeRecordApi,
addDangerItemRecordApi,
editDangerItemRecordApi,
@ -628,30 +629,47 @@ export default {
this.dialogdata = data;
},
delSave1() {
this.dialogVisible1 = false;
this.$message({
message: "删除成功",
type: "success",
});
return;
let url = "http://47.104.132.250:9000/itbgpv2/inspect/option/delete";
this.$http.get(url, { params: { id: this.editId } }).then((res) => {
if (res.data.result) {
this.dialogVisible1 = false;
delDangerItemRecordApi({ id: this.editId }).then((res) => {
console.log('========',res)
if (res.code == 200) {
this.$message({
message: res.data.message,
type: "error",
message: '删除成功',
type: 'success',
});
this.loadList();
this.loadRigthtList()
} else {
this.$message({
message: res.data.message,
message: '删除失败',
type: "error",
});
}
});
this.dialogVisible1 = false;
});
// this.dialogVisible1 = false;
// this.$message({
// message: "删除成功",
// type: "success",
// });
// return;
// let url = "http://47.104.132.250:9000/itbgpv2/inspect/option/delete";
// this.$http.get(url, { params: { id: this.editId } }).then((res) => {
// if (res.data.result) {
// this.dialogVisible1 = false;
// this.$message({
// message: res.data.message,
// type: "error",
// });
// this.loadList();
// } else {
// this.$message({
// message: res.data.message,
// type: "error",
// });
// }
// });
},
del1(id, type) {
console.log(id);
@ -785,7 +803,7 @@ export default {
letter-spacing: 1px;
font-weight: bold;
.clickName {
width: calc(100% - 145px);
// width: calc(100% - 145px);
.imgbox {
display: inline-block;
margin: 0 6px 0 13px;
@ -813,6 +831,7 @@ export default {
// }
// }
}
.system-right {
float: right;
// margin-right: 1.5%;

7
src/views/projectFront/configManage/personnelAccess.vue
View File

@ -440,6 +440,13 @@ export default {
trigger: "blur",
},
],
workerId:[
{
required: true,
message: this.$t("message.personnelPosition.required"),
trigger: "blur",
},
]
},
List: [],
Popup: {

2
src/views/projectFront/materialManage/projectSiteManage.vue
View File

@ -462,7 +462,7 @@
</div>
</el-tab-pane>
<!-- 已选材料 -->
<el-tab-pane label="$t('message.energyManage.material.selectMaterial')" name="second">
<el-tab-pane :label="$t('message.energyManage.material.selectMaterial')" name="second">
<el-table height="552px" :data="multipleSelection" class="tables">
<!-- 序号 -->
<el-table-column

1
src/views/projectFront/quality/businessModule/checkPoint.vue
View File

@ -303,6 +303,7 @@ export default {
getProjectChilderSystemUserListApi(data).then((res) => {
// console.log(res);
if (res.code == 200) {
console.log('------整改人',res)
this.notifierOrPeopleList = res.result;
}
});