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

663 排序不正确】 

659 没有重置
659 没有重置
657 重置按钮不好使
565 审核弹窗排版调整一下
506 添加专家组成员页面 搜索掉线
liujun0703-新项目开发
liujun 2024-09-09 13:56:16 +08:00
parent cbdce13b4e
commit 6305e03fae
17 changed files with 143 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/emergen_cyrescue/duty_management/duty_log/components/list.vue
View File

@ -27,7 +27,7 @@
<template slot-scope="{ row }">
<el-button v-if="false" type="text" icon="el-icon-download" size="mini" @click="confirmExport(row.ID)">数据导出</el-button>
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
<el-button type="text" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
<el-button v-if="false" type="text" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID, row.UNIT)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -35,7 +35,7 @@
<div>
<template>
<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 v-if="false" type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
</template>
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />

6
src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/addressbook.vue
View File

@ -227,8 +227,10 @@ export default {
this.dialogFormEdit = false
this.varList = []
this.listQuery.page = 1
this.$message.success('保存成功')
this.getList()
}).catch((e) => {
this.$message.error('保存失败')
this.listLoading = false
})
},
@ -246,11 +248,13 @@ export default {
id: id
}
).then((data) => {
if (data.result == 'success') {
if (data.result === 'success') {
this.listLoading = false
this.$message.success('删除成功')
this.getList()
}
}).catch((e) => {
this.$message.error(e)
this.listLoading = false
})
}).catch(() => {

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

@ -3,7 +3,7 @@
<div class="filter-container">
<el-form inline>
<el-form-item label="姓名：" prop="KEYWORDS_NAME">
<el-input v-model="KEYWORDS_NAME" placeholder="姓名" class="filter-item" style="width: 200px;" />
<el-input v-model="KEYWORDS_NAME" placeholder="姓名" class="filter-item" style="width: 200px;"/>
</el-form-item>
<el-form-item>
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
@ -11,24 +11,37 @@
</el-form-item>
</el-form>
</div>
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
<el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="USER_NAME" label="姓名" width="180" />
<el-table
ref="multipleTable"
:data="varList"
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
tooltip-effect="dark"
border
fit
highlight-current-row>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="USER_NAME" label="姓名" width="180"/>
<el-table-column :show-overflow-tooltip="true" label="性别">
<template slot-scope="{ row }">
{{ row.GENDER === '0' ? '男' : row.GENDER === '1' ? '女' : '' }}
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="ADMINISTRATIVE_POSITION" label="行政职务" />
<el-table-column :show-overflow-tooltip="true" prop="ADMINISTRATIVE_LEVEL" label="行政级别" />
<el-table-column :show-overflow-tooltip="true" prop="IDENTITY_NUMBER" label="身份证号" />
<el-table-column :show-overflow-tooltip="true" prop="CONTACT_PHONE" label="联系电话" />
<el-table-column :show-overflow-tooltip="true" prop="ADMINISTRATIVE_POSITION" label="行政职务"/>
<el-table-column :show-overflow-tooltip="true" prop="ADMINISTRATIVE_LEVEL" label="行政级别"/>
<el-table-column :show-overflow-tooltip="true" prop="IDENTITY_NUMBER" label="身份证号"/>
<el-table-column :show-overflow-tooltip="true" prop="CONTACT_PHONE" label="联系电话"/>
<el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-document" size="mini" @click="showDetails(row)">查看</el-button>
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
<el-button type="text" style="color: red;" 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>
</el-table-column>
</el-table>
@ -39,51 +52,51 @@
<el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
</template>
</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>
<!-- 查看弹窗 -->
<el-dialog :visible.sync="dialogFormShow" title="详情" width="1000px">
<el-form :model="form" label-width="100px" style="margin-right: 10px">
<el-form-item label="姓名" prop="USER_NAME">
<el-input v-model="form.USER_NAME" placeholder="请输入姓名..." disabled />
<el-input v-model="form.USER_NAME" placeholder="请输入姓名..." disabled/>
</el-form-item>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="性别" prop="GENDER">
<el-select v-model="form.GENDER" disabled placeholder="请选择性别" style="width: 100%;">
<el-option label="男" value="0" />
<el-option label="女" value="1" />
<el-option label="男" value="0"/>
<el-option label="女" value="1"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行政职务" prop="ADMINISTRATIVE_POSITION">
<el-input v-model="form.ADMINISTRATIVE_POSITION" placeholder="请选择行政职务" disabled />
<el-input v-model="form.ADMINISTRATIVE_POSITION" placeholder="请选择行政职务" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="行政级别" prop="ADMINISTRATIVE_LEVEL">
<el-input v-model="form.ADMINISTRATIVE_LEVEL" placeholder="请选择行政级别" disabled />
<el-input v-model="form.ADMINISTRATIVE_LEVEL" placeholder="请选择行政级别" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="身份证号" prop="IDENTITY_NUMBER">
<el-input v-model="form.IDENTITY_NUMBER" placeholder="请输入身份证号..." disabled />
<el-input v-model="form.IDENTITY_NUMBER" placeholder="请输入身份证号..." disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="联系电话" prop="CONTACT_PHONE">
<el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." disabled />
<el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="排序" prop="SORT_ORDER">
<el-input v-model="form.SORT_ORDER" placeholder="请输入排序..." disabled />
<el-input v-model="form.SORT_ORDER" placeholder="请输入排序..." disabled/>
</el-form-item>
</el-col>
</el-row>
@ -116,14 +129,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="排序" prop="SORT_ORDER">
<el-input v-model="form.SORT_ORDER" placeholder="请输入排序..." />
<el-input v-model="form.SORT_ORDER" placeholder="请输入排序..."/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="性别" prop="GENDER">
<el-select v-model="form.GENDER" placeholder="请选择性别" style="width: 100%;">
<el-option label="男" value="0" />
<el-option label="女" value="1" />
<el-option label="男" value="0"/>
<el-option label="女" value="1"/>
</el-select>
</el-form-item>
</el-col>
@ -131,24 +144,24 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="行政职务" prop="ADMINISTRATIVE_POSITION">
<el-input v-model="form.ADMINISTRATIVE_POSITION" placeholder="请输入行政职务..." />
<el-input v-model="form.ADMINISTRATIVE_POSITION" placeholder="请输入行政职务..."/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行政级别" prop="ADMINISTRATIVE_LEVEL">
<el-input v-model="form.ADMINISTRATIVE_LEVEL" placeholder="请输入行政级别..." />
<el-input v-model="form.ADMINISTRATIVE_LEVEL" placeholder="请输入行政级别..."/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="身份证号" prop="IDENTITY_NUMBER">
<el-input v-model="form.IDENTITY_NUMBER" placeholder="请输入身份证号..." />
<el-input v-model="form.IDENTITY_NUMBER" placeholder="请输入身份证号..."/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="CONTACT_PHONE">
<el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..." />
<el-input v-model="form.CONTACT_PHONE" placeholder="请输入联系电话..."/>
</el-form-item>
</el-col>
</el-row>
@ -372,7 +385,8 @@ export default {
}).catch((e) => {
this.listLoading = false
})
}).catch(() => { })
}).catch(() => {
})
},
makeAll() {
const _selectData = this.$refs.multipleTable.selection
@ -398,7 +412,8 @@ export default {
}).catch((e) => {
this.listLoading = false
})
}).catch(() => { })
}).catch(() => {
})
},
getQuery() {
this.$refs.multipleTable.clearSelection()
@ -407,9 +422,7 @@ export default {
getList() {
this.listLoading = true
requestFN('/major/personnel/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
{
name: this.KEYWORDS_NAME
}
{ name: this.KEYWORDS_NAME }
).then((data) => {
this.listLoading = false
this.varList = data.varList

7
src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue
View File

@ -344,7 +344,12 @@ export default {
{ required: true, message: '负责人不能为空', trigger: 'blur' }
],
RESPONSIBLE_OFFICE_PHONE: [
{ required: true, message: '负责人办公电话不能为空', trigger: 'blur' }
{ required: true, message: '负责人办公电话不能为空', trigger: 'blur' },
{ min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
{
pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
message: '请输入正确的手机号码'
}
]
},
// rules: {

2
src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue
View File

@ -535,7 +535,9 @@ export default {
this.varList = []
this.listQuery.page = 1
this.getList()
this.$message.success('保存成功')
}).catch((e) => {
this.$message.error(e)
this.listISLOADing = false
})
},

21
src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/list.vue
View File

@ -38,14 +38,19 @@
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div>
<el-dialog :visible.sync="dialogFormCheck" title="审核" width="400px" class="dy-dialog">
<Treeselect
:options="FILESTATUSThree"
v-model="AUDIT_STATUS"
placeholder="请选择预案类型"
no-options-text="暂无数据"
no-children-text="暂无数据"
/>
<el-dialog :visible.sync="dialogFormCheck" title="审核" width="400px">
<el-form inline label-width="120px">
<el-form-item label="审核状态:" >
<Treeselect
:options="FILESTATUSThree"
v-model="AUDIT_STATUS"
placeholder="请选择预案类型"
no-options-text="暂无数据"
no-children-text="暂无数据"
style="width: 300px"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormCheck = false">取 消</el-button>
<el-button type="primary" @click="setCheck">确 定</el-button>

2
src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue
View File

@ -34,7 +34,7 @@
<div>
<template>
<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 v-if="false" type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>
</template>
</div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />

10
src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/selectZhiBanUser.vue
View File

@ -1,5 +1,5 @@
<template>
<el-dialog v-loading="listLoading" :visible.sync="visible" title="选择人员" width="850px">
<el-dialog v-loading="listLoading" :visible.sync="visible" :before-close="closeDialog" title="选择人员" width="850px">
<el-container>
<el-aside width="240px" style="background-color:#fff">
<el-input
@ -59,7 +59,7 @@
</el-main>
</el-container>
<div slot="footer" class="dialog-footer">
<el-button @click="visible = false">取 消</el-button>
<el-button @click="closeDialog">取 消</el-button>
<el-button type="primary" @click="savePeople">确 定</el-button>
</div>
</el-dialog>
@ -189,6 +189,12 @@ export default {
}).catch((e) => {
this.treeLoading = false
})
},
closeDialog() {
this.filterText = ''
this.KEYWORDS = ''
this.treeData = []
this.visible = false
}
}
}

