覆盖测试

src/api/system/meeting/index.js

@@ -12,4 +12,11 @@ export function getmetmes(data) {
         method: 'get',
         params: data
     })
+}
+export function getmetid(data) {
+    return request({
+        url: '/backend/meeting/getmeetingorg',
+        method: 'get',
+        params: data
+    })
 }

src/components/handleSelectedOrg/index.vue

@@ -10,6 +10,11 @@
             <el-table-column label="部门" align="center" key="deptName" prop="dept.name" v-if="columns[3].visible"
                 :show-overflow-tooltip="true" />
             <el-table-column label="手机号码" align="center" key="mobile" prop="mobile" v-if="columns[4].visible" width="120" />
+            <el-table-column label="是否已读" width="120">
+                <template slot-scope="scope">
+                    <span>{{ scope.row.is_read === 1?'已读':'未读' }}</span>
+                </template>
+            </el-table-column>
         </el-table>
         <!-- 列表 -->
         <el-table v-loading="loading" :data="orgList" @row-click="tableRowClick" height="50vh" v-else>

src/layout/components/Sidebar/Logo.vue

@@ -66,8 +66,8 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 43px;
-      height: 43px;
+      width: 32px;
+      height: 32px;
       vertical-align: middle;
       margin-right: 12px;
     }
@@ -78,7 +78,7 @@ export default {
       color: #fff;
       font-weight: 600;
       line-height: 50px;
-      font-size: 17px;
+      font-size: 14px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
     }

src/views/backend/zlgztzs/index.vue

@@ -118,7 +118,7 @@
       </el-form-item>
       <el-form-item label="火灾时间" prop="hzTime">
         <el-date-picker v-model="queryParams.hzTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
-                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" sortable/>
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="火灾yh" prop="hzyh">
         <el-input v-model="queryParams.hzyh" placeholder="请输入火灾yh" clearable @keyup.enter.native="handleQuery"/>

src/views/index.vue

@@ -2,7 +2,6 @@
   <div class="dashboard-editor-container">
     <!-- <img src="../../static/20230321180755.png" alt="" style="width:100%;heighr:100%"> -->
     <div>
-     
       <panel-group @handleSetLineChartData="handleSetLineChartData" />
       <el-row :gutter="20">
         <el-col
@@ -206,22 +205,12 @@
       append-to-body
       class="details"
     >
-      <el-button
-        size="mini"
-        type="primary"
-        plain
-        @click="handleDeatailWei"
-        style="margin-bottom: 10px"
-        >未上传</el-button
-      >
-      <el-button
-        size="mini"
-        type="success"
-        plain
-        @click="handleDeatailYi"
-        style="margin-bottom: 10px"
-        >已上传</el-button
-      >
+        <el-button size="mini" type="primary" plain @click="handleDeatailWei" style="margin-bottom: 10px;"
+          >未上传</el-button
+        >
+        <el-button size="mini" type="success" plain @click="handleDeatailYi"  style="margin-bottom: 10px;"
+          >已上传</el-button
+        >
       <el-table
         highlight-current-row
         v-loading="loading"
@@ -628,7 +617,7 @@ export default {
   border: 1px solid #01b0e3;
   color: #01b0e3;
 }
-::v-deep .el-dialog__body {
+::v-deep .el-dialog__body{
   padding: 10px;
 }
 </style>

src/views/system/mettingin/mettingin.vue

@@ -2,10 +2,10 @@
     <div>
         <div class="tableBox">
             <el-table :data="tableList" border style="width: 100%">
-                <el-table-column label="会议名称" width="150">
-                    <template slot-scope="scope">
+                <el-table-column prop="meetingName" label="会议名称" width="150">
+                    <!-- <template slot-scope="scope">
                         <el-tag @click="meetClick(scope.row)">{{ scope.row.meetingName }}</el-tag>
-                    </template>
+                    </template> -->
                 </el-table-column>
                 <el-table-column prop="meetingStartTime" label="会议开始时间" width="150">
                 </el-table-column>
@@ -19,8 +19,9 @@
                 </el-table-column>
                 <el-table-column fixed="right" label="操作" width="200">
                     <template slot-scope="scope">
-                        <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button>
-                        <el-button type="text" size="small">编辑</el-button>
+                        <el-button @click="meetClick(scope.row)" type="text" size="small">查看</el-button>
+                        <el-button type="text" size="small">发布</el-button>
+                        <!-- <el-button type="text" size="small" @click="goOn(scope.row)">编辑</el-button> -->
                     </template>
                 </el-table-column>
             </el-table>
@@ -34,7 +35,11 @@
                         <span>参会人员:</span>
                         <span>{{ item.meetingEmps ? item.meetingEmps : "暂无参会人员" }}</span><br>
                         <span>参会状态:</span>
-                        <span>{{ item.state?"已报名":'未报名' }}</span>
+                        <span>{{ item.state ? "已报名" : '未报名' }}</span>
+                    </div>
+                    <div v-for="(param,index) of listMeet">
+                        <span>需要签到的单位:</span>
+                        <span>{{ param.orgName ? param.orgName : "暂无信息" }}</span><br>
                     </div>
                 </div>
                 <span slot="footer" class="dialog-footer">
@@ -47,13 +52,14 @@
 </template>
 
 <script>
-import { getAllMet, getmetmes } from '../../../api/system/meeting/index'
+import { getAllMet, getmetmes, getmetid } from '../../../api/system/meeting/index'
 export default {
     data() {
         return {
             tableList: [],//整个表格信息
             listMes: [],//会议详细信息
             listModal: false,//会议人员模态框的开关
+            listMeet: [],
         }
     },
     methods: {
@@ -69,8 +75,14 @@ export default {
             getmetmes({ id: row.id, pageNo: 1, pageSize: 10 }).then(res => {
                 this.listMes = res.data.meetingDetailRespVOS
             })
+            getmetid({ meetingId: row.id, pageNo: 1, pageSize: 10 }).then(res => {
+                this.listMeet = res.data.list
+            })
             this.listModal = true
         },
+        goOn(row) {
+            console.log(row, '123');
+        }
     },
     components: {
     },