Browse Source

消防报表增删查改

liuQiang 1 year ago
parent
commit
4f2da40207
2 changed files with 392 additions and 348 deletions
  1. 56 7
      src/views/backend/tongjiBroad/index.vue
  2. 336 341
      yarn.lock

+ 56 - 7
src/views/backend/tongjiBroad/index.vue

@@ -4,7 +4,10 @@
     <!-- 搜索工作栏 -->
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="消防大队" prop="deptid">
       <el-form-item label="消防大队" prop="deptid">
-        <el-input v-model="queryParams.deptid" ref="ksd" placeholder="请输入消防大队" clearable @keyup.enter.native="handleQuery"/>
+        <!-- <el-input v-model="queryParams.deptid" ref="ksd" 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>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -28,7 +31,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="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="orgCode" />
       <el-table-column label="部门编码" align="center" prop="orgCode" />
       <el-table-column label="填报日期" align="center" prop="reportDate" />
       <el-table-column label="填报日期" align="center" prop="reportDate" />
       <el-table-column label="隐患整改时间统计" align="center" prop="adjustcount" />
       <el-table-column label="隐患整改时间统计" align="center" prop="adjustcount" />
@@ -67,7 +74,9 @@
     <el-dialog :title="title" :visible.sync="open" width="700px" v-dialogDrag append-to-body>
     <el-dialog :title="title" :visible.sync="open" width="700px" v-dialogDrag append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="160px">
       <el-form ref="form" :model="form" :rules="rules" label-width="160px">
         <el-form-item label="消防大队" prop="deptid">
         <el-form-item label="消防大队" prop="deptid">
-          <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="orgCode">
         <el-form-item label="部门编码" prop="orgCode">
           <el-input v-model="form.orgCode" placeholder="请输入部门编码" />
           <el-input v-model="form.orgCode" placeholder="请输入部门编码" />
@@ -103,9 +112,7 @@
           <el-input v-model="form.dengerfixavg" placeholder="请输入隐患整改平均时间" />
           <el-input v-model="form.dengerfixavg" placeholder="请输入隐患整改平均时间" />
         </el-form-item>
         </el-form-item>
         <el-form-item label="日均扫描设备类型数" prop="avgdatedevtype">
         <el-form-item label="日均扫描设备类型数" prop="avgdatedevtype">
-          <el-select v-model="form.avgdatedevtype" placeholder="请选择日均扫描设备类型数">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
+          <el-input v-model="form.avgdatedevtype" type="number" placeholder="请输入日均扫描设备类型数" />
         </el-form-item>
         </el-form-item>
         <el-form-item label="设备扫码量" prop="devscantotal">
         <el-form-item label="设备扫码量" prop="devscantotal">
           <el-input v-model="form.devscantotal" placeholder="请输入设备扫码量" />
           <el-input v-model="form.devscantotal" placeholder="请输入设备扫码量" />
@@ -145,6 +152,7 @@
 
 
 <script>
 <script>
 import { createTongjiBroad, updateTongjiBroad, deleteTongjiBroad, getTongjiBroad, getTongjiBroadPage, exportTongjiBroadExcel } from "@/api/backend/tongjiBroad";
 import { createTongjiBroad, updateTongjiBroad, deleteTongjiBroad, getTongjiBroad, getTongjiBroadPage, exportTongjiBroadExcel } from "@/api/backend/tongjiBroad";
+import { getDdlist } from "@/api/backend/statistics";
 
 
 export default {
 export default {
   name: "TongjiBroad",
   name: "TongjiBroad",
@@ -175,11 +183,13 @@ export default {
       form: {},
       form: {},
       // 表单校验
       // 表单校验
       rules: {
       rules: {
-      }
+      },
+      deptData:[]
     };
     };
   },
   },
   created() {
   created() {
     this.getList();
     this.getList();
+    this.getDeptData()
     this.$nextTick(()=>{
     this.$nextTick(()=>{
       console.log('this.$refs', this.$refs)
       console.log('this.$refs', this.$refs)
     })
     })
@@ -229,6 +239,43 @@ export default {
       };
       };
       this.resetForm("form");
       this.resetForm("form");
     },
     },
+    /** 获取消防大队下拉框数据 */
+    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
+      }
+    },
     /** 搜索按钮操作 */
     /** 搜索按钮操作 */
     handleQuery() {
     handleQuery() {
       this.queryParams.pageNo = 1;
       this.queryParams.pageNo = 1;
@@ -251,6 +298,7 @@ export default {
       const id = row.id;
       const id = row.id;
       getTongjiBroad(id).then(response => {
       getTongjiBroad(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 = "修改 统计面板设置";
       });
       });
@@ -263,6 +311,7 @@ export default {
         }
         }
         // 修改的提交
         // 修改的提交
         if (this.form.id != null) {
         if (this.form.id != null) {
+          this.form.deptid = this.deptListName(this.form.deptid)
           updateTongjiBroad(this.form).then(response => {
           updateTongjiBroad(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.$modal.msgSuccess("修改成功");
             this.open = false;
             this.open = false;

File diff suppressed because it is too large
+ 336 - 341
yarn.lock


Some files were not shown because too many files changed in this diff