guangyin
/
hbt-prevention-ui
forked from xxhjsb/hbt-prevention-ui
1
0
Fork 0
Code Pull Requests Activity

feat：修复平台bug

dev
kongyeqing 2023-09-26 11:39:35 +08:00
parent 478b1e3b84
commit 12c16f4314
14 changed files with 95 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/draw.component.vue
View File

@ -451,7 +451,7 @@ export default class DrawComponent extends Vue {
}
destroyed(){
// console.log(123)
// this.removeMap()
this.removeMap()
}
}
</script>

34
src/components/tree.component.vue
View File

@ -2,9 +2,10 @@
<el-tree :data="treeData" :props="{ children: 'children', label: 'name' }" :expand-on-click-node="false"
default-expand-all highlight-current @node-click="handleNodeClick">
<span class="span-ellipsis" slot-scope="{ node, data }">
<!-- <el-tooltip class="item" effect="light" :content="node.label||''" placement="top-start"> -->
<span>{{ node.label }}</span>
<!-- </el-tooltip> -->
<el-tooltip style="font-size: 10px;padding: 5px;" popper-class="tooltip_item" effect="light"
:content="node.label || ''" placement="bottom-start" :visible-arrow="false">
<span>{{ node.label }}</span>
</el-tooltip>
</span>
</el-tree>
</template>
@ -41,5 +42,32 @@ export default class UnitTreeComponent extends Vue {
white-space: nowrap;
text-overflow: ellipsis;
display: block;
.item {
font-size: 13px;
}
}
</style>
<style lang="scss" >
.tooltip_item {
padding: 5px !important;
font-size: 12px;
margin-top: 5px !important;
margin-left: 60px;
.el-tooltip__popper {
padding: 5px !important;
border: 1px solid #6e6c6c !important;
color: rgba(0, 0, 0, 0.3) !important;
}
.el-tooltip__popper.is-light {
border: 1px solid #6e6c6c !important;
color: rgba(0, 0, 0, 0.3) !important;
}
.el-tooltip__popper[x-placement^=bottom] {
margin-top: 0px !important;
}
}
</style>

5
src/views/hiddenDanger/clap.component.vue
View File

