合并子分支

.env.dev

@@ -5,7 +5,11 @@ ENV = 'development'
 VUE_APP_TITLE = 消防安全公共服务平台
 
 # # 芋道管理系统/开发环境
+<<<<<<< HEAD
 #VUE_APP_BASE_API = 'http://localhost:48081'
+=======
+# VUE_APP_BASE_API = 'http://localhost:48081'
+>>>>>>> liyangzheng
 VUE_APP_BASE_API = 'http://api-security.byants.com'
 # VUE_APP_BASE_API = 'http://192.168.1.16:48081'
 # 根据服务器或域名修改

src/api/backend/meeting.js

@@ -27,10 +27,11 @@ export function deleteMeeting(id) {
 }
 
 // 获得会议信息
-export function getMeeting(id) {
+export function getMeeting(data) {
   return request({
-    url: "/backend/meeting/get?id=" + id,
+    url: "/backend/meeting/get",
     method: "get",
+    params:data
   });
 }
 
@@ -76,3 +77,11 @@ export function setupMeetingOrg(data) {
     data: data,
   });
 }
+export function getMeetPeople(data) {
+  return request({
+    url: "/backend/meeting-participants/page",
+    method: "get",
+    params: data,
+  });
+}
+

src/views/backend/comInfo/index.vue

@@ -40,7 +40,7 @@
     <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'">
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="指令标题" align="center" prop="comTitle" />
-      <el-table-column label="指令标题" align="center" prop="comStatus">
+      <el-table-column label="指令内容" align="center" prop="comStatus">
         <template slot-scope="{row}">
           <div>{{ row.comStatus==1?'已发布':'未发布' }}</div>
         </template>
@@ -60,7 +60,7 @@
           <dict-tag :type="DICT_TYPE.INSPECTITEM_TYPE" :value="scope.row.comType" />
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="140">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['backend:com-info:update']">修改</el-button>
@@ -79,6 +79,7 @@
                 icon="el-icon-circle-check">发布</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
+          <el-button size="mini" type="text" icon="el-icon-help" @click="lookMes(scope.row)">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -448,6 +449,9 @@ export default {
         });
       }
     },
+    lookMes(row){
+      console.log(row,'565');
+    }
   },
 }
 </script>

src/views/backend/meeting/index.vue

@@ -79,7 +79,7 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="140">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['backend:meeting:update']">修改</el-button>
@@ -87,6 +87,7 @@
                 v-hasPermi="['backend:meeting:delete']">删除</el-button> -->
           <el-dropdown @command="(command) => handleCommand(command, scope.$index, scope.row)">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
+
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleDelete" size="mini" type="text" icon="el-icon-delete"
                 v-hasPermi="['backend:meeting:delete']">删除</el-dropdown-item>
@@ -98,6 +99,7 @@
                 icon="el-icon-circle-check">发布</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
+          <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="lookMes(scope.row)">查看详情</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -171,12 +173,25 @@
         <el-button type="primary" @click="openSelectedOrg = false">关 闭</el-button>
       </div>
     </el-dialog>
+    <!-- 查看会议人员 -->
+    <el-dialog title="提示" :visible.sync="meetPeopleModal" width="30%">
+      <el-table :data="meetPeople" style="width: 100%">
+        <el-table-column prop="ppName" label="姓名" width="180">
+        </el-table-column>
+        <el-table-column prop="ppTel" label="电话号">
+        </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="meetPeopleModal = false">取 消</el-button>
+        <el-button type="primary" @click="meetPeopleModal = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 
-import { createMeeting, updateMeeting, deleteMeeting, getMeeting, getMeetingPage, exportMeetingExcel, getmeetingorg, broadMeeting, setupMeetingOrg } from "@/api/backend/meeting"
+import { createMeeting, updateMeeting, deleteMeeting, getMeeting, getMeetingPage, exportMeetingExcel, getmeetingorg, broadMeeting, setupMeetingOrg, getMeetPeople } from "@/api/backend/meeting"
 import choiceSelect from '@/components/choiceSelect';
 import handleSelectedOrg from '@/components/handleSelectedOrg';
 import { getTableHeight } from "@/utils/ruoyi.js";
@@ -211,7 +226,7 @@ export default {
         // meetingEndTime: [],
         meetingStartTime: '',
         meetingEndTime: '',
-        meetingStartTimes:[],
+        meetingStartTimes: [],
         meetingSubject: null,
         meetingType: null,
         status: null,
@@ -238,6 +253,8 @@ export default {
       tableHeight: "",
       // 已选择单位
       openSelectedOrg: false,
+      meetPeople: [],//会议所属人员
+      meetPeopleModal:false
     }
   },
   mounted() {
@@ -338,13 +355,13 @@ export default {
       this.reset()
       const id = row.id
 
-      getMeeting(id).then(response => {
+      getMeeting({ id: id, pageNo: 1, pageSize: 10 }).then(response => {
         this.form = response.data
-        const arr=[]
+        const arr = []
         arr.push(this.form.meetingStartTime, this.form.meetingEndTime)
         //this.form.meetingStartTimes=[...arr]
-        this.$set(this.form,'meetingStartTimes',arr)
-        console.log( this.form.meetingStartTimes,'this.form.meetingStartTimes arr arr');
+        this.$set(this.form, 'meetingStartTimes', arr)
+        console.log(this.form.meetingStartTimes, 'this.form.meetingStartTimes arr arr');
         this.open = true
         this.title = "修改会议信息"
       })
@@ -491,6 +508,17 @@ export default {
         });
       }
     },
+    lookMes(row) {
+      // console.log(row,'5');s
+      getMeetPeople({
+        meetingId: row.id,
+        pageNo: 1,
+        pageSize: 10
+      }).then(res => {
+        this.meetPeople = res.data.list
+        this.meetPeopleModal = true
+      })
+    }
   },
 }
 </script>