10
src/views/emergen_cyrescue/emergency_report/duty_management/shift_registration/components/selectZhiBanUser.vue
View File

@ -38,7 +38,15 @@
</el-row>
</el-form>
</div>
<el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" style="height:350px" tooltip-effect="dark" border fit highlight-current-row>
<el-table
ref="multipleTable"
:data="varList"
:header-cell-style="{'font-weight': 'bold','color': '#000'}"
tooltip-effect="dark"
border
fit
height="350px"
highlight-current-row>
<el-table-column type="selection" width="55" align="center" />
<el-table-column prop="NAME" label="姓名" />
<el-table-column prop="USERNAME" width="180" align="center" label="电话号码" />

17
src/views/emergen_cyrescue/emergency_report/incident_report/components/detail.vue
View File

@ -30,6 +30,10 @@
<td class="tbg">联系电话</td>
<td>{{ form.CONTACT_PHONE }}</td>
</tr>
<tr>
<td class="tbg">其他信息</td>
<td colspan="3">{{ form.OTHER_INFO }}</td>
</tr>
<tr>
<td class="tbg">单位名称</td>
<td>{{ form.UNIT_NAME }}</td>
@ -57,14 +61,15 @@
<tr>
<td class="tbg">所在地址</td>
<td>{{ form.LOCATION_ADDRESS }}</td>
<td class="tbg">经度</td>
<td>{{ form.LONGITUDE }}</td>
</tr>
<tr>
<td class="tbg">纬度</td>
<td>{{ form.LATITUDE }}</td>
<td class="tbg">接报类型</td>
<td>{{ form.REPORT_TYPE }}</td>
</tr>
<tr>
<td class="tbg">经度</td>
<td>{{ form.LONGITUDE }}</td>
<td class="tbg">纬度</td>
<td>{{ form.LATITUDE }}</td>
</tr>
<tr>
<td class="tbg">事故标题</td>

