+
- {
public tableService = new DutyService();
public params = {} as any;
- public treeData = [{
- label: '一级 1',
- children: [{
- label: '二级 1-1',
- children: [{
- label: '三级 1-1-1'
- }]
- }]
- }, {
- label: '一级 2',
- children: [{
- label: '二级 2-1',
- children: [{
- label: '三级 2-1-1'
- }]
- }, {
- label: '二级 2-2',
- children: [{
- label: '三级 2-2-1'
- }]
- }]
- }, {
- label: '一级 3',
- children: [{
- label: '二级 3-1',
- children: [{
- label: '三级 3-1-1'
- }]
- }, {
- label: '二级 3-2',
- children: [{
- label: '三级 3-2-1'
- }]
- }]
- }]
-
public formActions = [{
- name:"查询",
- value:"search",
- icon:"el-icon-search",
- type:"primary"
- },{
- name:"清空",
- icon:"el-icon-tickets",
- value:"reset"
+ name: "查询",
+ value: "search",
+ icon: "el-icon-search",
+ type: "primary"
+ }, {
+ name: "清空",
+ icon: "el-icon-tickets",
+ value: "reset"
}];
public tableActions = [{
- name:"批量删除",
- value:"delete",
- plain:true,
- icon:"el-icon-delete",
- type:"danger"
+ name: "批量删除",
+ value: "delete",
+ plain: true,
+ icon: "el-icon-delete",
+ type: "danger"
}];
public footerActions = [{
- name:"选择全部",
- value:"selectAll",
- type:"primary"
- },{
- name:"反向选择",
- value:"reverse"
+ name: "选择全部",
+ value: "selectAll",
+ type: "primary"
+ }, {
+ name: "反向选择",
+ value: "reverse"
}];
- public formOptions:FormOption[] = [{
- name:"排查结果",
- key:"areaId",
- type:"select",
- datas:[{
- name:"部门1",
- value:0
- },{
- name:"部门2",
- value:1
+ public formOptions: FormOption[] = [{
+ name: "排查结果",
+ key: "result",
+ type: "select",
+ datas: [{
+ name: "正常",
+ value: 1
+ }, {
+ name: "异常",
+ value: 2
}]
- },{
- name:"是否为隐患",
- key:"unitId",
- type:"select",
- datas:[{
- name:"单元1",
- value:0
- },{
- name:"单元2",
- value:1
+ }, {
+ name: "是否为隐患",
+ key: "dangerFlag",
+ type: "select",
+ datas: [{
+ name: "否",
+ value: 0
+ }, {
+ name: "是",
+ value: 1
}]
}];
public showUpdate = false;
- public updateParams = {} as any;
+
+ public updateParams = {} as any;
+
public selectData = [];
- created(){
+ public fileList = [] as any;
+ public photoList = [] as any;
+
+ public showFile = false;
+
+ public currentUrl = null;
+
+ public subUpdateOptions = [] as any;
+ public subUpdateForm() {
+ this.subUpdateOptions = [{
+ name: "是否包保责任人任务",
+ key: "insuranceDutyFlag",
+ format: "insuranceDutyFlagName",
+ type: "text",
+ labelWidth: 'auto',
+ require: true,
+ with: "100%"
+ }, {
+ name: "隐患排查任务",
+ key: "taskName",
+ type: "text",
+ require: true,
+ with: "calc(50% - 20px)"
+ }, {
+ name: "排查结果",
+ key: "result",
+ format: "resultName",
+ type: "radio",
+ require: true,
+ with: "calc(50% - 20px)"
+ }, {
+ name: "是否为隐患",
+ key: "dangerFlag",
+ format: "dangerFlagName",
+ type: "radio",
+ labelWidth: 'auto',
+ require: true,
+ width: "calc(50% - 20px)",
+ }, {
+ name: "问题描述",
+ key: "taskName",
+ type: "textarea",
+ require: true,
+ width: "calc(50% - 20px)",
+ }, {
+ name: "隐患类别",
+ key: "dangerType",
+ format: "taskTypeName",
+ type: "select",
+ require: true,
+ width: "calc(50% - 20px)",
+ }, {
+ name: "隐患归属人",
+ key: "ownerId",
+ format: "ownerName",
+ require: true,
+ width: "calc(50% - 20px)",
+ },
+ {
+ name: "IMEI码",
+ key: "imeiCode",
+ type: "text",
+ width: "calc(50% - 20px)",
+ require: true,
+ },
+ {
+ name: " 排查人",
+ key: "checkUserId",
+ type: "text",
+ width: "calc(50% - 20px)",
+ require: true,
+ },
+ {
+ name: " 排查时间",
+ key: "checkTime",
+ type: "text",
+ width: "100%",
+ require: true,
+ }, {
+
+ name: "附件",
+ key: "resourceId",
+ ref: "file",
+ format: "resourceIdName",
+ type: "upload",
+ width: "calc(50% - 20px)",
+ showError: false,
+ onSucess: this.onSuccess2,
+ onMove: this.onRemove2,
+ onPreview: this.onPreview,
+ autoUpload: true,
+ accept: "image/png, image/jpeg",
+ listType: "picture-card",
+ fileList: this.photoList,
+ }
+ ]
+ }
+
+
+
+ created() {
}
// 树点击
- public handleNodeClick(data){
- console.log(data)
+ public handleNodeClick(data) {
+ this.params.unitId = "";
+ this.params.areaId = "";
+ if (data.areaId) {
+ this.params.unitId = data.id
+ } else {
+ this.params.areaId = data.id
+ }
+ this.getTableData()
}
- public buildTable(){
- this.tableColumn.push({name:'序号',key:"index"});
- this.tableColumn.push({name:'隐患排查任务',key:"deptName"});
- this.tableColumn.push({name:'排查结果', width:"110px",key:"status",render:(data)=>{
- if(data.status==0){
- return "未绘制"
- }else{
- return "已绘制"
+ public buildTable() {
+ this.tableColumn.push({ name: '隐患排查任务', key: "taskName", with: "250px" });
+ this.tableColumn.push({
+ name: '排查结果', width: "110px", key: "result", render: (data) => {
+ if (data.status == 0) {
+ return "异常"
+ } else if (data.status == 1) {
+ return "正常"
+ }
}
- }});
- this.tableColumn.push({name:'问题描述',key:"deptName"});
- this.tableColumn.push({name:'排查人',key:"deptName"});
- this.tableColumn.push({name:'排查时间',key:"person"});
- this.tableColumn.push({name:'是否为隐患',key:"person"});
- this.tableColumn.push({name:'隐患归属人',key:"person"});
+ });
+ this.tableColumn.push({ name: '问题描述', key: "description" });
+ this.tableColumn.push({ name: '排查人', key: "checkUserId" });
+ this.tableColumn.push({ name: '排查时间', key: "checkTime" });
+ this.tableColumn.push({
+ name: '是否为隐患', key: "dangerFlag", render: (data) => {
+ if (data.status == 1) {
+ return "是"
+ } else if (data.status == 0) {
+ return "否"
+ }
+ }
+ });
+ this.tableColumn.push({ name: '隐患归属人', key: "ownerName" });
+
}
- public callback(data){
+ public callback(data) {
// 查询
- if(data.value==="search"){
+ if (data.value === "search") {
this.getTableData()
- // 重置
- }else if(data.value === "reset"){
+ // 重置
+ } else if (data.value === "reset") {
this.reset()
- // 反选
- }else if(data.value === "reverse"){
+ // 反选
+ } else if (data.value === "reverse") {
this.toggleAll()
- // 全选
- }else if(data.value === "selectAll"){
+ // 全选
+ } else if (data.value === "selectAll") {
this.selectAll()
- }else if(data.value === "delete"){
- this.deleteData(this.selectData.map((item:any)=>item.id))
+ } else if (data.value === "delete") {
+ this.deleteData(this.selectData.map((item: any) => item.id))
}
}
// 重置数据
- public reset(){
+ public reset() {
this.params = {
- pageNum:1,
- pageSize:20,
+ pageNum: 1,
+ pageSize: 20,
} as any;
}
// 删除数据
- public showUpdateModel(id){
+ public showUpdateModel(id) {
this.showUpdate = true
}
- public handleClose(){
+ public handleClose() {
this.showUpdate = false;
}
@@ -176,22 +264,91 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent{
- const find = this.selectData.find((data:any)=>data.userId === item.userId);
- if(!find){
+ } else {
+ this.tableData.datas.forEach((item, index) => {
+ const find = this.selectData.find((data: any) => data.userId === item.userId);
+ if (!find) {
(this.$refs.multipleTable as any).toggleRowSelection(item);
}
})
}
}
- public handleSelectionChange(data){
+ public handleSelectionChange(data) {
this.selectData = data;
}
+
+
+ public onSuccess(res, file, fileList) {
+ if (res.code === 200) {
+ this.photoList.push({
+ name: res.data.originalName,
+ url: res.data.url,
+ type: res.data.type,
+ id: res.data.id
+ });
+ this.updateParams.photo = this.photoList.length || null
+ }
+ }
+ public onSuccess2(res, file, fileList) {
+ if (res.code === 200) {
+ this.fileList.push({
+ name: res.data.originalName,
+ url: res.data.url,
+ type: res.data.type,
+ id: res.data.id
+ })
+ }
+
+ }
+
+ public onRemove(file, fileList) {
+ this.photoList.splice(this.photoList.findIndex(item => item.id === file.response.data.id), 1)
+ this.updateParams.photo = this.photoList.length || null
+ }
+ public onRemove2(file, fileList) {
+ this.fileList.splice(this.fileList.findIndex(item => item.id === file.response.data.id), 1)
+ }
+
+ public onPreview(file) {
+ if (file.type.indexOf("png") >= 0 || file.type.indexOf("jp") >= 0) {
+ this.currentUrl = file.url;
+ this.showFile = true;
+ } else {
+ window.open(file.url, "_blank")
+ }
+ }
+
+
+ public showSubModal(row) {
+ this.photoList = []
+ if (row.resourceId) {
+ this.tableService.getFileUrls({ ids: row.resourceId.split(";") }).then((photos: any) => {
+ this.photoList = photos.data.map(item => {
+ return {
+ name: item.originalName,
+ url: item.url,
+ type: item.type,
+ id: item.id
+ }
+ })
+ this.subUpdateForm()
+ })
+ }
+
+ this.updateParams = Object.assign({
+ insuranceDutyFlagName: row.insuranceDutyFlag === 0 ? '否' : '是',
+ resultName: row.result === 1 ? '正常' : '异常',
+ dangerFlagName: row.dangerFlag === 0 ? '否' : '是',
+ taskTypeName: this.$store.getters.prevention_hazard_category_map[row.dangerType]
+ }, row)
+ this.showUpdate = true
+ this.updateParams.resourceId= null
+ this.subUpdateForm()
+ }
}
diff --git a/src/views/risk/measures/measures.component.vue b/src/views/risk/measures/measures.component.vue
index f460ed5..4521aa6 100644
--- a/src/views/risk/measures/measures.component.vue
+++ b/src/views/risk/measures/measures.component.vue
@@ -129,7 +129,7 @@ export default class MeasuresManagerComponent extends BaseRecordComponent {
return "" + (data.details ? data.details.length : 0) + ""
}
});
- this.tableColumn.push({ name: '涉及岗位', key: "postName", width: "200px" });
+ this.tableColumn.push({ name: '涉及岗位', key: "postName" });
//管控措施详情
diff --git a/src/views/risk/measuresReport/measuresReport.component.html b/src/views/risk/measuresReport/measuresReport.component.html
index df93ed0..681ca05 100644
--- a/src/views/risk/measuresReport/measuresReport.component.html
+++ b/src/views/risk/measuresReport/measuresReport.component.html
@@ -13,24 +13,24 @@
@pageSizeChange="callback($event)" :footerActions="footerActions" :actions="tableActions">
+ @selection-change="handleSelectionChange" style="width: 100%" highlight-current-row>
-
+
+ :filters="item.filters" :filter-method="item.filterMethod" :filter-multiple="false"
+ :show-overflow-tooltip="item.showTip" class="cursor td-content">
删除
- 查看执行纪律
+ 查看执行纪录
@@ -58,4 +58,5 @@
+
\ No newline at end of file
diff --git a/src/views/risk/measuresReport/measuresReport.component.vue b/src/views/risk/measuresReport/measuresReport.component.vue
index 09a97a2..9a3cdd2 100644
--- a/src/views/risk/measuresReport/measuresReport.component.vue
+++ b/src/views/risk/measuresReport/measuresReport.component.vue
@@ -49,11 +49,21 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
public currentProTableData = { datas: [] } as any;
+ public filterStatusData: any;
+
public subActions = [{
name: "取消",
value: "cancel"
}];
+ public filters = [{
+ text: "已发布",
+ value: 0
+ }, {
+ text: "未发布",
+ value: 1
+ }]
+
public formActions = [{
name: "查询",
value: "search",
@@ -95,7 +105,7 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
public showUpdate = false;
public updateParams = {} as any;
- public selectData = [];
+ public selectData = [] as any;
created() {
this.$store.state.prevention_measures_sort.map((item) => {
@@ -119,25 +129,34 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
public buildTable() {
this.tableColumn.push({
- name: '状态', key: "status", render: (data) => {
- if (data.status == 1) {
+ name: '状态', key: "status", width: "80px", render: (data) => {
+ if (data.status == 0) {
return "未发布"
- } else {
+ } else if (data.status == 1) {
return "已发布"
}
+ },
+ filters: this.filters.map(item => {
+ return {
+ text: item.text,
+ value: item.value,
+ }
+ }), filterMethod: (data, row) => {
+ this.filterStatusData = data
+ return row.status === data;
}
});
this.tableColumn.push({
- name: '区域名称', key: "areaName", width: "200px",
+ name: '区域名称', key: "areaName", width: "130px",
});
this.tableColumn.push({
- name: '单元名称', key: "unitName", width: "200px",
+ name: '单元名称', key: "unitName", width: "130px",
});
this.tableColumn.push({ name: '管控对象', key: "analControlName", width: "200px" });
- this.tableColumn.push({ name: '分析对象', key: "itemName", width: "200px" });
- this.tableColumn.push({ name: '风险源', key: "itemRiskSource", width: "200px" });
+ this.tableColumn.push({ name: '分析对象', key: "itemName", width: "100px" });
+ this.tableColumn.push({ name: '风险源', key: "itemRiskSource", width: "120px" });
this.tableColumn.push({
- name: '事故后果', key: "itemSeriousResult", width: "250px",
+ name: '事故后果', key: "itemSeriousResult", width: "100px",
render: (data) => {
if (data.itemSeriousResult) {
return data.itemSeriousResult.split(";").map(item => this.$store.getters.prevention_serious_result_map[item]).join(";")
@@ -145,7 +164,7 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
}
});
this.tableColumn.push({
- name: '风险等级', key: "itemRiskLevel",width:"150px", render: (data) => {
+ name: '风险等级', key: "itemRiskLevel", width: "100px", render: (data) => {
return "" + (data.itemRiskLevel ? (this.$store.getters.prevention_risk_level_map[data.itemRiskLevel]) : '') + ""
},
filters: this.$store.state.prevention_risk_level.map(item => {
@@ -158,14 +177,14 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
}
});
this.tableColumn.push({
- name: '管控措施分类', key: "measureFirstType", width: "200px", render: (data) => {
+ name: '管控措施分类', key: "measureFirstType", width: "120px", render: (data) => {
if (data.measureFirstType) {
return this.$store.getters.prevention_measures_sort_map[data.measureFirstType]
}
}
});
this.tableColumn.push({
- name: '管控措施分类',width:"200px", key: "measureSecondType",
+ name: '管控措施分类', width: "120px", key: "measureSecondType",
render: (data) => {
if (data.measureFirstType) {
const secondTypeItem = this.measuresSelectData[data.measureFirstType]
@@ -173,11 +192,11 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
}
}
});
- this.tableColumn.push({ name: '管控措施分类',width:"200px", key: "measureThirdType" });
- this.tableColumn.push({ name: '管控措施', key: "measureDescription" });
+ this.tableColumn.push({ name: '管控措施分类', width: "120px", key: "measureThirdType" });
+ this.tableColumn.push({ name: '管控措施', key: "measureDescription", width: "250px" });
this.tableColumn.push({
- name: '是否包保责任人任务',width:"200px", key: "insuranceDutyFlag", render: (data) => {
+ name: '是否包保责任人任务', width: "150px", key: "insuranceDutyFlag", render: (data) => {
if (data.taskItem) {
return '是'
} else {
@@ -186,14 +205,22 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
}
});
this.tableColumn.push({
- name: '任务类型', key: "taskType", render: (data) => {
+ name: '任务类型', key: "taskType", width: "130px", render: (data) => {
if (data.taskType || data.taskType === 0) {
return this.$store.getters.prevention_task_type_map[data.taskType]
}
+ },
+ filters: this.$store.state.prevention_task_type.map(item => {
+ return {
+ text: item.name,
+ value: item.value,
+ }
+ }), filterMethod: (data, row) => {
+ return row.taskType === data;
}
});
this.tableColumn.push({
- name: '包保任务对应项', key: "taskItem", width: "200px", render: (data) => {
+ name: '包保任务对应项', key: "taskItem", width: "250px", render: (data) => {
if (data.taskItem) {
if (!this.tasksSelectData[data.taskType] || this.tasksSelectData[data.taskType].length === 0) {
this.$store.state.prevention_task_type.map((item) => {
@@ -208,8 +235,8 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
}
}
});
- this.tableColumn.push({ name: '隐患排查任务', key: "taskName", width: "150px" });
- this.tableColumn.push({ name: '隐患责任人', key: "taskChargeUserName" ,width:"200px"});
+ this.tableColumn.push({ name: '隐患排查任务', key: "taskName", width: "250px" });
+ this.tableColumn.push({ name: '隐患责任人', key: "taskChargeUserName", width: "100px" });
this.tableColumn.push({ name: '岗位', key: "taskExecutePostName" });
this.tableColumn.push({ name: '排查周期', key: "taskReviewCycleValue" });
this.tableColumn.push({
@@ -261,8 +288,39 @@ export default class MeasuresReportManagerComponent extends BaseRecordComponent<
this.selectAll()
} else if (data.value === "delete") {
this.deleteData(this.selectData.map((item: any) => item.id))
+ } else if (data.value === "doUpdate") {
+ //发布--终止
+ this.doUpdate()
}
}
+ //发布--终止
+ public doUpdate() {
+ if (this.selectData && this.selectData.length > 0) {
+ this.filterStatusData = this.selectData[0]['status']
+ const tmpSelectData = this.selectData.filter((item) => item.status !== this.filterStatusData)
+ if (tmpSelectData.length === 0) {
+ const statusName = this.filterStatusData === 1 ? '终止' : '发布'
+ this.$confirm('确认' + statusName + '所选数据', '确认数据', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ const updateParams = JSON.parse(JSON.stringify(this.selectData))
+ updateParams.map((item) => {
+ item.status = this.filterStatusData === 0 ? 1 : 0
+ return item
+ })
+ this.tableService.addOrUpdate(updateParams).then((res) => {
+ this.$message.success(statusName + "成功！");
+ this.getTableData();
+ })
+ }).catch(() => {
+ //
+ });
+ }
+ }
+
+ }
// 重置数据
public reset() {
this.params = {
-
-
+
-
-
+
\ No newline at end of file
diff --git a/src/views/risk/duty/dutyRecords.component.vue b/src/views/risk/duty/dutyRecords.component.vue
index cf3b099..b600cd2 100644
--- a/src/views/risk/duty/dutyRecords.component.vue
+++ b/src/views/risk/duty/dutyRecords.component.vue
@@ -9,166 +9,254 @@ import DutyService from "@/service/duty.service"
import FormOption from "hbt-common/models/formOptions"
import BtnOption from "hbt-common/models/btnOptions"
import DrawComponent from '@/components/draw.component.vue';
+import UnitTreeComponent from '@/components/tree.component.vue';
+
+
@Component({
template,
- components:{
+ components: {
FormComponent,
TableComponent,
DrawComponent,
+ UnitTreeComponent,
},
})
+
export default class DutyRecordsManagerComponent extends BaseRecordComponent
+
@@ -17,6 +16,11 @@
@selection-change="handleSelectionChange" style="width: 100%">
+
+
+ {{scope.$index+1}}
+
+
@@ -26,7 +30,7 @@
- 查看
+ 查看
@@ -35,8 +39,10 @@