src/views/unitorg/microStation/index.vue

@@ -114,16 +114,16 @@
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="6">
+          <el-col :span="11">
             <el-form-item label="负责人（站长）" prop="charger">
               <el-input v-model="form.charger" placeholder="请输入负责人（站长）" />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <!-- <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-col>
-          <el-col :span="9">
+          <!-- </el-col> -->
+          <el-col :span="11">
             <el-form-item label="报警电话" prop="alarmTel">
               <el-input v-model="form.alarmTel" placeholder="请输入报警电话" />
             </el-form-item></el-col>
@@ -216,21 +216,24 @@
     <el-dialog title="编辑人员" :visible.sync="insideModal" width="50%">
       <el-form ref="form" :model="insideForm" label-width="80px">
         <el-form-item label="姓名">
-          <el-input v-model="insideForm.name"></el-input>
+          <el-input v-model="insideForm.name" @blur="nameBlur"></el-input>
+          <span v-if="nameRule" style="color: red;font-size: 12px;">名字不能为空</span>
         </el-form-item>
         <el-form-item label="人员类型">
           <!-- <el-input v-model="insideForm.type"></el-input> -->
           <el-select v-model="insideForm.type" placeholder="请选择">
-            <el-option key="0" label="普通人员" value="0"/>
-            <el-option key="1" label="值班人员" value="1"/>
-            <el-option key="2" label="站长" value="2"/>
+            <el-option key="0" label="普通人员" value="0" />
+            <el-option key="1" label="值班人员" value="1" />
+            <el-option key="2" label="站长" value="2" />
           </el-select>
         </el-form-item>
         <el-form-item label="身份证">
-          <el-input v-model="insideForm.idcard"></el-input>
+          <el-input v-model="insideForm.idcard" @blur="idcardBlur"></el-input>
+          <span v-if="idcardRule" style="color: red;font-size: 12px;">身份证号有误</span>
         </el-form-item>
         <el-form-item label="电话号">
-          <el-input v-model="insideForm.phone"></el-input>
+          <el-input v-model="insideForm.phone" @blur="phoneBlur"></el-input>
+          <span v-if="phoneRule" style="color: red;font-size: 12px;">电话号有误</span>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -300,7 +303,11 @@ export default {
         idcard: "",
         phone: ""
       },
-      insideUpdateId:'',
+      insideUpdateId: '',
+      nameRule: false,
+      idcardRule: false,
+      phoneRule: false,
+      firestationid: "",
     }
   },
   props: ["orgId"],
@@ -508,13 +515,14 @@ export default {
       // 执行其他操作，如提交表单
     },
     searchAllPeople(row) {
+      this.firestationid = row.id
       getAllPeople({ pageNo: 1, pageSize: 10, microstationid: row.id }).then(res => {
         this.firePeople = res.data.list
       })
       this.lookFirePeople = true
     },
     makeSureFire() {
-
+      this.lookFirePeople = false
     },
     delPeople(row) {
       delFirePeople(row.id).then(res => {
@@ -523,12 +531,16 @@ export default {
             message: '删除成功',
             type: 'success'
           });
+          getAllPeople({ pageNo: 1, pageSize: 10, microstationid: this.firestationid }).then(res => {
+            this.firePeople = res.data.list
+          })
         }
       })
-      this.lookFirePeople = false
+      // this.lookFirePeople = false
+
     },
     editPeople(row) {
-      console.log(row, 'inside');
+      // console.log(row, 'inside');
       this.insideForm.name = row.empName
       this.insideForm.idcard = row.idcardno
       this.insideForm.phone = row.mobile
@@ -537,7 +549,52 @@ export default {
       this.insideModal = true
     },
     insideSure() {
-      // editFirePeople({id:this.insideUpdateId,empName:this.insideForm.name})
+      if (!(this.nameRule || this.phoneRule || this.idcardRule)) {
+        // 当 nameRule、phoneRule 和 idcardRule 都为 false 时，执行这里的代码
+        editFirePeople({ id: this.insideUpdateId, empName: this.insideForm.name, empType: this.insideForm.type, idcardno: this.insideForm.idcard, mobile: this.insideForm.phone }).then(res => {
+          // console.log(res,'update');
+          if (res.data) {
+            this.$message({
+              message: '修改成功',
+              type: 'success'
+            });
+            this.insideModal = false
+            this.lookFirePeople = false
+          }
+        })
+      } else {
+        this.$message({
+          message: '请检查表单项',
+          type: 'error'
+        });
+      }
+
+
+
+    },
+    nameBlur() {
+      if (this.insideForm.name === '') {
+        this.nameRule = true
+      } else {
+        this.nameRule = false
+      }
+    },
+    idcardBlur() {
+      const idCardRegex = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}[\dXx]$/;
+      if (idCardRegex.test(this.insideForm.idcard)) {
+        this.idcardRule = false
+      } else {
+        this.idcardRule = true
+      }
+    },
+    phoneBlur() {
+      console.log(211);
+      const phoneRegex = /^1[3456789]\d{9}$/;
+      if (phoneRegex.test(this.insideForm.phone)) {
+        this.phoneRule = false
+      } else {
+        this.phoneRule = true
+      }
     }
   }
 }