2
src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue
View File

@ -197,7 +197,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-col v-if="rescueForm.RESCUE_SITUATION === '1'" :span="12">
<el-form-item label="是否执预案:" prop="EVENT_SITUATION">
<el-radio-group v-model="rescueForm.EVENT_SITUATION">
<el-radio :label="'1'">是</el-radio>

19
src/views/emergen_cyrescue/emergency_team/expert_group/components/expertlist.vue
View File

@ -1,11 +1,16 @@
<template>
<div class="app-container">
<div class="filter-container">
<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
搜索
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
<el-form inline>
<el-form-item label="专家姓名:" prop="EXPERT_GROUP_ID">
<el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
</el-form-item>
<el-form-item prop="EXPERT_NAME">
<el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
<el-button class="filter-item" type="info" icon="el-icon-search" @click="resetting">重置</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
</el-form-item>
</el-form>
<div class="ui-foot">
<el-button type="primary" @click="goBack">返回专家组</el-button>
</div>
@ -130,6 +135,10 @@ export default {
getQuery() {
this.$refs.multipleTable.clearSelection()
this.getList()
},
resetting() {
this.KEYWORDS = ''
this.getList()
}
}

15
src/views/emergen_cyrescue/emergency_team/expert_group/components/list.vue
View File

@ -290,8 +290,13 @@ export default {
this.FFILE = fileList
},
upload(fun) {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
const formData = new FormData()
for (let i = 0; i < this.FFILE.length; i++) {
if (this.FFILE[i].raw) {
formData.append('FFILE', this.FFILE[i].raw)
@ -302,7 +307,10 @@ export default {
formData
).then((data) => {
fun(data.fileurl)
loading.close()
}).catch((e) => {
this.$message.error(e)
loading.close()
})
},
//* ****************************************
@ -461,6 +469,7 @@ export default {
requestFN(
'/yjExpertGroup/save', this.form
).then((data) => {
this.$message.success('保存成功')
this.listISLOADing = false
this.dialogFormEdit = false
this.varList = []
@ -511,6 +520,7 @@ export default {
}
this.getList()
}).catch((e) => {
this.$message.error(e)
this.listISLOADing = false
})
},
@ -529,10 +539,12 @@ export default {
}
).then((data) => {
if (data.result === 'success') {
this.$message.success('删除成功')
this.listISLOADing = false
this.getList()
}
}).catch((e) => {
this.$message.error(e)
this.listISLOADing = false
})
}).catch(() => {
@ -570,6 +582,7 @@ export default {
this.listQuery.page = 1
this.$refs.multipleTable.clearSelection()
this.getList()
this.$message.success('删除成功')
}).catch((e) => {
this.listISLOADing = false
})

2
src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue
View File

@ -609,7 +609,9 @@ export default {
this.varList = []
this.listQuery.page = 1
this.getList()
this.$message.success('保存成功')
}).catch((e) => {
console.error('保存失败', e)
this.listISLOADing = false
})
},

