|
@@ -6,8 +6,11 @@
|
|
<el-form-item label="监督员名称" prop="watcher">
|
|
<el-form-item label="监督员名称" prop="watcher">
|
|
<el-input v-model="queryParams.watcher" placeholder="请输入监督员名称" clearable @keyup.enter.native="handleQuery"/>
|
|
<el-input v-model="queryParams.watcher" placeholder="请输入监督员名称" clearable @keyup.enter.native="handleQuery"/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
- <el-form-item label="所属大队" prop="servorg">
|
|
|
|
- <el-input v-model="queryParams.deptid" placeholder="请选择所属大队" clearable @keyup.enter.native="handleQuery"/>
|
|
|
|
|
|
+ <el-form-item label="所属大队" prop="deptid">
|
|
|
|
+ <!-- <el-input v-model="queryParams.deptid" placeholder="请选择所属大队" clearable @keyup.enter.native="handleQuery"/> -->
|
|
|
|
+ <el-select v-model="queryParams.deptid" clearable placeholder="请选择消防大队">
|
|
|
|
+ <el-option :label="item.deptName" :value="item.id" v-for="item in deptData" :key="item.id"></el-option>
|
|
|
|
+ </el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="质态" prop="quality">
|
|
<el-form-item label="质态" prop="quality">
|
|
<el-input v-model="queryParams.quality" placeholder="请输入质态" clearable @keyup.enter.native="handleQuery"/>
|
|
<el-input v-model="queryParams.quality" placeholder="请输入质态" clearable @keyup.enter.native="handleQuery"/>
|
|
@@ -38,7 +41,11 @@
|
|
<el-table v-loading="loading" :data="list">
|
|
<el-table v-loading="loading" :data="list">
|
|
<el-table-column label="id" align="center" prop="id" />
|
|
<el-table-column label="id" align="center" prop="id" />
|
|
<el-table-column label="监督员名称" align="center" prop="watcher" />
|
|
<el-table-column label="监督员名称" align="center" prop="watcher" />
|
|
- <el-table-column label="所属大队" align="center" prop="deptid" />
|
|
|
|
|
|
+ <el-table-column label="所属大队" align="center" prop="deptid">
|
|
|
|
+ <template v-slot="scope">
|
|
|
|
+ {{deptList(scope.row.deptid)}}
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column label="质态" align="center" prop="quality" />
|
|
<el-table-column label="质态" align="center" prop="quality" />
|
|
<el-table-column label="负责单位数" align="center" prop="servorg" />
|
|
<el-table-column label="负责单位数" align="center" prop="servorg" />
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
@@ -61,7 +68,10 @@
|
|
<el-input v-model="form.watcher" placeholder="请输入监督员名称" />
|
|
<el-input v-model="form.watcher" placeholder="请输入监督员名称" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="所属大队" prop="quality">
|
|
<el-form-item label="所属大队" prop="quality">
|
|
- <el-input v-model="form.deptid" placeholder="请选择大队" />
|
|
|
|
|
|
+ <!-- <el-input v-model="form.deptid" placeholder="请选择大队" /> -->
|
|
|
|
+ <el-select v-model="form.deptid" placeholder="请选择消防大队">
|
|
|
|
+ <el-option :label="item.deptName" :value="item.id" v-for="item in deptData" :key="item.id"></el-option>
|
|
|
|
+ </el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="质态" prop="quality">
|
|
<el-form-item label="质态" prop="quality">
|
|
<el-input v-model="form.quality" placeholder="请输入质态" />
|
|
<el-input v-model="form.quality" placeholder="请输入质态" />
|
|
@@ -80,7 +90,7 @@
|
|
|
|
|
|
<script>
|
|
<script>
|
|
import { createWatcher, updateWatcher, deleteWatcher, getWatcher, getWatcherPage, exportWatcherExcel } from "@/api/backend/watcher";
|
|
import { createWatcher, updateWatcher, deleteWatcher, getWatcher, getWatcherPage, exportWatcherExcel } from "@/api/backend/watcher";
|
|
-
|
|
|
|
|
|
+import { getDdlist } from "@/api/backend/statistics";
|
|
export default {
|
|
export default {
|
|
name: "Watcher",
|
|
name: "Watcher",
|
|
components: {
|
|
components: {
|
|
@@ -114,11 +124,13 @@ export default {
|
|
form: {},
|
|
form: {},
|
|
// 表单校验
|
|
// 表单校验
|
|
rules: {
|
|
rules: {
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ deptData:[]
|
|
};
|
|
};
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
this.getList();
|
|
this.getList();
|
|
|
|
+ this.getDeptData()
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
/** 查询列表 */
|
|
/** 查询列表 */
|
|
@@ -131,6 +143,43 @@ export default {
|
|
this.loading = false;
|
|
this.loading = false;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
|
|
+ /** 获取消防大队下拉框数据 */
|
|
|
|
+ getDeptData() {
|
|
|
|
+ getDdlist().then(res=>{
|
|
|
|
+ this.deptData = res.data
|
|
|
|
+ console.log('deptData',this.deptData);
|
|
|
|
+ })
|
|
|
|
+ },
|
|
|
|
+ /** 列表消防大队转换 id2name*/
|
|
|
|
+ deptList(id) {
|
|
|
|
+ let thisDept
|
|
|
|
+ const arr = JSON.parse(JSON.stringify(this.deptData))
|
|
|
|
+ arr.forEach(item=>{
|
|
|
|
+ if(item.id == id){
|
|
|
|
+ thisDept = item
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ if(thisDept){
|
|
|
|
+ return thisDept.deptName
|
|
|
|
+ }else{
|
|
|
|
+ return ''
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ /** 列表消防大队转换 name2id*/
|
|
|
|
+ deptListName(name) {
|
|
|
|
+ let thisDept
|
|
|
|
+ const arr = JSON.parse(JSON.stringify(this.deptData))
|
|
|
|
+ arr.forEach(item=>{
|
|
|
|
+ if(item.deptName == name){
|
|
|
|
+ thisDept = item
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ if(thisDept){
|
|
|
|
+ return thisDept.id
|
|
|
|
+ }else{
|
|
|
|
+ return name
|
|
|
|
+ }
|
|
|
|
+ },
|
|
/** 取消按钮 */
|
|
/** 取消按钮 */
|
|
cancel() {
|
|
cancel() {
|
|
this.open = false;
|
|
this.open = false;
|
|
@@ -169,6 +218,7 @@ export default {
|
|
const id = row.id;
|
|
const id = row.id;
|
|
getWatcher(id).then(response => {
|
|
getWatcher(id).then(response => {
|
|
this.form = response.data;
|
|
this.form = response.data;
|
|
|
|
+ this.form.deptid = this.deptList(this.form.deptid)
|
|
this.open = true;
|
|
this.open = true;
|
|
this.title = "修改监督员质态统计";
|
|
this.title = "修改监督员质态统计";
|
|
});
|
|
});
|
|
@@ -181,6 +231,7 @@ export default {
|
|
}
|
|
}
|
|
// 修改的提交
|
|
// 修改的提交
|
|
if (this.form.id != null) {
|
|
if (this.form.id != null) {
|
|
|
|
+ this.form.deptid = this.deptListName(this.form.deptid)
|
|
updateWatcher(this.form).then(response => {
|
|
updateWatcher(this.form).then(response => {
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.$modal.msgSuccess("修改成功");
|
|
this.open = false;
|
|
this.open = false;
|