1

src/api/backend/comInfo.js

@@ -76,3 +76,11 @@ export function getselfComuser(data) {
     params: data,
   });
 }
+//    
+export function getNewsList(data) {
+  return request({
+    url: "/backend/com-info/list",
+    method: "get",
+    params: data,
+  });
+}

src/views/backend/comInfo/index.vue

@@ -42,14 +42,14 @@
       <el-table-column label="指令标题" align="center" prop="comTitle" />
       <el-table-column label="发布状态" align="center" prop="comStatus">
         <template slot-scope="{row}">
-          <div>{{ row.comStatus==1?'已发布':'未发布' }}</div>
+          <div>{{ row.comStatus == 1 ? '已发布' : '未发布' }}</div>
         </template>
       </el-table-column>
       <el-table-column label="指令内容" align="center">
-      <template slot-scope="scope">
-        <div v-html="scope.row.comContent"></div>
-      </template>
-    </el-table-column>
+        <template slot-scope="scope">
+          <div v-html="scope.row.comContent"></div>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="状态" align="center" prop="status">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
@@ -75,7 +75,7 @@
                 icon="el-icon-circle-check">已下达指令人员</el-dropdown-item>
               <el-dropdown-item command="handleOrg" size="mini" type="text"
                 icon="el-icon-circle-check">下达单位</el-dropdown-item>
-              <el-dropdown-item command="handPublish" size="mini" type="text" v-if="scope.row.comStatus==0"
+              <el-dropdown-item command="handPublish" size="mini" type="text" v-if="scope.row.comStatus == 0"
                 icon="el-icon-circle-check">发布</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
@@ -104,7 +104,7 @@
         <el-form-item label="附件id" prop="attId">
           <fileUpload v-model="form.attId" />
         </el-form-item>
-       
+
         <!-- <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status" style="width: 100%;">
             <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value"
@@ -146,11 +146,28 @@
         <el-button type="primary" @click="openSelectedOrg = false">关 闭</el-button>
       </div>
     </el-dialog>
+    <!-- 查看下达的单位 -->
+    <el-dialog title="下达单位" :visible.sync="downHouse" width="50%">
+      <!-- <el-button plain icon="el-icon-download" size="mini" @click="nowExcel" type="warning" style="margin-bottom: 10px;">导出</el-button> -->
+      <el-table :data="downList">
+        <el-table-column label="单位名称" align="center" prop="id" />
+        <el-table-column label="单位地址" align="center" prop="meetingId" />
+        <el-table-column label="是否已读" align="center" prop="ppName" />
+        <!-- <el-table-column label="参会人联系电话" align="center" prop="ppTel" width="200" />
+        <el-table-column label="参会人单位id" align="center" prop="orgId" />
+        <el-table-column label="参会人职务" align="center" prop="ppDuty" /> -->
+      </el-table>
+      <!-- <pagination v-show="totals > 0" :total="totals" page.sync="1" limit.sync="10" @pagination="getList" /> -->
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="downHouse = false">取 消</el-button>
+        <el-button type="primary" @click="downHouse = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { createComInfo, updateComInfo, deleteComInfo, getComInfo, getComInfoPage, exportComInfoExcel, broadCominfo, setupComuser } from "@/api/backend/comInfo"
+import { createComInfo, updateComInfo, deleteComInfo, getComInfo, getComInfoPage, exportComInfoExcel, broadCominfo, setupComuser, getselfComuser,getNewsList } from "@/api/backend/comInfo"
 import Editor from '@/components/Editor'
 import { DICT_TYPE, getDictDatas } from "@/utils/dict";
 import choiceSelect from '@/components/choiceSelect';
@@ -195,8 +212,8 @@ export default {
       // 表单校验
       rules: {
         status: [{ required: true, message: "状态不能为空", trigger: "blur" }],
-        comTitle:[{ required: true, message: "请输入指令标题", trigger: "blur" }],
-        comType:[{ required: true, message: "请输入指令类型", trigger: "blur" }],
+        comTitle: [{ required: true, message: "请输入指令标题", trigger: "blur" }],
+        comType: [{ required: true, message: "请输入指令类型", trigger: "blur" }],
       },
       // =======单位信息==========================
       // 是否显示弹出层（分管单位）
@@ -208,6 +225,9 @@ export default {
       // 已选择单位
       openSelectedOrg: false,
       orgType: undefined,
+      downHouse: false,//查看人员
+      totals: 0,
+      downList:[]
     }
   },
   mounted() {
@@ -449,8 +469,12 @@ export default {
         });
       }
     },
