From c562fa2e66f4972ae23fa57ef7412da6e18991ed Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期二, 12 七月 2022 14:31:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/shf' into master

---
 src/views/accidentHidden/majorHidden.vue |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/views/accidentHidden/majorHidden.vue b/src/views/accidentHidden/majorHidden.vue
index ab2fffe..71e9452 100644
--- a/src/views/accidentHidden/majorHidden.vue
+++ b/src/views/accidentHidden/majorHidden.vue
@@ -45,7 +45,7 @@
           v-for="item in YHBMList"
           :key="item.branch_id"
           :label="item.branch_name"
-          :value="item.branch_id">
+          :value="item.branch_name">
         </el-option>
       </el-select>
       </el-form-item>
@@ -136,12 +136,12 @@
        <el-form-item style="text-align:center;padding:0 50px">
         <el-button type="primary" class="btns" size="small" icon="el-icon-search" @click="getPageList()">查询</el-button>
            <el-button type="primary" class="btns" size="small" @click="reset()">重置</el-button>
-        <el-button type="primary" class="btns" size="small" icon="el-icon-upload2">导出excel</el-button>
+        <el-button type="primary" class="btns" size="small" icon="el-icon-upload2" @click="exportData">导出excel</el-button>
       </el-form-item>
       </el-form>
     <el-row class="title-center">
       <el-col :span="10">
-        <el-radio-group v-model="listQuery.form.alter_status" style="border:none">
+        <el-radio-group v-model="listQuery.form.alter_status" @change="changeStatus" style="border:none">
       <el-radio-button  label="正在整改">正在整改</el-radio-button>
       <el-radio-button  label="正在复查">正在复查</el-radio-button>
       <el-radio-button  label="整改完成">整改完成</el-radio-button>
@@ -154,13 +154,22 @@
     </el-row>
     <el-table :data="tableData" style="width: 100%">
      <!-- <el-table-column type="selection" width="55" align="center"></el-table-column>-->
-      <el-table-column prop="number" label="编号" align="center" width="120"></el-table-column>
+      <el-table-column prop="number" label="编号" align="center" width="120">
+          <template slot-scope="scope">
+              <div class="blue-font-color" @click="showDetails(scope.row)">{{ scope.row.number }}</div>
+          </template>
+      </el-table-column>
       <el-table-column prop="check_branch" label="检查部门" align="center" width="120"></el-table-column>
       <el-table-column prop="check_man" label="检查人" align="center" width="120"></el-table-column>
       <el-table-column prop="checktype" label="检查类别" align="center">
       </el-table-column>
       <el-table-column label="隐患项目" align="center">
-        <el-table-column prop="check_date" label="检查时间" width="120"  align="center"></el-table-column>
+        <el-table-column prop="check_date" label="检查时间" width="120"  align="center">
+            <template slot-scope="scope">
+                <label>{{ formatDate(scope.row.check_date) }}</label><br/>
+                <label>{{ scope.row.check_class }}</label>
+            </template>
+        </el-table-column>
         <el-table-column prop="address" label="地点" align="center"> </el-table-column>
         <el-table-column prop="ht_content" label="内容" align="center"> </el-table-column>
         <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
@@ -197,7 +206,7 @@
   </div>
 </template>
 <script>
-import {getPageList} from "@/api/sgyhpczl/majorHidden";
+import {getPageList,analogy_export_do} from "@/api/sgyhpczl/majorHidden";
 import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
 export default {
     data() {
@@ -333,6 +342,45 @@
                 }
             })
         },
+        //状态切换
+        changeStatus(val){
+            this.listQuery.form.alter_status = val;
+            this.getPageList();
+        },
+        //日期格式转换
+        formatColumnDate(row, column) {
+            // 获取单元格数据
+            let data = row[column.property];
+            if (data == null) {
+                return null;
+            }
+            let dt = new Date(data);
+            return (
+                dt.getFullYear() + "-" + (dt.getMonth() + 1) + "-" + dt.getDate() + " "
+            );
+        },
+        exportData() {
+            this.listLoading = true
+            var requestData = JSON.parse(JSON.stringify(this.listQuery));
+            requestData.export_type = 0;
+            //删除分页参数
+            this.$delete(requestData, 'page')
+            this.$delete(requestData, 'limit')
+            analogy_export_do(requestData).then(res => {
+                this.listLoading = false
+                var blob = new Blob([res.data])
+                var downloadElement = document.createElement('a')
+                var href = window.URL.createObjectURL(blob) //创建下载的链接
+                downloadElement.href = href
+                downloadElement.download = '重大隐患整改进度.xlsx' //下载后文件名
+                document.body.appendChild(downloadElement)
+                downloadElement.click() //点击下载
+                document.body.removeChild(downloadElement) //下载完成移除元素
+                window.URL.revokeObjectURL(href) //释放掉blob对象
+            }).catch(err => {
+                console.log(err)
+            })
+        },
         initYHLX(){
             initYHLX().then(res=>{
                 if (res.data.ok==1){
@@ -379,6 +427,21 @@
                 path:"/fillProgress?id="+row.id
             })
         },
+        showDetails(row) {
+            this.$router.push({
+                path: "/dangerDetails",
+                query: {"id": row.id}
+            })
+        },
+        //方法区
+        formatDate(data) {
+            // 获取单元格数据
+            if (data == null) {
+                return null
+            }
+            let dt = new Date(data)
+            return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
+        },
     }
 };
 </script>

--
Gitblit v1.9.2