1
src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue
View File

@ -194,6 +194,7 @@ export default {
},
resetQuery() {
this.RESCUE_TEAM_NAME = ''
this.NAME = ''
this.getQuery()
},
goList(page, CASE_ID, ticketType) {

9
src/views/emergency/drill/org/components/list.vue
View File

@ -12,8 +12,8 @@
</el-button>
</div>
<div>
<el-button v-show="add" type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
<el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
<el-button type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
</div>
</div>
@ -38,8 +38,8 @@
<el-table-column prop="ORG_DUTY" label="机构职责" />
<el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}">
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORG_ID)">编辑</el-button>
<el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORG_ID)">删除</el-button>
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORG_ID)">编辑</el-button>
<el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORG_ID)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -186,6 +186,7 @@ export default {
this.listLoading = false
this.dialogFormEdit = false
this.getList()
this.$message.success('保存成功')
}).catch((e) => {
this.listLoading = false
})

9
src/views/emergency/drill/orgmember/components/list.vue
View File

@ -12,8 +12,8 @@
</el-button>
</div>
<div>
<el-button v-show="add" type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
<el-button v-show="del" type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
<el-button type="primary" icon="el-icon-plus" plain @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" plain @click="batchDel">删除</el-button>
</div>
</div>
@ -41,8 +41,8 @@
<el-table-column prop="MEMBER_EMERGENCY_PHONE" label="紧急联系电话" width="110" />
<el-table-column label="操作" align="center" width="200">
<template slot-scope="{row}">
<el-button v-show="edit" type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORGMEMBER_ID)">编辑</el-button>
<el-button v-show="del" type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORGMEMBER_ID)">删除</el-button>
<el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EMERGENCYDRILLORGMEMBER_ID)">编辑</el-button>
<el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EMERGENCYDRILLORGMEMBER_ID)">删除</el-button>
</template>
</el-table-column>
</el-table>
@ -220,6 +220,7 @@ export default {
this.listLoading = false
this.dialogFormEdit = false
this.getList()
this.$message.success('保存成功')
}).catch((e) => {
this.listLoading = false
})