问题修复

master
许宏杰 2 years ago
parent 9e67ad68a2
commit 8faf2a52ff

@ -9,7 +9,8 @@
label-width="auto" label-width="auto"
> >
<el-form-item label="隐患类型" prop="type"> <el-form-item label="隐患类型" prop="type">
<el-select <el-input v-model="queryParams.type" placeholder="请选择隐患类型" />
<!-- <el-select
v-model="queryParams.type" v-model="queryParams.type"
placeholder="请选择隐患类型" placeholder="请选择隐患类型"
clearable clearable
@ -21,7 +22,7 @@
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
/> />
</el-select> </el-select> -->
</el-form-item> </el-form-item>
<el-form-item label="隐患名称" prop="riskName"> <el-form-item label="隐患名称" prop="riskName">
<el-input <el-input
@ -87,9 +88,9 @@
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="隐患类型" align="center" prop="type"> <el-table-column label="隐患类型" align="center" prop="type">
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<dict-tag :options="dict.type.tc_yh_type" :value="scope.row.type" /> <dict-tag :options="dict.type.tc_yh_type" :value="scope.row.type" />
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="隐患名称" align="center" prop="riskName" /> <el-table-column label="隐患名称" align="center" prop="riskName" />
<el-table-column label="等级" align="center" prop="level"> <el-table-column label="等级" align="center" prop="level">
@ -192,14 +193,15 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="隐患类型" prop="type"> <el-form-item label="隐患类型" prop="type">
<el-select v-model="form.type" placeholder="请选择隐患类型"> <el-input v-model="form.type" placeholder="请选择隐患类型" />
<!-- <el-select v-model="form.type" placeholder="请选择隐患类型">
<el-option <el-option
v-for="dict in dict.type.tc_yh_type" v-for="dict in dict.type.tc_yh_type"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="parseInt(dict.value)" :value="parseInt(dict.value)"
></el-option> ></el-option>
</el-select> </el-select> -->
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -267,17 +269,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- <el-form-item label="隐患开始时间" prop="startTime"> <el-form-item label="通报时间" prop="startTime">
<el-date-picker <el-date-picker
clearable clearable
size="small" size="small"
v-model="form.startTime" v-model="form.startTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="选择隐患开始时间" placeholder="选择通报时间"
> >
</el-date-picker> </el-date-picker>
</el-form-item> --> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -328,7 +330,8 @@
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="隐患类型"> <el-descriptions-item label="隐患类型">
<dict-tag :options="dict.type.tc_yh_type" :value="form.type" /> <!-- <dict-tag :options="dict.type.tc_yh_type" :value="form.type" /> -->
{{ form.type }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="单位名称">{{ <el-descriptions-item label="单位名称">{{
@ -370,11 +373,11 @@
form.depName form.depName
}}</el-descriptions-item> }}</el-descriptions-item>
<!-- <el-descriptions-item label="隐患开始时间">{{ <el-descriptions-item label="通报时间">{{
form.startTime form.startTime
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="隐患结束时间">{{ <!-- <el-descriptions-item label="隐患结束时间">{{
form.endTime form.endTime
}}</el-descriptions-item> --> }}</el-descriptions-item> -->
</el-descriptions> </el-descriptions>

@ -101,7 +101,17 @@
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="舆情名称" align="center" prop="sentimentName" /> <el-table-column label="区域" align="center" prop="areaId">
<template slot-scope="scope">
{{ $filterTown(JSON.parse(scope.row.areaId)) }}
</template>
</el-table-column>
<el-table-column
label="舆情名称"
align="center"
prop="sentimentName"
:show-overflow-tooltip="true"
/>
<el-table-column label="部门名称" align="center" prop="depName" /> <el-table-column label="部门名称" align="center" prop="depName" />
<el-table-column <el-table-column
label="发布时间" label="发布时间"

Loading…
Cancel
Save