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-05-07 19:16:21 +08:00
parent c9923326dc
commit 498eaf23b7
24 changed files with 1871 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/doc/h5Entry/index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.8643de0dc8f998d365ed637881945b3a.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>人员录入</title><link href=/doc/h5Entry/static/css/app.c931b0ebe9ac910383137a7b7f60d832.css rel=stylesheet></head><body><div id=app></div><script>var host = window.location.origin;
var rootURL = host + "/";
// var rootURL = "http://192.168.34.221:28888/";
// var rootURL = "http://192.168.34.221:9111/"; //本地
@ -16,4 +16,4 @@
// rootURL = "http://192.168.34.155:19111/" //本地
// locationURL=rootURL+'doc/h5Entry/index.html?userId=4&projectSn=a2ef0238b59146aa814b93f47710dbf2#/'
locationURL=rootURL+'doc/h5Entry/index.html?userId=1779721457571291137&projectSn=BD3137498CB84BF0969979E0342CDBCA&educationId=1666278624304615426#/'
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.3d700e6bdd90ba47631c.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.c6b3cb802133ea2879cb.js></script></body></html>
}</script><script type=text/javascript src=/doc/h5Entry/static/js/manifest.3dd7fa638d0b235ef366.js></script><script type=text/javascript src=/doc/h5Entry/static/js/vendor.08fb8d13d88c906352f9.js></script><script type=text/javascript src=/doc/h5Entry/static/js/app.9abf58dc6ce00cb9831b.js></script></body></html>

2
public/doc/h5Entry/static/css/app.c931b0ebe9ac910383137a7b7f60d832.css Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/css/app.c931b0ebe9ac910383137a7b7f60d832.css.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/4.127f93cd6c3a53156c1d.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/js/4.127f93cd6c3a53156c1d.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/5.5032d72676c40b1bb4da.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/doc/h5Entry/static/js/5.5032d72676c40b1bb4da.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/app.9abf58dc6ce00cb9831b.js Normal file
View File

@ -0,0 +1,2 @@
webpackJsonp([7],{"4ml/":function(e,n){},NGWz:function(e,n){!function(e,n){const t=e.documentElement;function i(){const e=Math.min(t.getBoundingClientRect().width,768);t.style.fontSize=e/7.5+"px"}i(),n.addEventListener("resize",i)}(document,window)},NHnr:function(e,n,t){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var i=t("7+uW"),o={render:function(){var e=this.$createElement,n=this._self._c||e;return n("div",{attrs:{id:"app"}},[n("router-view")],1)},staticRenderFns:[]};var a=t("VU/8")({name:"App"},o,!1,function(e){t("RvT9")},null,null).exports,l=t("mtWM"),u=t.n(l),r=t("/ocq");i.a.use(r.a);var c=new r.a({routes:[{path:"/",name:"index",component:function(){return Promise.all([t.e(0),t.e(2)]).then(t.bind(null,"2NXm"))},meta:{title:"在线测试"}},{path:"/infoInput",name:"home",component:function(){return Promise.all([t.e(0),t.e(5)]).then(t.bind(null,"vkyI"))},meta:{title:"人员录入"}},{path:"/submitPage",name:"submitPage",component:function(){return Promise.all([t.e(0),t.e(1)]).then(t.bind(null,"SHNa"))},meta:{title:"人员录入"}},{path:"/blockDetails",name:"blockDetails",component:function(){return Promise.all([t.e(0),t.e(3)]).then(t.bind(null,"A4ZW"))},meta:{title:"试块详情"}},{path:"/finish",name:"finish",component:function(){return t.e(4).then(t.bind(null,"66ch"))},meta:{title:""}}]}),m=t("Fd2+"),p=(t("4ml/"),t("NGWz"),t("nrAE")),s=t.n(p);i.a.use(s.a),i.a.use(m.a),i.a.prototype.$axios=u.a,i.a.config.productionTip=!1,c.beforeEach(function(e,n,t){e.meta.title&&(document.title=e.meta.title),t()}),new i.a({el:"#app",router:c,components:{App:a},template:"<App/>"})},RvT9:function(e,n){}},["NHnr"]);
//# sourceMappingURL=app.9abf58dc6ce00cb9831b.js.map

1
public/doc/h5Entry/static/js/app.9abf58dc6ce00cb9831b.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
public/doc/h5Entry/static/js/manifest.3dd7fa638d0b235ef366.js Normal file
View File