@ -388,6 +388,11 @@ export default class HiddenDangerClapComponent extends BaseRecordComponent<any>
type: "number",
width: "calc(50% - 20px)",
showError: false,
rules: [
{ pattern: /^([1-9][0-9]{0,1}|100)$/, message: '在1~100范围内', }
],
min: 1,
max: 100,
}, {
name: "专业分类",
key: "professionClassify",

5
src/views/hiddenDanger/files.component.vue
View File

@ -360,6 +360,11 @@ export default class HiddenDangerFilesComponent extends BaseRecordComponent<any>
type: "number",
width: "calc(50% - 20px)",
showError: false,
rules: [
{ pattern: /^([1-9][0-9]{0,1}|100)$/, message: '在1~100范围内', }
],
min: 1,
max: 100,
}, {
name: "专业分类",
key: "professionClassify",

7
src/views/hiddenDanger/manager.component.vue
View File

@ -409,6 +409,11 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
type: "number",
width: "calc(50% - 20px)",
showError: false,
rules: [
{ pattern: /^([1-9][0-9]{0,1}|100)$/, message: '在1~100范围内', }
],
min: 1,
max: 100,
}, {
name: "专业分类",
key: "professionClassify",
@ -735,6 +740,8 @@ export default class HiddenDangerManagerComponent extends BaseRecordComponent<an
public rowCallback(el, data) {
const isTarget = el.target.classList.contains("link");
console.log('data',data);
if (isTarget) {
if (data.status === 2) {
data = Object.assign({

6
src/views/hiddenDanger/rules/rulesManager.component.vue
View File

@ -215,11 +215,13 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
name: "适用部门",
key: "depts",
multiple: true,
type: "select",
type: "treeSelect",
datas: this.$store.state.deptTreeList,
expandLevel: Infinity,
width: "calc(50% - 20px)",
require: true,
showError: false,
datas: this.$store.state.deptList,
// datas: this.$store.state.deptList,
clearable: true,
}, {
name: "适用类型",

5
src/views/hiddenDanger/safe/action.component.vue
View File

@ -366,6 +366,11 @@ export default class RulesManagerComponent extends BaseRecordComponent<any> {
type: "number",
width: "calc(50% - 20px)",
showError: false,
rules: [
{ pattern: /^([1-9][0-9]{0,1}|100)$/, message: '在1~100范围内', }
],
min: 1,
max: 100,
}, {
name: "专业分类",
key: "professionClassify",

2
src/views/risk/assessment/areaAnal/areaAnal.component.html
View File

@ -93,7 +93,7 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column prop=" value" :label="popTitle==='L'?'Ln':'Sn'">
<el-table-column prop=" value" :label="popTitle==='L'?'L':'S'">
<div slot-scope="scope">
<span v-if="scope.row.value">{{scope.row.value}}</span>
<span v-else></span>

5
src/views/risk/assessment/areaAnal/areaAnal.component.vue
View File

@ -136,6 +136,7 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
pageNum: 1,
pageSize: 20,
} as any;
this.getTableData()
}
@ -169,7 +170,7 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
} else {
// 如果没有值 则用字符串代替
this.riskLDatas.forEach(item => {
item.value = "Ln" + item.index
item.value = "L" + item.index
})
}
if (sData.length) {
@ -180,7 +181,7 @@ export default class AreaAnalComponent extends BaseRecordComponent<any> {
} else {
// 如果没有值 则用字符串代替
this.riskSDatas.forEach(item => {
item.value = "Sn" + item.index
item.value = "S" + item.index
})
}
this.stepsActive = 1;

2
src/views/risk/assessment/work/work.component.html
View File

@ -5,7 +5,7 @@
<div class="common-content-box dis-flex flex-col flex-1">
<div class="search-box">
<FormComponent :inline="true" :options="formOptions" :data.sync="params" @actionCallback="callback"
:actions="formActions" :full-btn="false" @change="changes" btn-position="end"></FormComponent>
:actions="formActions" :full-btn="false" @change="callback" btn-position="end"></FormComponent>
</div>
<div class="table-box flex-1">
<TableComponent :tableData="tableData" :tableColumn="tableColumn" @actionCallback="callback($event)"

18
src/views/risk/duty/duty.component.vue
View File

@ -125,7 +125,7 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
labelWidth: 'auto',
require: true,
disable: true,
showError: false,
datas: [
{
name: "否",
@ -143,12 +143,14 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
width: "100%",
require: true,
disable: true,
showError: false,
}, {
name: "排查结果",
key: "result",
type: "radio",
width: "100%",
require: true,
showError: false,
datas: [
{
name: "正常",
@ -166,6 +168,7 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
type: "radio",
width: "100%",
require: true,
showError: false,
hide: this.updateParams.result === 1,
datas: [
{
@ -184,12 +187,14 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
width: "100%",
hide: this.updateParams.result === 1,
require: true,
showError: false,
}, {
name: "隐患类别",
key: "dangerType",
format: "dangerTypeName",
type: "select",
width: "100%",
showError: false,
require: true,
hide: this.updateParams.result === 1 || this.updateParams.dangerFlag == 0,
datas: this.$store.state.prevention_danger_type,
@ -199,6 +204,7 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
type: "select",
width: "100%",
require: true,
showError: false,
hide: this.updateParams.result === 1 || this.updateParams.dangerFlag == 0,
datas: this.$store.state.userList,
},
@ -209,6 +215,7 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
width: "100%",
require: true,
disable: true,
showError: false,
},
{
name: " 排查人",
@ -216,6 +223,7 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
type: "select",
width: "100%",
require: true,
showError: false,
disable: true,
datas: this.$store.state.userList,
},
@ -226,6 +234,7 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
width: "100%",
require: true,
disable: true,
showError: false,
}, {
name: "附件",
@ -273,7 +282,12 @@ export default class DutyManagerComponent extends BaseRecordComponent<any> {
if (data.areaId) {
this.params.unitId = data.id
} else {
this.params.areaId = data.id
if (data.name === "全部") {
this.params.areaId = null
this.params.unitId = null
} else {
this.params.areaId = data.id;
}
}
this.getTableData()
}

15
src/views/risk/duty/dutyRecords.component.vue
View File

@ -201,15 +201,22 @@ export default class DutyRecordsManagerComponent extends BaseRecordComponent<any
if (data.areaId) {
this.params.unitId = data.id
} else {
this.params.areaId = data.id
if (data.name === "全部") {
this.params.areaId = null
this.params.unitId = null
} else {
this.params.areaId = data.id;
}
}
this.getTableData()
}
public buildTable() {
this.tableColumn.push({name:"是否包保责任人任务",key:"insuranceDutyFlag",width:"150px",render:(data)=>{
return data.insuranceDutyFlag === 1 ? '是':'否'
}})
this.tableColumn.push({
name: "是否包保责任人任务", key: "insuranceDutyFlag", width: "150px", render: (data) => {
return data.insuranceDutyFlag === 1 ? '是' : '否'
}
})
this.tableColumn.push({ name: '隐患排查任务', key: "taskName", with: "250px" });
this.tableColumn.push({
name: '重大危险源', key: 'majorHazard', render: (data) => {

4
src/views/workprogress/leader.component.vue
View File

@ -389,6 +389,10 @@ export default class LeadershipStructure extends BaseRecordComponent<any> {
}
public doSave(goOn?) {
if(!this.updateParams.members.length){
this.$message.warning('请您添加至少一条成员信息！')
return
}
// 新增清单
if (this.fileList.length > 0) {
let resourceId = this.fileList.map((item) => {

1
src/views/workprogress/managementSystem.component.vue
View File

@ -352,6 +352,7 @@ export default class ManagementSystem extends BaseRecordComponent<any> {
pageNum: 1,
pageSize: 20,
} as any;
this.getTableData()
}
public showUpdateModel(id) {