guoyuepeng
/
qa-prevention-gwj-vue
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

1、页面跟样式调整 

2、数据未关联企业bug修复
liujun0703-新项目开发
liujun 2024-08-19 17:03:25 +08:00
parent 2af459e58a
commit a43a91c144
8 changed files with 61 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_agencies/components/list.vue
View File

@ -27,19 +27,18 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="ORG_NAME" label="机构名称" width="180" /> <el-table-column prop="ORG_NAME" label="机构名称" width="180" />
<el-table-column prop="ORG_TYPE_NAME" label="机构类型" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="ORG_TYPE_NAME" label="机构类型" />
<el-table-column prop="ORG_LEVEL_NAME" label="机构级别" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="ORG_LEVEL_NAME" label="机构级别" />
<el-table-column prop="AREA" label="所属区域" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="AREA" label="所属区域" />
<el-table-column prop="SUPERVISING_UNIT" label="所属单位" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="SUPERVISING_UNIT" label="所属单位" />
<el-table-column prop="DUTY_PHONE" label="值班电话" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="DUTY_PHONE" label="值班电话" />
<el-table-column prop="OPERATETIME" label="修改时间" show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="400"> <el-table-column label="操作" align="center" width="350">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-document" size="mini" @click="goList('detail', row.ID, '1')">查看人员</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="goList('detail', row.ID, '1')">查看人员</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="showDetails(row)">查看</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="showDetails(row)">查看</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.ORG_NAME)">删除</el-button> <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.ORG_NAME)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

19
src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue
View File

@ -15,21 +15,20 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="USER_NAME" label="姓名" width="180" /> <el-table-column prop="USER_NAME" label="姓名" width="180" />
<el-table-column label="性别" show-overflow-tooltip="true"> <el-table-column :show-overflow-tooltip="true" label="性别">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
{{ row.GENDER === '0' ? '男' : row.GENDER === '1' ? '女' : '' }} {{ row.GENDER === '0' ? '男' : row.GENDER === '1' ? '女' : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ADMINISTRATIVE_POSITION" label="行政职务" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="ADMINISTRATIVE_POSITION" label="行政职务" />
<el-table-column prop="ADMINISTRATIVE_LEVEL" label="行政级别" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="ADMINISTRATIVE_LEVEL" label="行政级别" />
<el-table-column prop="IDENTITY_NUMBER" label="身份证号" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="IDENTITY_NUMBER" label="身份证号" />
<el-table-column prop="CONTACT_PHONE" label="联系电话" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_PHONE" label="联系电话" />
<el-table-column prop="OPERATETIME" label="修改时间" show-overflow-tooltip="true" /> <el-table-column label="操作" align="center" width="200">
<el-table-column label="操作" align="center" width="300">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-document" size="mini" @click="showDetails(row)">查看</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="showDetails(row)">查看</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.USER_NAME)">删除</el-button> <el-button type="text" style="color: red;" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.USER_NAME)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

20
src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue
View File

@ -10,16 +10,16 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="EQUIP_NAME" label="装备名称" width="180" /> <el-table-column prop="EQUIP_NAME" label="装备名称" width="180" />
<el-table-column prop="TYPE_NAME" label="装备类别" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="TYPE_NAME" label="装备类别" />
<el-table-column prop="CONTACT_PERSON" label="负责保管人" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_PERSON" label="负责保管人" />
<el-table-column prop="CONTACT_TELE_PHONE" label="负责保管人固定电话" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_TELE_PHONE" label="负责保管人固定电话" />
<el-table-column prop="CONTACT_MOBILE_PHONE" label="负责保管人移动电话" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_MOBILE_PHONE" label="负责保管人移动电话" />
<el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="UPDATE_TIME_STRING" label="修改时间" />
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-document" size="mini" @click="goList('equipmentInfo', row.EQUIP_ID, '1')">查看</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="goList('equipmentInfo', row.EQUIP_ID, '1')">查看</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EQUIP_ID)">编辑</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EQUIP_ID)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EQUIP_ID,row.EQUIP_NAME)">删除</el-button> <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EQUIP_ID,row.EQUIP_NAME)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -28,7 +28,7 @@
<template> <template>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button> <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
<el-button type="default" icon="el-icon-arrow-left" @click="goBack">返回</el-button> <el-button type="info" icon="el-icon-arrow-left" @click="goBack">返回</el-button>
</template> </template>
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />

12
src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue
View File

@ -16,9 +16,9 @@
<el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" /> <el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-document" size="mini" @click="goList('facilitiesInfo', row.FAC_ID)">查看</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="goList('facilitiesInfo', row.FAC_ID)">查看</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.FAC_ID)">编辑</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.FAC_ID)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.FAC_ID,row.FAC_NAME)">删除</el-button> <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.FAC_ID,row.FAC_NAME)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -27,18 +27,16 @@
<template> <template>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button> <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
<el-button type="default" icon="el-icon-arrow-left" @click="goBack">返回</el-button> <el-button type="info" icon="el-icon-arrow-left" @click="goBack">返回</el-button>
</template> </template>
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div> </div>
<el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px"> <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
<el-form ref="form" :rules="rules" :model="form" label-width="180px"> <el-form ref="form" :rules="rules" :model="form" label-width="110px" style="margin-right: 10px">
<el-form-item label="名称" prop="FAC_NAME"> <el-form-item label="名称" prop="FAC_NAME">
<el-input v-model="form.FAC_NAME" placeholder="请输入名称名称..." /> <el-input v-model="form.FAC_NAME" placeholder="请输入名称名称..." />
</el-form-item> </el-form-item>
<el-form-item label="设备类型" prop="TYPE"> <el-form-item label="设备类型" prop="TYPE">
<Treeselect <Treeselect
:options="yjEquipmentFacilitiesData" :options="yjEquipmentFacilitiesData"

12
src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue
View File

@ -29,13 +29,13 @@
<el-table-column :show-overflow-tooltip="true" prop="CONTACT_MOBILE_PHONE" label="联系人手机号码" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_MOBILE_PHONE" label="联系人手机号码" />
<el-table-column :show-overflow-tooltip="true" prop="COMPANY_NAME" label="企业名称" /> <el-table-column :show-overflow-tooltip="true" prop="COMPANY_NAME" label="企业名称" />
<el-table-column label="操作" align="center" width="600"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-document" size="mini" @click="goList('facilities', row.ID, '1')">查看设备设施</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="goList('facilities', row.ID, '1')">查看设备设施</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goList('equipment', row.ID)">查看救援装备</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="goList('equipment', row.ID)">查看救援装备</el-button>
<el-button type="primary" icon="el-icon-document" size="mini" @click="goList('supplies', row.ID)">查看物资</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="goList('supplies', row.ID)">查看物资</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.RESOURCE_LIBRARY_NAME)">删除</el-button> <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.RESOURCE_LIBRARY_NAME)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

20
src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue
View File

@ -10,16 +10,16 @@
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" /> <el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="SUPPLIES_NAME" label="物资名称" width="180" /> <el-table-column prop="SUPPLIES_NAME" label="物资名称" width="180" />
<el-table-column prop="TYPE_NAME" label="物资类别" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="TYPE_NAME" label="物资类别" />
<el-table-column prop="CONTACT_PERSON" label="负责保管人" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_PERSON" label="负责保管人" />
<el-table-column prop="CONTACT_TELE_PHONE" label="负责保管人固定电话" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_TELE_PHONE" label="负责保管人固定电话" />
<el-table-column prop="CONTACT_MOBILE_PHONE" label="负责保管人移动电话" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="CONTACT_MOBILE_PHONE" label="负责保管人移动电话" />
<el-table-column prop="UPDATE_TIME_STRING" label="修改时间" show-overflow-tooltip="true" /> <el-table-column :show-overflow-tooltip="true" prop="UPDATE_TIME_STRING" label="修改时间" />
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="primary" icon="el-icon-document" size="mini" @click="goList('suppliesInfo', row.SUPPLIES_ID, '1')">查看</el-button> <el-button type="text" icon="el-icon-document" size="mini" @click="goList('suppliesInfo', row.SUPPLIES_ID, '1')">查看</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.SUPPLIES_ID)">编辑</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.SUPPLIES_ID)">编辑</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.SUPPLIES_ID,row.SUPPLIES_NAME)">删除</el-button> <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.SUPPLIES_ID,row.SUPPLIES_NAME)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -28,7 +28,7 @@
<template> <template>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button> <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
<el-button type="default" icon="el-icon-arrow-left" @click="goBack">返回</el-button> <el-button type="info" icon="el-icon-arrow-left" @click="goBack">返回</el-button>
</template> </template>
</div> </div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />

14
src/views/emergen_cyrescue/resource_management/equipment_library/index.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<div> <div>
<list v-show="activeName=='list'" ref="list" /> <list v-show="activeName==='list'" ref="list" />
<facilities v-if="activeName=='facilities'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetail"/> <facilities v-if="activeName==='facilities'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetail"/>
<facilities-info v-if="activeName=='facilitiesInfo'" @goBack="handleGoBack"/> <facilities-info v-if="activeName==='facilitiesInfo'" @goBack="handleGoBack"/>
<equipment v-if="activeName=='equipment'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetailEquip"/> <equipment v-if="activeName==='equipment'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetailEquip"/>
<equipment-info v-if="activeName=='equipmentInfo'" @goBack="handleGoBackFromEquipInfo"/> <equipment-info v-if="activeName==='equipmentInfo'" @goBack="handleGoBackFromEquipInfo"/>
<supplies v-if="activeName=='supplies'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetailSupplies"/> <supplies v-if="activeName==='supplies'" :resource-library-id="resourceLibraryId" @viewDetail="handleViewDetailSupplies"/>
<supplies-info v-if="activeName=='suppliesInfo'" @goBack="handleGoBackFromSupplies"/> <supplies-info v-if="activeName==='suppliesInfo'" @goBack="handleGoBackFromSupplies"/>
</div> </div>
</template> </template>

15
src/views/emergency/equipment/components/list.vue
View File

@ -49,19 +49,12 @@
<el-table-column prop="EQUIP_NAME" label="装备名称" /> <el-table-column prop="EQUIP_NAME" label="装备名称" />
<el-table-column prop="CATEGORY_NAME" label="装备类别" /> <el-table-column prop="CATEGORY_NAME" label="装备类别" />
<el-table-column prop="SPEC" label="规格型号" /> <el-table-column prop="SPEC" label="规格型号" />
<!-- <el-table-column prop="EQUIP_PERFORMANCE" label="技术性能指标" />-->
<!-- <el-table-column prop="MAINTAIN_DATE" label="保养周期" />-->
<!-- <el-table-column prop="VALIDATE_DATE" label="有效期" />-->
<el-table-column prop="USE" label="用途" /> <el-table-column prop="USE" label="用途" />
<!-- <el-table-column prop="USE_DESC" label="用途说明" />--> <el-table-column label="操作" align="center" width="200">
<!-- <el-table-column prop="STORAGE_PLACE" label="存放场所" />-->
<!-- <el-table-column prop="STORAGE_PERSON_NAME" label="负责保管人姓名" />-->
<!-- <el-table-column prop="STORAGE_PERSON_PHONE" label="负责保管人电话" />-->
<el-table-column label="操作" align="center" width="300">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button icon="el-icon-view" size="mini" @click="goDetail(row)">查看</el-button> <el-button type="text" icon="el-icon-view" size="mini" @click="goDetail(row)">查看</el-button>
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYEQUIPMENT_ID)">编辑</el-button> <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYEQUIPMENT_ID)">编辑</el-button>
<el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYEQUIPMENT_ID)">删除</el-button> <el-button type="text" style="color: red;" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYEQUIPMENT_ID)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>