Merge remote-tracking branch 'remotes/origin/shf' into master

lyfO_o

2022-07-12 c562fa2e66f4972ae23fa57ef7412da6e18991ed

 src/views/careabout/index.vue

@@ -100,7 +100,7 @@
                    <el-option
                        v-for="item in reList"
                        :key="item.value"
                        :label="item.label"
                        :label="item.value"
                        :value="item.value">
                    </el-option>
                </el-select>
@@ -155,7 +155,7 @@
            <div v-if="table1">
            <el-col :span="14" style="text-align:right;">
                <el-button class="btns" type="primary" size="small" @click="specialFocus()">{{focusDesc}}</el-button>
                <el-button class="btns" type="primary" size="small" @click="sendBath()">管理关注</el-button>
<!--                <el-button class="btns" type="primary" size="small" @click="sendBath()">管理关注</el-button>-->
            </el-col>
            </div>
        </el-row>
@@ -170,9 +170,24 @@
            <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="检查时间" :formatter="formatColumnDate" width="120" align="center"></el-table-column>
                <el-table-column prop="check_date" label="检查时间" :formatter="formatColumnDate" 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_content" label="内容" align="center">
                    <template slot-scope="scope">
                        <el-popover trigger="hover" placement="top">
                            <p>{{ scope.row.ht_content }}</p>
                            <div slot="reference" class="name-wrapper">{{
                                    scope.row.ht_content != null && scope.row.ht_content.length > 10 ? scope.row.ht_content.substring(0, 8) + "...." : scope.row.ht_content
                                }}
                            </div>
                        </el-popover>
                    </template>
                </el-table-column>
                <el-table-column prop="ht_typesub" label="类别" align="center"> </el-table-column>
                <el-table-column prop="ht_level" label="级别" align="center"> </el-table-column>
            </el-table-column>
@@ -236,7 +251,7 @@
</template>
<script>
import { getPageList, danger_focus_tag, analogy_export_do, focus_do} from "@/api/sgyhpczl/careabout"
import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr} from "@/api/sgyhpczl/initSelect";
import {initJCBM ,initYHLX, initBC ,initJCLB ,initYHBM ,initYHJB,initLlr,initSrxcqk} from "@/api/sgyhpczl/initSelect";

    export default{
        data(){
@@ -261,7 +276,7 @@
                JCBMList:[],
                YHLXList:[],
                BCList:[],
                reList:[{label:"值班",value:"值班"},{label:"带班",value:"带班"}],
                reList:[],
                JCLBList:[],
                YHBMList:[],
                YHJBList:[],
@@ -290,6 +305,7 @@
            this.initJCLB();
            this.initLlr();
            this.initYHBM();
            this.initSrxcqk();
            this.initTags();
            this.getPageList();
        },
@@ -346,6 +362,15 @@
                initYHBM().then(res=>{
                    if (res.data.ok==1){
                        this.YHBMList=res.data.data
                    } else{
                        this.$message({type:'error', message:res.data.msg, duration:3000})
                    }
                })
            },
            initSrxcqk(){
                initSrxcqk().then(res=>{
                    if (res.data.ok==1){
                        this.reList=res.data.data
                    } else{
                        this.$message({type:'error', message:res.data.msg, duration:3000})
                    }
@@ -520,6 +545,15 @@
                let dt = new Date(data)
                return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate() + ' '
            },
            //方法区
            formatDate(data) {
                // 获取单元格数据
                if (data == null) {
                    return null
                }
                let dt = new Date(data)
                return dt.getFullYear() + '-' + (dt.getMonth() + 1) + '-' + dt.getDate()
            },
        }
    }
</script>