@ -0,0 +1,2 @@
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,d=[];s<r.length;s++)u=r[s],t[u]&&d.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);d.length;)d.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={8:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"fbf64467c6abbbc1eb98",1:"f197bda3a590ee95a483",2:"71d89ea01849e20a56e5",3:"4dbc61fae8f9d7188195",4:"127f93cd6c3a53156c1d",5:"5032d72676c40b1bb4da"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="/doc/h5Entry/",o.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.3dd7fa638d0b235ef366.js.map

1
public/doc/h5Entry/static/js/manifest.3dd7fa638d0b235ef366.js.map Normal file
View File

File diff suppressed because one or more lines are too long

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

@ -52,9 +52,15 @@ export const getSafeInspectionRecordListApi = data=> post('xmgl/xzSecurityQualit
export const getSubcontractListApi = data=> post('xmgl/projectEnterprise/list',data); //质量检查记录 获取分包公司列表
export const addRecordApi = data=> post('xmgl/qualityInspectionRecord/add',data); //质量检查记录 新增记录
export const addSafeRecordApi = data=> post('xmgl/xzSecurityQualityInspectionRecord/add',data); //质量检查记录 新增记录
export const editRecordApi = data=> post('xmgl/qualityInspectionRecord/edit',data); //质量检查记录 编辑记录
export const editSafeRecordApi = data=> post('xmgl/xzSecurityQualityInspectionRecord/edit',data); //质量检查记录 编辑记录
export const getRoutineInspectApi = data=> post('xmgl/routineInspect/list',data); //质量检查记录 例行检查
export const selectRectifyRecordListApi = data=> post('xmgl/qualityRectifyRecord/selectRectifyRecordList',data); //质量整改记录
export const selectSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualityRectifyRecord/selectRectifyRecordList',data); //质量整改记录
export const deleteRectifyRecordListApi = data=> post('xmgl/qualityInspectionRecord/delete',data); //删除质量整改记录
export const deleteSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualityRectifyRecord/delete',data); //删除质量整改记录
export const backRectifyRecordListApi = data=> post('xmgl/qualityInspectionRecord/revocation',data); //撤回质量整改记录
export const backSafeRectifyRecordListApi = data=> post('xmgl/xzSecurityQualityInspectionRecord/revocation',data); //撤回质量整改记录
// 楼栋管理

4
src/components/centerChange.vue
View File

@ -25,12 +25,12 @@
>
用户中心
</div>
<!-- <div
<div
@click="jumpRouter('/infoCenter/allInfo')"
:class="isActive('/infoCenter/allInfo') ? 'active-item' : ''"
>
消息中心
</div> -->
</div>
</div>
</div>
</div>

6
src/router/index.js
View File

@ -528,6 +528,12 @@ const routes2 = [
// name: "劳务管理_花名册1",
// component: () => import("@/views/projectFront/laborManage/roster.vue"),
// },
//劳务管理--准入台账
{
path: "/project/labor/entryRecord",
name: "劳务管理_准入台账",
component: () => import("@/views/projectFront/laborManage/entryRecord.vue"),
},
//劳务管理--花名册（颜色版本）
{
path: "/project/labor/roster",

26
src/store/index.js
View File

@ -48,24 +48,24 @@ export default new Vuex.Store({
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
// WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
WORKFLOWURL: 'http://192.168.34.138:88/#/workspace/forms',//测试工作流地址(本地)
// UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试
// FILEURL:'http://jxj.zhgdyun.com:15551/image/',//测试
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境
UPLOADURL:
window.location.protocol +
"//" +
window.location.host +
"/upload/image", //正式环境
FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// BASEURL: baseUrl
// ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL:
// window.location.protocol +
// "//" +
// window.location.host +
// "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
//---------------------------------------------------------------------------------------------
// BASEURL: baseUrl

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

@ -226,7 +226,7 @@
:before-upload="beforeAvatarUpload"
:action="
$http.defaults.baseURL +
'xmgl/dangerTypeRecord/importDangerTypeRecordExcelTemplate'
'xmgl/xzSecurityDangerTypeRecord/importDangerTypeRecordExcelTemplate'
"
:limit="1"
:show-file-list="false"

34
src/views/infoCenter/allInfo/componentsModule/dataListData.vue
View File

@ -68,6 +68,7 @@
v-loading="loading"
:data="tableData"
@selection-change="handleSelectionChange"
@row-click="rowClickFn"
>
<!-- @row-click="rowClickFn" -->
<!-- <el-table-column type="selection" align="center" width="60" /> -->
@ -78,7 +79,7 @@
color: scope.row.isRead == 1 ? '#BFBFBF' : '#5181F7',
}"
style="cursor: pointer"
@click="infoDetailOpen(scope.row)"
@click.stop="infoDetailOpen(scope.row)"
>{{ scope.row.title }}</span
>
</template>
@ -146,7 +147,7 @@ export default {
{ name: "全部类别", value: "" },
{ name: "质量", value: 11 },
{ name: "安全", value: 10 },
{ name: "AI", value: 8 }
{ name: "AI", value: 8 },
],
devSn: "",
// 遮罩层
@ -180,15 +181,28 @@ export default {
},
methods: {
// 表格行点击
rowClickFn(row,column,event){
console.log(row)
if(row.type == 11){ // 质量
this.$router.push("/project/quality/inspectionLedger");
} else if(row.type == 10){ // 安全
this.$router.push("/project/safeSame/inspectionLedger");
} else if(row.type == 8){ // AI
this.$router.push("/project/aiAnalysis/warningList");
rowClickFn(row, column, event) {
console.log(row);
let path = "";
if (row.type == 11) {
// 质量
path = "/project/quality/inspectionLedger";
} else if (row.type == 10) {
// 安全
path = "/project/safeSame/inspectionLedger";
} else if (row.type == 8) {
// AI
path = "/project/aiAnalysis/warningList";
}
let moduleList = this.$store.state.userInfo.menuAuthority.moduleList;
moduleList.map((item) => {
item.menuList.map((item2) => {
if (item2.path == path) {
this.$store.commit("setMenuList", item.menuList);
}
});
});
this.$router.push(path);
},
// 删除
deleteInfoFn() {

26
src/views/infoCenter/hadRead/componentsModule/dataListData.vue
View File

@ -66,7 +66,7 @@
<!-- <el-button type="danger" plain size="medium" @click="deleteInfoFn">删除</el-button> -->
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
<el-table class="tables" v-loading="loading" :data="tableData" @row-click="rowClickFn" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" align="center" width="60" /> -->
<el-table-column label="标题内容" align="center" prop="title">
<template slot-scope="scope">
@ -171,6 +171,30 @@ export default {
this.getList();
},
methods: {
// 表格行点击
rowClickFn(row, column, event) {
console.log(row);
let path = "";
if (row.type == 11) {
// 质量
path = "/project/quality/inspectionLedger";
} else if (row.type == 10) {
// 安全
path = "/project/safeSame/inspectionLedger";
} else if (row.type == 8) {
// AI
path = "/project/aiAnalysis/warningList";
}
let moduleList = this.$store.state.userInfo.menuAuthority.moduleList;
moduleList.map((item) => {
item.menuList.map((item2) => {
if (item2.path == path) {
this.$store.commit("setMenuList", item.menuList);
}
});
});
this.$router.push(path);
},
// 删除
deleteInfoFn(){
let selectedIds = [];

26
src/views/infoCenter/notRead/componentsModule/dataListData.vue
View File

@ -67,7 +67,7 @@
<el-button type="danger" plain size="medium" @click="deleteInfoFn">删除</el-button> -->
</div>
<div class="table_wrap whiteBlock">
<el-table class="tables" v-loading="loading" :data="tableData" @selection-change="handleSelectionChange">
<el-table class="tables" v-loading="loading" :data="tableData" @row-click="rowClickFn" @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" align="center" width="60" /> -->
<el-table-column label="标题内容" align="center" prop="title">
<template slot-scope="scope">
@ -172,6 +172,30 @@ export default {
this.getList();
},
methods: {
// 表格行点击
rowClickFn(row, column, event) {
console.log(row);
let path = "";
if (row.type == 11) {
// 质量
path = "/project/quality/inspectionLedger";
} else if (row.type == 10) {
// 安全
path = "/project/safeSame/inspectionLedger";
} else if (row.type == 8) {
// AI
path = "/project/aiAnalysis/warningList";
}
let moduleList = this.$store.state.userInfo.menuAuthority.moduleList;
moduleList.map((item) => {
item.menuList.map((item2) => {
if (item2.path == path) {
this.$store.commit("setMenuList", item.menuList);
}
});
});
this.$router.push(path);
},
// 删除
deleteInfoFn(){
let selectedIds = [];

1019
src/views/projectFront/laborManage/entryRecord.vue Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/views/projectFront/laborManage/personDetails.vue
View File

@ -2205,6 +2205,12 @@
>
{{ $t('message.laborMange.punishmentRecord') }}
</div>
<div
:class="activeClass == 9 ? 'checkedClass' : ''"
@click="getActiveClass(9)"
>
安全扣分详情
</div>
</div>
</div>
<!-- 图片裁剪-编辑 -->

4
src/views/projectFront/materialManage/materialExitManage.vue
View File

@ -37,7 +37,7 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="入场时间" prop="materialName">
<el-form-item label="出场时间" prop="materialName">
<el-date-picker
size="medium"
v-model="queryInfo.timeRange"
@ -80,7 +80,7 @@
<el-table-column
prop="entryTime"
align="center"
label="入场时间"
label="出场时间"
></el-table-column>
<el-table-column align="center" label="操作" width="280">
<template slot-scope="scope">

489
src/views/projectFront/quality/inspectionLedger.vue
View File

@ -231,7 +231,7 @@
"
>
<template slot-scope="scope">
<el-button type="text">
<el-button type="text" v-if="scope.row.status != 6">
{{
scope.row.status == 1
? $t("message.quality.noRectification")
@ -250,7 +250,8 @@
: ""
}}
</el-button>
<span class="tableStatus" v-show="scope.row.overTime == true"
<span style="color: #94979E;" v-else>已撤回</span>
<span class="tableStatus" v-show="scope.row.overTime == true && scope.row.status != 6"
>超期</span
>
<div>{{ scope.row.changeLimitTime }}</div>
@ -315,9 +316,9 @@
</div>
</template>
</el-table-column>
<el-table-column align="center" label="操作">
<el-table-column align="center" label="操作" width="260">
<template slot-scope="scope">
<div class="tableBtns" style="margin-left: 60px">
<div class="tableBtns" style="justify-content: center">
<div
@click="newShowDatadetails(scope.row, scope.$index)"
class="operationText last"
@ -328,6 +329,37 @@
></i>
<span>查看</span>
</div>
<div
class="operationText"
v-if="
scope.row.status == 6 &&
scope.row.inspectManId == $store.state.userInfo.userId
"
@click="editRow(scope.row)"
>
<img
src="@/assets/images/icon-edit.png"
width="15px"
height="15px"
/>
<span>{{ $t("message.alarmValueSet.edit") }}</span>
</div>
<div
@click="deleteQuestion(scope.row)"
class="operationText"
v-if="
scope.row.status == 6 &&
scope.row.inspectManId == $store.state.userInfo.userId
"
>
<img
src="@/assets/images/icon-delete.png"
width="15px"
height="15px"
/>
<!-- 删除 -->
<span>{{ $t("message.alarmValueSet.delete") }}</span>
</div>
</div>
</template>
</el-table-column>
@ -374,7 +406,8 @@
>
</el-radio-group>
<div
v-show="recordType == 1 || (recordType == 1 && type == 'detail')" v-cascaderDirect
v-show="recordType == 1 || (recordType == 1 && type == 'detail')"
v-cascaderDirect
>
<el-form
ref="addForm1"
@ -382,7 +415,6 @@
:rules="addForm1Rules"
:model="addForm1"
label-width="120px"
>
<!-- 质量问题 检查部位-->
<el-form-item
@ -589,13 +621,13 @@
v-model="addForm1.urgentLevel"
:disabled="type == 'detail'"
>
<el-radio :label="1">{{
<el-radio label="1">{{
$t("message.quality.ordinary")
}}</el-radio>
<el-radio :label="2">{{
<el-radio label="2">{{
$t("message.quality.severity")
}}</el-radio>
<el-radio :label="3">{{
<el-radio label="3">{{
$t("message.quality.critical")
}}</el-radio>
</el-radio-group>
@ -659,7 +691,12 @@
v-model="addForm1.enterpriseName"
clearable
@focus="getEnterprise"
@clear="addForm1.enterpriseSn = '';addForm1.enterpriseName = '';addForm1.changeId = '';crewUpdateList = []"
@clear="
addForm1.enterpriseSn = '';
addForm1.enterpriseName = '';
addForm1.changeId = '';
crewUpdateList = [];
"
>
</el-input>
</el-form-item>
@ -1125,7 +1162,10 @@
v-model="addForm2.enterpriseName"
clearable
@focus="getEnterprise"
@clear="addForm2.enterpriseSn = '';addForm2.enterpriseName = ''"
@clear="
addForm2.enterpriseSn = '';
addForm2.enterpriseName = '';
"
>
</el-input>
</el-form-item>
@ -1195,6 +1235,7 @@
>{{ $t("message.alarmValueSet.cancel") }}
</el-button>
<el-button
v-if="addTitle != '编辑'"
:disabled="type == 'detail'"
type="primary"
icon="el-icon-circle-check"
@ -1202,6 +1243,15 @@
size="medium"
>{{ $t("message.alarmValueSet.save") }}
</el-button>
<el-button
v-if="addTitle == '编辑'"
:disabled="type == 'detail'"
type="primary"
icon="el-icon-circle-check"
@click="submitEditRecordFrom"
size="medium"
>重新提交
</el-button>
</div>
</vue-scroll>
</el-dialog>
@ -1479,8 +1529,20 @@
<div style="width: 800px">
<!-- 隐患记录 超期整改 -->
<div class="headerLeft">隐患记录</div>
<div
class="back-btn"
v-if="
detailData.status == 2 &&
rectifyRecordList.length == 0 &&
detailData.inspectManId == $store.state.userInfo.userId
"
@click="backQuestion(detailData)"
>
<i class="el-icon-refresh-right"></i>
<span>撤回</span>
</div>
<span
v-if="detailData.overTime == true"
v-else-if="detailData.overTime == true"
style="
color: red;
font-weight: 500;
@ -1530,6 +1592,8 @@
? '#a020f0'
: detailData.status == 5
? '#21c28e'
: detailData.status == 6
? '#262D47'
: '',
}"
>
@ -1545,6 +1609,8 @@
? '#a020f0'
: detailData.status == 5
? '#21c28e'
: detailData.status == 6
? '#262D47'
: '',
}"
></span>
@ -1558,6 +1624,8 @@
? "待核验"
: detailData.status == 5
? "合格"
: detailData.status == 6
? "已撤回"
: ""
}}</span
>
@ -1762,7 +1830,7 @@
<el-col :span="12" v-show="detailData.recordType == 1">
<div class="grid-content">
<span class="label" style="margin-left: -14px"
>复查人1：</span
>复查人：</span
>
<span class="value" style="margin-left: 25px">{{
detailData.reviewName
@ -1808,7 +1876,7 @@
<el-col :span="12">
<div class="grid-content">
<span class="label">现场照片：</span>
<span class="value" style="cursor: pointer;">
<span class="value" style="cursor: pointer">
<el-image
v-for="(item, index) in parseImage2(
detailData.imageUrl
@ -1891,7 +1959,7 @@
? "复查照片："
: "核验照片："
}}</span>
<span class="value" style="cursor: pointer;">
<span class="value" style="cursor: pointer">
<el-image
v-for="(item2, index) in item.fileUrl"
:key="index"
@ -1910,14 +1978,19 @@
</el-card>
</el-timeline-item>
</el-timeline>
<div v-if="![5].includes(detailData.status)">
<div
v-if="
![5].includes(detailData.status) &&
statusCondition(detailData)
"
>
<div class="headerLeft">
{{
detailData.status == 2
? '整改回复'
? "整改回复"
: detailData.status == 3
? '复查回复'
: '核验回复'
? "复查回复"
: "核验回复"
}}
</div>
<el-row :gutter="20">
@ -1930,10 +2003,10 @@
<span style="color: red">*&nbsp;</span
>{{
detailData.status == 2
? '整改时间：'
? "整改时间："
: detailData.status == 3
? '复查时间：'
: '核验时间：'
? "复查时间："
: "核验时间："
}}</span
>
@ -1982,10 +2055,10 @@
><span style="color: red">*&nbsp;</span
>{{
detailData.status == 2
? '整改照片：'
? "整改照片："
: detailData.status == 3
? '复查照片：'
: '核验照片：'
? "复查照片："
: "核验照片："
}}</span
>
<span
@ -2020,7 +2093,7 @@
</div>
</vue-scroll>
</div>
<div class="btn-box">
<div class="btn-box" v-if="statusCondition(detailData)">
<el-button
v-if="detailData.status == 3 || detailData.status == 4"
size="medium"
@ -2050,6 +2123,9 @@
>提交</el-button
>
</div>
<div class="btn-box" v-else>
<el-button size="medium" @click="dialogDetil = false">取消</el-button>
</div>
</el-dialog>
<!-- 视频播放 -->
<el-dialog
@ -2081,9 +2157,12 @@ import {
getDangerTypeRecordApi,
getSubcontractListApi,
addRecordApi,
editRecordApi,
getRoutineInspectApi,
selectRectifyRecordListApi,
addQualityRectifyRecordApi,
deleteRectifyRecordListApi,
backRectifyRecordListApi
} from "@/assets/js/api/quality.js";
import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage.js";
import { VueCropper } from "vue-cropper";
@ -2101,7 +2180,7 @@ export default {
return {
areaData: {},
replyData: {
rectifyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
rectifyTime: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
fileUrl: "",
additionalRemarks: "",
qualityId: "",
@ -2260,7 +2339,7 @@ export default {
},
computed: {
isJSON() {
return function(str) {
return function (str) {
if (typeof str == "string") {
try {
var obj = JSON.parse(str);
@ -2278,6 +2357,117 @@ export default {
},
mounted() {},
methods: {
backQuestion(obj) {
console.log("删除", obj);
this.$confirm(
"确定撤回该条记录?",
this.$t("message.personnelPosition.beaconManage.table.Tips"),
{
confirmButtonText: this.$t(
"message.personnelPosition.confirmButtonText"
),
cancelButtonText: this.$t(
"message.personnelPosition.cancelButtonText"
),
type: "warning",
}
)
.then(() => {
backRectifyRecordListApi({ id: obj.id }).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.onSubmit();
this.dialogDetil = false;
}
});
})
.catch(() => {});
},
editRow(obj){ // 编辑撤回数据(重新提交)
this.addForm1 = obj;
console.log(this.addForm1,777)
this.addTitle = "编辑";
this.recordType = obj.recordType;
if(obj.recordType == 1){
this.addForm1 = obj;
let arr = obj.imageUrl.split(",");
let fileArr = obj.fileUrl.split(",");
let showImgUrl = [];
let showFileUrl = [];
for (let i = 0; i < arr.length; i++) {
let imgArr = arr[i].split("*");
let objData = { name: imgArr[0], url: imgArr[1] };
showImgUrl.push(objData);
}
for (let i = 0; i < fileArr.length; i++) {
let file = fileArr[i].split("*");
let objData = { name: file[0], url: file[1] };
showFileUrl.push(objData);
}
showFileUrl = showFileUrl.filter((item) => {
return item.url != undefined;
});
showImgUrl = showImgUrl.filter((item) => {
return item.url != undefined;
});
this.fileList1 = showImgUrl;
this.fileList2 = showFileUrl;
} else if(obj.recordType == 2){
this.addForm2 = obj;
}
// 逻辑结束
this.addDialog = true;
this.getPositionList();
this.getDescribeClassifyList();
this.getPeopleList();
this.getReviewPeopleList();
this.getPeopleUpdateList();
this.getRoutineInspect();
this.rectifyRecordList = [];
},
deleteQuestion(obj) {
console.log("删除", obj);
this.$confirm(
"确定删除该条记录?",
this.$t("message.personnelPosition.beaconManage.table.Tips"),
{
confirmButtonText: this.$t(
"message.personnelPosition.confirmButtonText"
),
cancelButtonText: this.$t(
"message.personnelPosition.cancelButtonText"
),
type: "warning",
}
)
.then(() => {
deleteRectifyRecordListApi({ id: obj.id }).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.onSubmit();
}
});
})
.catch(() => {});
},
statusCondition(data) {
console.log(data, "我爱我爱");
if (data.status == 2) {
if (data.changeId == this.$store.state.userInfo.userId) {
return true;
}
} else if (data.status == 3) {
if (data.reviewId == this.$store.state.userInfo.userId) {
return true;
}
} else if (data.status == 4) {
if (data.verifyManId == this.$store.state.userInfo.userId) {
return true;
}
} else {
return false;
}
},
//关闭视频
closeBtn() {
this.isShow = false;
@ -2306,7 +2496,7 @@ export default {
this.dialogDetil = true;
this.detailData = item;
this.replyData = {
rectifyTime: moment(new Date()).format('YYYY-MM-DD HH:mm:ss'),
rectifyTime: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
fileUrl: "",
additionalRemarks: "",
};
@ -2340,6 +2530,22 @@ export default {
} else {
this.replyData.fileUrl = "";
}
if (
this.replyData.rectifyTime == "" ||
this.replyData.additionalRemarks == "" ||
this.fileListRectification.length == 0
) {
this.$message.error("请将回复内容输入完整");
return;
}
if (this.replyData.additionalRemarks == "") {
this.$message.error("请选择整改时间");
return;
}
if (this.replyData.rectifyTime == "") {
this.$message.error("请选择整改时间");
return;
}
this.replyData.qualityId = valId;
this.replyData.createUser = this.userIdInfo;
console.log("整改提交的表单数据：：：", this.replyData);
@ -2509,26 +2715,24 @@ export default {
//remark整改要求 level等级
if (e.length) {
console.log(this.$refs["formRegion2"].getCheckedNodes()[0].data);
this.addForm1.level = this.$refs[
"formRegion2"
].getCheckedNodes()[0].data.level;
this.addForm1.remark = this.$refs[
"formRegion2"
].getCheckedNodes()[0].data.remark;
this.addForm1.level =
this.$refs["formRegion2"].getCheckedNodes()[0].data.level;
this.addForm1.remark =
this.$refs["formRegion2"].getCheckedNodes()[0].data.remark;
} else {
this.addForm1.level = "";
this.addForm1.remark = "";
}
},
changeRegion(val) {
console.log(val,666777)
console.log(val, 666777);
// console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0])
if (this.recordType == 1) {
this.addForm1.enterpriseSn = "";
this.addForm1.enterpriseName = "";
this.addForm1.changeId = "";
let pathLabels = this.$refs["formRegion1"].getCheckedNodes()[0]
.pathLabels;
let pathLabels =
this.$refs["formRegion1"].getCheckedNodes()[0].pathLabels;
let data = this.$refs["formRegion1"].getCheckedNodes()[0].data;
this.areaData = data;
console.log(data, 666);
@ -2574,8 +2778,8 @@ export default {
} else if (this.recordType == 2) {
this.addForm2.enterpriseSn = "";
this.addForm2.enterpriseName = "";
let pathLabels = this.$refs["addFormRegion2"].getCheckedNodes()[0]
.pathLabels;
let pathLabels =
this.$refs["addFormRegion2"].getCheckedNodes()[0].pathLabels;
let data = this.$refs["addFormRegion2"].getCheckedNodes()[0].data;
let text = "";
for (let i = 0; i < pathLabels.length; i++) {
@ -2743,7 +2947,7 @@ export default {
//新增按钮
addBtn(type) {
console.log(type)
console.log(type);
if (type == 1) {
this.type = "detail";
this.addTitle =
@ -2877,15 +3081,13 @@ export default {
this.$refs["cascaderAddr"].getCheckedNodes()[0].pathLabels.length >=
3
) {
this.addForm1.level = this.$refs[
"cascaderAddr"
].getCheckedNodes()[0].data.level;
this.addForm1.level =
this.$refs["cascaderAddr"].getCheckedNodes()[0].data.level;
} else {
this.addForm1.level = "";
}
this.addForm1.remark = this.$refs[
"cascaderAddr"
].getCheckedNodes()[0].data.remark;
this.addForm1.remark =
this.$refs["cascaderAddr"].getCheckedNodes()[0].data.remark;
this.addForm1.dangerItemContent = pathLabels[0].pathLabels
.map((item) => {
@ -2900,9 +3102,8 @@ export default {
} else {
// this.addForm2.level =
// this.$refs['cascaderAddr2'].getCheckedNodes()[0].data.level
this.addForm2.remark = this.$refs[
"cascaderAddr2"
].getCheckedNodes()[0].data.remark;
this.addForm2.remark =
this.$refs["cascaderAddr2"].getCheckedNodes()[0].data.remark;
this.addForm2.dangerItemContent = pathLabels2[0].pathLabels
.map((item) => {
@ -2963,11 +3164,11 @@ export default {
// this.getPeopleUpdateList();
const newArr = [];
this.areaData.systemUsers.filter((item) => {
if(item.userId && item.enterpriseId == this.unitEnterpriseId){
newArr.push(item)
if (item.userId && item.enterpriseId == this.unitEnterpriseId) {
newArr.push(item);
}
});
console.log(newArr,666777)
console.log(newArr, 666777);
this.crewUpdateList = newArr;
this.showEnterpriseDialog = false;
},
@ -3149,14 +3350,14 @@ export default {
w,
h;
if (oImg.naturalWidth) {
oImg.onload = function() {
oImg.onload = function () {
w = oImg.naturalWidth;
h = oImg.naturalHeight;
};
} else {
// IE 6/7/8
var nImg = new Image();
nImg.onload = function() {
nImg.onload = function () {
w = nImg.width;
h = nImg.height;
};
@ -3217,9 +3418,8 @@ export default {
this.addForm1.regionId.length > 1
? this.addForm1.regionId[this.addForm1.regionId.length - 1]
: this.addForm1.regionId[0];
data.dangerItemId = this.addForm1.dangerItemId[
this.addForm1.dangerItemId.length - 1
];
data.dangerItemId =
this.addForm1.dangerItemId[this.addForm1.dangerItemId.length - 1];
data.dangerTypeId = this.addForm1.dangerItemId[0];
let pointArr = [];
for (let i = 0; i < this.pointList.length; i++) {
@ -3253,9 +3453,8 @@ export default {
this.addForm2.regionId.length > 1
? this.addForm2.regionId[this.addForm2.regionId.length - 1]
: this.addForm2.regionId[0];
data.dangerItemId = this.addForm2.dangerItemId[
this.addForm2.dangerItemId.length - 1
];
data.dangerItemId =
this.addForm2.dangerItemId[this.addForm2.dangerItemId.length - 1];
data.dangerTypeId = this.addForm2.dangerItemId[0];
// data.regionId = this.addForm2.regionId
// ? this.addForm2.regionId.pop()
@ -3305,7 +3504,117 @@ export default {
}
});
},
//重新提交 编辑
submitEditRecordFrom() {
let newRefs = null;
if (this.recordType == 1) {
newRefs = "addForm1";
} else if (this.recordType == 2) {
newRefs = "addForm2";
}
console.log(this.addForm1);
console.log(this.addForm2);
this.$refs[newRefs].validate((valid) => {
if (valid) {
let data = {};
if (this.recordType == 1) {
data = JSON.parse(JSON.stringify(this.addForm1));
data.regionId =
this.addForm1.regionId.length > 1
? this.addForm1.regionId[this.addForm1.regionId.length - 1]
: this.addForm1.regionId[0];
data.dangerItemId =
this.addForm1.dangerItemId[this.addForm1.dangerItemId.length - 1];
data.dangerTypeId = this.addForm1.dangerItemId[0];
let pointArr = [];
for (let i = 0; i < this.pointList.length; i++) {
let obj =
this.pointList[i].coordinateX +
"*" +
this.pointList[i].coordinateY;
pointArr.push(obj);
}
let imgUrl = [];
let fileUrl = [];
for (let i = 0; i < this.fileList1.length; i++) {
let obj = this.fileList1[i].name + "*" + this.fileList1[i].url;
imgUrl.push(obj);
}
for (let i = 0; i < this.fileList2.length; i++) {
let obj = this.fileList2[i].name + "*" + this.fileList2[i].url;
fileUrl.push(obj);
}
data.measurePoints = pointArr.join(",");
console.log("data=============", data);
console.log("data=============", this.addForm1.notifyPerson);
console.log("data=============", imgUrl);
console.log("data=============", fileUrl);
if(this.addForm1.notifyPerson){
data.notifyPerson = this.addForm1.notifyPerson.join(",");
}
data.imageUrl = imgUrl.join(",");
data.fileUrl = fileUrl.join(",");
if (data.verifyManId == this.$store.state.userInfo.realName) {
data.verifyManId = this.$store.state.userInfo.userId;
}
} else {
data = JSON.parse(JSON.stringify(this.addForm2));
data.regionId =
this.addForm2.regionId.length > 1
? this.addForm2.regionId[this.addForm2.regionId.length - 1]
: this.addForm2.regionId[0];
data.dangerItemId =
this.addForm2.dangerItemId[this.addForm2.dangerItemId.length - 1];
data.dangerTypeId = this.addForm2.dangerItemId[0];
// data.regionId = this.addForm2.regionId
// ? this.addForm2.regionId.pop()
// : "";
// data.dangerItemId = this.addForm2.dangerItemId
// ? this.addForm1.dangerItemId.pop()
// : "";
let imgUrl = [];
let fileUrl = [];
for (let i = 0; i < this.fileList3.length; i++) {
let obj = this.fileList3[i].name + "*" + this.fileList3[i].url;
imgUrl.push(obj);
}
for (let i = 0; i < this.fileList4.length; i++) {
let obj = this.fileList4[i].name + "*" + this.fileList4[i].url;
fileUrl.push(obj);
}
data.imageUrl = imgUrl.join(",");
data.fileUrl = fileUrl.join(",");
}
data.recordType = this.recordType;
data.projectSn = this.projectSn;
console.log("data", data);
data.inspectManId = this.$store.state.userInfo.userId;
data.status = 2; // 改为待整改状态
editRecordApi(data).then((res) => {
if (res.code == 200) {
this.$message.success(this.$t("message.quality.newSuccess"));
this.$refs.addForm1.resetFields(); //清除所有验证
this.$refs.addForm2.resetFields(); //清除所有验证
// this.$refs["addForm1"].resetFields();
// this.$refs["addForm2"].resetFields();
this.addDialog = false;
this.fileList1 = [];
this.fileList2 = [];
this.fileList3 = [];
this.fileList4 = [];
this.pointList = [];
this.recordType = 1;
this.mapUrl = "";
this.pageNo = 1;
this.onSubmit();
}
});
} else {
console.log("error submit!!");
return false;
}
});
},
handleSizeChange(val) {
this.pageSize = val;
this.onSubmit();
@ -3317,16 +3626,16 @@ export default {
close() {
// this.mapUrl = ''
this.fileList1 = []
this.fileList2 = []
this.fileList3 = []
this.fileList4 = []
this.$nextTick(()=>{
this.$refs.addForm1.clearValidate() //清除所有验证
this.$refs.addForm2.clearValidate() //清除所有验证
})
this.fileList1 = [];
this.fileList2 = [];
this.fileList3 = [];
this.fileList4 = [];
this.$nextTick(() => {
this.$refs.addForm1.clearValidate(); //清除所有验证
this.$refs.addForm2.clearValidate(); //清除所有验证
});
this.hideUpload = false
this.hideUpload = false;
if (this.recordType == 1) {
this.addForm1 = {
regionId: "",
@ -3396,19 +3705,19 @@ export default {
handleExceed() {},
},
// 自定义指令
directives:{
cascaderDirect:{
bind(el,binding,vnode){
let target = el.getElementByClassName('el-cascaderDirect')
el.handler = ()=>{
for(let item of target){
item.style.display = 'none'
}
}
el.addEventListener('scroll',el.handler)
}
}
directives: {
cascaderDirect: {
bind(el, binding, vnode) {
let target = el.getElementByClassName("el-cascaderDirect");
el.handler = () => {
for (let item of target) {
item.style.display = "none";
}
};
el.addEventListener("scroll", el.handler);
},
},
},
};
</script>
<style lang="less" scoped>
@ -3684,7 +3993,19 @@ export default {
padding: 0 10px;
margin-bottom: 20px;
}
.back-btn {
color: #5788f7;
font-weight: 500;
position: absolute;
left: 89%;
top: 1%;
display: flex;
align-items: center;
cursor: pointer;
span {
margin-left: 3px;
}
}
.textSty {
width: 190px;
text-overflow: ellipsis;

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

@ -231,7 +231,7 @@
"
>
<template slot-scope="scope">
<el-button type="text">
<el-button type="text" v-if="scope.row.status != 6">
{{
scope.row.status == 1
? $t("message.quality.noRectification")
@ -250,6 +250,7 @@
: ""
}}
</el-button>
<span style="color: #94979E;" v-else>已撤回</span>
<span class="tableStatus" v-show="scope.row.overTime == true"
>超期</span
>
@ -328,6 +329,37 @@
></i>
<span>查看</span>
</div>
<div
class="operationText"
v-if="
scope.row.status == 6 &&
scope.row.inspectManId == $store.state.userInfo.userId
"
@click="editRow(scope.row)"
>
<img
src="@/assets/images/icon-edit.png"
width="15px"
height="15px"
/>
<span>{{ $t("message.alarmValueSet.edit") }}</span>
</div>
<div
@click="deleteQuestion(scope.row)"
class="operationText"
v-if="
scope.row.status == 6 &&
scope.row.inspectManId == $store.state.userInfo.userId
"
>
<img
src="@/assets/images/icon-delete.png"
width="15px"
height="15px"
/>
<!-- 删除 -->
<span>{{ $t("message.alarmValueSet.delete") }}</span>
</div>
</div>
</template>
</el-table-column>
@ -1199,6 +1231,15 @@
size="medium"
>{{ $t("message.alarmValueSet.save") }}
</el-button>
<el-button
v-if="addTitle == '编辑'"
:disabled="type == 'detail'"
type="primary"
icon="el-icon-circle-check"
@click="submitEditRecordFrom"
size="medium"
>重新提交
</el-button>
</div>
</vue-scroll>
</el-dialog>
@ -1476,8 +1517,20 @@
<div style="width: 800px">
<!-- 隐患记录 超期整改 -->
<div class="headerLeft">隐患记录</div>
<div
class="back-btn"
v-if="
detailData.status == 2 &&
rectifyRecordList.length == 0 &&
detailData.inspectManId == $store.state.userInfo.userId
"
@click="backQuestion(detailData)"
>
<i class="el-icon-refresh-right"></i>
<span>撤回</span>
</div>
<span
v-if="detailData.overTime == true"
v-else-if="detailData.overTime == true"
style="
color: red;
font-weight: 500;
@ -1527,6 +1580,8 @@
? '#a020f0'
: detailData.status == 5
? '#21c28e'
: detailData.status == 6
? '#262D47'
: '',
}"
>
@ -1542,6 +1597,8 @@
? '#a020f0'
: detailData.status == 5
? '#21c28e'
: detailData.status == 6
? '#262D47'
: '',
}"
></span>
@ -1555,6 +1612,8 @@
? "待核验"
: detailData.status == 5
? "合格"
: detailData.status == 6
? "已撤回"
: ""
}}</span
>
@ -1759,7 +1818,7 @@
<el-col :span="12" v-show="detailData.recordType == 1">
<div class="grid-content">
<span class="label" style="margin-left: -14px"
>复查人1：</span
>复查人：</span
>
<span class="value" style="margin-left: 25px">{{
detailData.reviewName
@ -1907,7 +1966,7 @@
</el-card>
</el-timeline-item>
</el-timeline>
<div v-if="![5].includes(detailData.status)">
<div v-if="![5].includes(detailData.status) && statusCondition(detailData)">
<div class="headerLeft">
{{
detailData.status == 2
@ -2017,7 +2076,7 @@
</div>
</vue-scroll>
</div>
<div class="btn-box">
<div class="btn-box" v-if="statusCondition(detailData)">
<el-button
v-if="detailData.status == 3 || detailData.status == 4"
size="medium"
@ -2047,6 +2106,13 @@
>提交</el-button
>
</div>
<div class="btn-box" v-else>
<el-button
size="medium"
@click="dialogDetil = false"
>取消</el-button
>
</div>
</el-dialog>
<!-- 视频播放 -->
<el-dialog
@ -2078,9 +2144,12 @@ import {
getSafeDangerTypeRecordApi,
getSubcontractListApi,
addSafeRecordApi,
editSafeRecordApi,
getRoutineInspectApi,
selectSafeRectifyRecordListApi,
addSafeQualityRectifyRecordApi,
deleteSafeRectifyRecordListApi,
backSafeRectifyRecordListApi
} from "@/assets/js/api/quality.js";
import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage.js";
import { VueCropper } from "vue-cropper";
@ -2275,6 +2344,117 @@ export default {
},
mounted() {},
methods: {
backQuestion(obj) {
console.log("删除", obj);
this.$confirm(
"确定撤回该条记录?",
this.$t("message.personnelPosition.beaconManage.table.Tips"),
{
confirmButtonText: this.$t(
"message.personnelPosition.confirmButtonText"
),
cancelButtonText: this.$t(
"message.personnelPosition.cancelButtonText"
),
type: "warning",
}
)
.then(() => {
backSafeRectifyRecordListApi({ id: obj.id }).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.onSubmit();
this.dialogDetil = false;
}
});
})
.catch(() => {});
},
deleteQuestion(obj) {
console.log("删除", obj);
this.$confirm(
"确定删除该条记录?",
this.$t("message.personnelPosition.beaconManage.table.Tips"),
{
confirmButtonText: this.$t(
"message.personnelPosition.confirmButtonText"
),
cancelButtonText: this.$t(
"message.personnelPosition.cancelButtonText"
),
type: "warning",
}
)
.then(() => {
deleteSafeRectifyRecordListApi({ id: obj.id }).then((result) => {
if (result.success) {
this.$message.success(result.message);
this.onSubmit();
}
});
})
.catch(() => {});
},
editRow(obj){ // 编辑撤回数据(重新提交)
this.addForm1 = obj;
console.log(this.addForm1,777)
this.addTitle = "编辑";
this.recordType = obj.recordType;
if(obj.recordType == 1){
this.addForm1 = obj;
let arr = obj.imageUrl.split(",");
let fileArr = obj.fileUrl.split(",");
let showImgUrl = [];
let showFileUrl = [];
for (let i = 0; i < arr.length; i++) {
let imgArr = arr[i].split("*");
let objData = { name: imgArr[0], url: imgArr[1] };
showImgUrl.push(objData);
}
for (let i = 0; i < fileArr.length; i++) {
let file = fileArr[i].split("*");
let objData = { name: file[0], url: file[1] };
showFileUrl.push(objData);
}
showFileUrl = showFileUrl.filter((item) => {
return item.url != undefined;
});
showImgUrl = showImgUrl.filter((item) => {
return item.url != undefined;
});
this.fileList1 = showImgUrl;
this.fileList2 = showFileUrl;
} else if(obj.recordType == 2){
this.addForm2 = obj;
}
// 逻辑结束
this.addDialog = true;
this.getPositionList();
this.getDescribeClassifyList();
this.getPeopleList();
this.getReviewPeopleList();
this.getPeopleUpdateList();
this.getRoutineInspect();
this.rectifyRecordList = [];
},
statusCondition(data){
console.log(data,'我爱我爱')
if(data.status == 2){
if(data.changeId == this.$store.state.userInfo.userId){
return true;
}
} else if(data.status == 3){
if(data.reviewId == this.$store.state.userInfo.userId){
return true;
}
} else if(data.status == 4){
if(data.verifyManId == this.$store.state.userInfo.userId){
return true;
}
} else {
return false;
}
},
//关闭视频
closeBtn() {
this.isShow = false;
@ -2337,6 +2517,18 @@ export default {
} else {
this.replyData.fileUrl = "";
}
if (this.replyData.rectifyTime == "" || this.replyData.additionalRemarks == "" || this.fileListRectification.length == 0) {
this.$message.error('请将回复内容输入完整')
return;
}
if (this.replyData.additionalRemarks == "") {
this.$message.error('请选择整改时间')
return;
}
if (this.replyData.rectifyTime == "") {
this.$message.error('请选择整改时间')
return;
}
this.replyData.qualityId = valId;
this.replyData.createUser = this.userIdInfo;
console.log("整改提交的表单数据：：：", this.replyData);
@ -3302,7 +3494,117 @@ export default {
}
});
},
//重新提交 编辑
submitEditRecordFrom() {
let newRefs = null;
if (this.recordType == 1) {
newRefs = "addForm1";
} else if (this.recordType == 2) {
newRefs = "addForm2";
}
console.log(this.addForm1);
console.log(this.addForm2);
this.$refs[newRefs].validate((valid) => {
if (valid) {
let data = {};
if (this.recordType == 1) {
data = JSON.parse(JSON.stringify(this.addForm1));
data.regionId =
this.addForm1.regionId.length > 1
? this.addForm1.regionId[this.addForm1.regionId.length - 1]
: this.addForm1.regionId[0];
data.dangerItemId =
this.addForm1.dangerItemId[this.addForm1.dangerItemId.length - 1];
data.dangerTypeId = this.addForm1.dangerItemId[0];
let pointArr = [];
for (let i = 0; i < this.pointList.length; i++) {
let obj =
this.pointList[i].coordinateX +
"*" +
this.pointList[i].coordinateY;
pointArr.push(obj);
}
let imgUrl = [];
let fileUrl = [];
for (let i = 0; i < this.fileList1.length; i++) {
let obj = this.fileList1[i].name + "*" + this.fileList1[i].url;
imgUrl.push(obj);
}
for (let i = 0; i < this.fileList2.length; i++) {
let obj = this.fileList2[i].name + "*" + this.fileList2[i].url;
fileUrl.push(obj);
}
data.measurePoints = pointArr.join(",");
console.log("data=============", data);
console.log("data=============", this.addForm1.notifyPerson);
console.log("data=============", imgUrl);
console.log("data=============", fileUrl);
if(this.addForm1.notifyPerson){
data.notifyPerson = this.addForm1.notifyPerson.join(",");
}
data.imageUrl = imgUrl.join(",");
data.fileUrl = fileUrl.join(",");
if (data.verifyManId == this.$store.state.userInfo.realName) {
data.verifyManId = this.$store.state.userInfo.userId;
}
} else {
data = JSON.parse(JSON.stringify(this.addForm2));
data.regionId =
this.addForm2.regionId.length > 1
? this.addForm2.regionId[this.addForm2.regionId.length - 1]
: this.addForm2.regionId[0];
data.dangerItemId =
this.addForm2.dangerItemId[this.addForm2.dangerItemId.length - 1];
data.dangerTypeId = this.addForm2.dangerItemId[0];
// data.regionId = this.addForm2.regionId
// ? this.addForm2.regionId.pop()
// : "";
// data.dangerItemId = this.addForm2.dangerItemId
// ? this.addForm1.dangerItemId.pop()
// : "";
let imgUrl = [];
let fileUrl = [];
for (let i = 0; i < this.fileList3.length; i++) {
let obj = this.fileList3[i].name + "*" + this.fileList3[i].url;
imgUrl.push(obj);
}
for (let i = 0; i < this.fileList4.length; i++) {
let obj = this.fileList4[i].name + "*" + this.fileList4[i].url;
fileUrl.push(obj);
}
data.imageUrl = imgUrl.join(",");
data.fileUrl = fileUrl.join(",");
}
data.recordType = this.recordType;
data.projectSn = this.projectSn;
console.log("data", data);
data.inspectManId = this.$store.state.userInfo.userId;
data.status = 2; // 改为待整改状态
editSafeRecordApi(data).then((res) => {
if (res.code == 200) {
this.$message.success(this.$t("message.quality.newSuccess"));
this.$refs.addForm1.resetFields(); //清除所有验证
this.$refs.addForm2.resetFields(); //清除所有验证
// this.$refs["addForm1"].resetFields();
// this.$refs["addForm2"].resetFields();
this.addDialog = false;
this.fileList1 = [];
this.fileList2 = [];
this.fileList3 = [];
this.fileList4 = [];
this.pointList = [];
this.recordType = 1;
this.mapUrl = "";
this.pageNo = 1;
this.onSubmit();
}
});
} else {
console.log("error submit!!");
return false;
}
});
},
handleSizeChange(val) {
this.pageSize = val;
this.onSubmit();