提交代码

src/api/index.js

@@ -9,6 +9,7 @@ import special from './special/index'
 import dict from './dict/index'
 import attendance from  './attendance/index'
 import insurance from './insurance/index'
+import journalism from './journalism/index'
 export default {
     project,
     dept,
@@ -20,5 +21,6 @@ export default {
     special,
     dict,
     attendance,
-    insurance
+    insurance,
+    journalism
 }

src/api/journalism/index.js

@@ -0,0 +1,19 @@
+import request from '@/utils/request'
+
+const getJournalismList=()=> {
+    return request({
+      url: `bgscreen/journalism/getJournalismList`,
+      method: 'get'
+    })
+  }
+
+  const getJournalismInfo=(id)=> {
+    return request({
+      url: `bgscreen/journalism/getJournalismInfo?id=${id}`,
+      method: 'get'
+    })
+  }
+export default{
+    getJournalismList,
+    getJournalismInfo
+}

src/pages/dlg/journalismDlg.vue

@@ -0,0 +1,63 @@
+<template>
+    <MyDialog v-if="show" v-model="show" width="1200px" height="600px" class="journalismDlg">
+        <template slot="title">{{title}}</template>
+        <div v-html="myHtml"></div>
+    </MyDialog>
+</template>
+
+<script>
+import '@/components/module/module-one-1-1'
+import MyDialog from '../components/MyDialog'
+
+export default {
+    components: {
+        MyDialog,
+    },
+    name: 'journalismDlg',
+    data() {
+        return {
+            title:'',
+            data: null,
+            dataList: [],
+            show: false,
+            myHtml:"<p></p>",
+        };
+    },
+
+    /**特种作业人员数据 */
+    mounted() {
+        this.data = null;
+    },
+
+    methods: {
+        showDialog(it) {
+            this.data = it;
+            this.title = it.title;
+            this.$api.journalism.getJournalismInfo(it.id).then(d => {
+                this.show=true;
+                this.myHtml = d.data.content;
+            });
+        }
+    },
+};
+</script>
+
+<style lang="less" scoped>
+.mytable {
+    /deep/ th .cell {
+        color: aquamarine;
+    }
+}
+.head-title-tab {
+        padding-top: 12px;
+        display: block;
+        width: 100%;
+
+        .head-nav {
+            background-size: 100% 100%;
+            display: inline-block;
+            width: auto;
+            padding: 0px 24px;
+        }
+    }
+</style>

src/pages/index.vue

@@ -146,12 +146,16 @@
                     </el-col>
                     <el-col :span="6">
                         <module-one-1-1 label="集团重点工作">
-                            <div style="height: 240px;overflow: hidden;margin: 10px 20px;">
-                                <img src="images/820.jpg?v=1" style="width: 100%;">
-                            </div>
-                            <div style="text-align: center;font-size: 12px;">
-                                西咸新区暨泾河新城2023年“安全生产月”启动仪式
-                            </div>
+                            <el-carousel>
+                                <el-carousel-item v-for="item in JournalismList" >
+                                    <div style="height: 252px;" @click="handJournalism(item)">
+                                        <img :src="$apiPath + item.mainImage+'.min.jpg'" style="width:100%;height:100%;">
+                                    </div>
+                                    <div style="text-align: center;font-size: 12px;line-height: 32px;">
+                                        {{item.title}}
+                                    </div>
+                                </el-carousel-item>
+                            </el-carousel>
                         </module-one-1-1>
                         <module-one-1-1 label="成本管理" :key="elKey">
                             <div class="glr-max" style="position: relative;">
@@ -196,6 +200,7 @@
         <index-dlg1 ref="dlg1"></index-dlg1>
         <index-dlg2 ref="dlg2"></index-dlg2>
         <index-dlg3 ref="dlg3"></index-dlg3>
+        <journalismDlg ref="journalismDlg"></journalismDlg>
     </div>
 </template>
 <script>
@@ -212,6 +217,7 @@ import indexDlg2 from './index/indexDlg2'
 import indexDlg3 from './index/indexDlg3'
 import indexMap from './index/map.vue'
 import MonitAndWarning from './components/MonitAndWarning.vue'
+import journalismDlg from './dlg/journalismDlg.vue'
 export default {
     name: 'App',
     components: {
@@ -219,7 +225,8 @@ export default {
         indexDlg2,
         indexDlg3,
         indexMap,
-        MonitAndWarning
+        MonitAndWarning,
+        journalismDlg
     },
     data() {
         return {
@@ -424,9 +431,7 @@ export default {
             projectCategory:[],
             projectCategoryWidth:200,
             deptInfo:{},
-            projectSafetyInterval:{
-
-            },
+            JournalismList:[],
         }
     },
     created() {
@@ -522,14 +527,14 @@ export default {
                 return 0;
             },  
         init() {
-            this.$api.project.groupByProjectCategory(datas=>{
-                this.projectCategory=datas;                   
-                this.prjPrcessTotal=this.getPrjCateCount(0);
-                let item=this.projectCategory.length>0?this.projectCategory[0]:null;
-                this.prjPrcessData[0].value=item && item.length>0?item[0].cnt:0;
-                this.prjPrcessData[1].value=item && item.length>1?item[1].cnt:0;
-                this.elKey++;
-            }); 
+            // this.$api.project.groupByProjectCategory(datas=>{
+            //     this.projectCategory=datas;                   
+            //     this.prjPrcessTotal=this.getPrjCateCount(0);
+            //     let item=this.projectCategory.length>0?this.projectCategory[0]:null;
+            //     this.prjPrcessData[0].value=item && item.length>0?item[0].cnt:0;
+            //     this.prjPrcessData[1].value=item && item.length>1?item[1].cnt:0;
+            //     this.elKey++;
+            // }); 
            
             this.localStorage = JSON.parse(localStorage.getItem("data1"))
 
@@ -541,7 +546,9 @@ export default {
             this.majorInterval = setInterval(this.timer, 5000);
             //正在发生 定时器
             this.warningInterval = setInterval(this.automaticRoll, 5000);
-            setInterval(this.getDeptWorksList, 60000);            
+            this.getJournalismList();
+            setInterval(this.getDeptWorksList, 600000);    
+            setInterval(this.getJournalismList, 600000);         
         },
         doPrjProcess(n, text) {
             this.prjProcessNav = n;
@@ -566,9 +573,6 @@ export default {
         //查询在岗人数
         getDeptWorksList(){
             let deptId = '';
-            // if (this.dept && this.dept.id != 0) {
-            //     deptId = this.dept.id;
-            // }
             if (this.infoNav == 0) {
                 //查询在岗人数
                 this.$api.attendance.getDeptWorksList(deptId).then(d => {
@@ -601,6 +605,16 @@ export default {
             });
             }
         },
+        //集团新闻列表
+        getJournalismList(){
+            //查询出勤人数
+            this.$api.journalism.getJournalismList().then(d => {
+                this.JournalismList = d.rows;
+            });
+        },
+        handJournalism(item){
+            this.$refs.journalismDlg.showDialog(item);
+        },
         //设备概况点击事件定时器方法
         overviewClick() {
             if (this.overview < 2) {