-    lookMes(row){
-      console.log(row,'565');
+    lookMes(row) {
+      getNewsList({ ids: row.id }).then(res => {
+        console.log(res.data[0].comBroadDOList, '111');
+        this.downList = res.data[0].comBroadDOList
+        this.downHouse = true
+      })
     }
   },
 }

src/views/backend/meeting/index.vue

@@ -184,6 +184,7 @@
     </el-dialog>
     <!-- 查看会议人员 -->
     <el-dialog title="会议人员" :visible.sync="meetPeopleModal" width="60%">
+      <el-button plain icon="el-icon-download" size="mini" @click="nowExcel" type="warning" style="margin-bottom: 10px;">导出</el-button>
       <el-table :data="meetPeople">
         <el-table-column label="ID" align="center" prop="id" />
         <el-table-column label="所属会议" align="center" prop="meetingId" />
@@ -203,7 +204,6 @@
           </template>
         </el-table-column> -->
       </el-table>
-      <el-button type="text" plain icon="el-icon-download" size="mini" @click="nowExcel" style="margin-left: 800px;">导出</el-button>
       <pagination v-show="total > 0" :total="total" page.sync="1" limit.sync="10" @pagination="getList" />
       <span slot="footer" class="dialog-footer">
         <el-button @click="meetPeopleModal = false">取 消</el-button>

src/views/unitorg/microStation/index.vue

@@ -11,8 +11,8 @@
             @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="建站日期" prop="builtOn">
-          <el-date-picker v-model="queryParams.builtOn" style="width: 240px" value-format="yyyy-MM-dd"
-            type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          <el-date-picker v-model="queryParams.builtOn" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+            range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
             :default-time="['00:00:00', '23:59:59']" />
           <!-- <el-date-picker clearable v-model="queryParams.builtOn" type="date" value-format="yyyy-MM-dd"
             placeholder="建站日期" /> -->
@@ -124,8 +124,8 @@
             </el-form-item>
           </el-col>
           <!-- <el-col :span="5"> -->
-            <!-- <el-button type="primary" size="small" @click="addNewPeople">新增人员</el-button> -->
-            <!-- <el-button type="primary" size="small" @click="submitFormBut">提交新人员</el-button> -->
+          <!-- <el-button type="primary" size="small" @click="addNewPeople">新增人员</el-button> -->
+          <!-- <el-button type="primary" size="small" @click="submitFormBut">提交新人员</el-button> -->
           <!-- </el-col> -->
           <el-col :span="11">
             <el-form-item label="报警电话" prop="alarmTel">
@@ -203,9 +203,9 @@
         </el-table-column>
         <el-table-column prop="idcardno" label="身份证" width="220">
         </el-table-column>
-        <el-table-column prop="mobile" label="电话号" width="300">
+        <el-table-column prop="mobile" label="电话号" width="180">
         </el-table-column>
-        <el-table-column fixed="right" label="操作">
+        <el-table-column fixed="right" label="操作" width="180">
           <template slot-scope="scope">
             <el-button @click="editPeople(scope.row)" type="text" size="small">编辑</el-button>
             <el-button type="text" size="small" @click="delPeople(scope.row)">删除</el-button>
@@ -250,6 +250,15 @@
         <el-button type="primary" @click="insideSure">确 定</el-button>
       </span>
     </el-dialog>
+    <!-- 确认删除对话框 -->
+    <el-dialog title="提示" :visible.sync="delModals" width="30%">
+      <i class="el-icon-warning" style="color: orange;"></i>
+      <span>确认删除该段信息？</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="delModals = false">取 消</el-button>
+        <el-button type="primary" @click="makeDelThis">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -318,6 +327,8 @@ export default {
       idcardRule: false,
       phoneRule: false,
       firestationid: "",
+      delPeopleId: "",
+      delModals: false,//确认删除模态框
     }
   },
   props: ["orgId"],
@@ -539,7 +550,12 @@ export default {
       this.lookFirePeople = false
     },
     delPeople(row) {
-      delFirePeople(row.id).then(res => {
+      this.delPeopleId = row.id
+      this.delModals = true
+      // this.lookFirePeople = false
+    },
+    makeDelThis() {
+      delFirePeople(this.delPeopleId).then(res => {
         if (res.data) {
           this.$message({
             message: '删除成功',
@@ -548,13 +564,11 @@ export default {
           getAllPeople({ pageNo: 1, pageSize: 10, microstationid: this.firestationid }).then(res => {
             this.firePeople = res.data.list
           })
+          this.delModals = false
         }
       })
-      // this.lookFirePeople = false
-
     },
     editPeople(row) {
-      // console.log(row, 'inside');
       this.insideForm.name = row.empName
       this.insideForm.idcard = row.idcardno
       this.insideForm.phone = row.mobile