Merge remote-tracking branch 'origin/dev_officer'

# Conflicts:
#	src/views/threePreventionResponsiblePerson/editPersonInformation.vue
#	src/views/threePreventionResponsiblePerson/index.vue
#	src/views/threePreventionResponsiblePerson/organizationalStructure.vue

src/router/routes.ts

@@ -388,6 +388,31 @@ export const constantRoutes: Array<RouteRecordRaw> = [
       title: "任务消息详情",
       noCache: true
     }
+  },
+  {
+    path: "/common",
+    name: "Common",
+    component: Layout,
+    children: [
+      {
+        path: "duty",
+        name: "Duty",
+        component: () => import("@/views/duty/index.vue"),
+        meta: {
+          title: "值班管理",
+          noCache: true
+        }
+      },
+      {
+        path: "rollCallRecord2",
+        name: "rollCallRecord2",
+        component: () => import("@/views/onlineRollCall/rollCallRecord2.vue"),
+        meta: {
+          title: "点名记录",
+          noCache: true
+        }
+      }
+    ]
   }
 ];
 
@@ -530,7 +555,8 @@ export const leaderRoute: Array<RouteRecordRaw> = [
       {
         path: "earthquakeRapidReport",
         name: "EarthquakeRapidReport",
-        component: () => import("@/views/disasterRiskMonitor/earthquakeRapidReport/index.vue"),
+        component: () =>
+          import("@/views/disasterRiskMonitor/earthquakeRapidReport/index.vue"),
         meta: {
           title: "地震速报",
           noCache: true
@@ -539,7 +565,10 @@ export const leaderRoute: Array<RouteRecordRaw> = [
       {
         path: "EarthquakeRapidReportDetails",
         name: "EarthquakeRapidReportDetails",
-        component: () => import("@/views/disasterRiskMonitor/earthquakeRapidReport/earthquakeRapidReportDetail.vue"),
+        component: () =>
+          import(
+            "@/views/disasterRiskMonitor/earthquakeRapidReport/earthquakeRapidReportDetail.vue"
+          ),
         meta: {
           title: "地震速报",
           noCache: true
@@ -579,7 +608,7 @@ export const leaderRoute: Array<RouteRecordRaw> = [
         path: "cadreinformation",
         name: "CadreInformation",
         component: () =>
-            import("@/views/disasterRiskMonitor/cadreInformation.vue"),
+          import("@/views/disasterRiskMonitor/cadreInformation.vue"),
         meta: {
           title: "应急干部",
           noCache: true
@@ -648,24 +677,6 @@ export const workerRoute = [
           title: "数据管理"
         }
       },
-      {
-        path: "duty",
-        name: "Duty",
-        component: () => import("@/views/duty/index.vue"),
-        meta: {
-          title: "值班管理",
-          noCache: true
-        }
-      },
-      {
-        path: "rollCallRecord2",
-        name: "rollCallRecord2",
-        component: () => import("@/views/onlineRollCall/rollCallRecord2.vue"),
-        meta: {
-          title: "点名记录",
-          noCache: true
-        }
-      },
       {
         path: "my",
         name: "My",

src/views/InformationReception/index.vue

@@ -19,10 +19,15 @@
         :options="opt_info_type"
         @change="change_info_type"
       />
-      <van-dropdown-item title="时间" ref="timeRef">
-        <van-picker-group title='发布时间' :tabs="['开始日期', '结束日期']" @confirm="onConfirmTime" @cancel="onCancelTime">
-          <van-date-picker v-model="queryParams.begin_time"/>
-          <van-date-picker v-model="queryParams.end_time"/>
+      <van-dropdown-item ref="timeRef" title="时间">
+        <van-picker-group
+          title="发布时间"
+          :tabs="['开始日期', '结束日期']"
+          @confirm="onConfirmTime"
+          @cancel="onCancelTime"
+        >
+          <van-date-picker v-model="queryParams.begin_time" />
+          <van-date-picker v-model="queryParams.end_time" />
         </van-picker-group>
       </van-dropdown-item>
       <van-dropdown-item
@@ -48,92 +53,105 @@
         class="event-list-item"
         @click="handleInfo(item)"
       >
-          <div class="item-title">
-            <div :class="['info_type', get_info_type_color(item.msg_type)]">
-              {{ item.msg_type }}
-            </div>
-            <div class="item-title-text">{{ item.title }}</div>
+        <div class="item-title">
+          <div :class="['info_type', get_info_type_color(item.msg_type)]">
+            {{ item.msg_type }}
           </div>
-          <!--预案通知-->
-          <div v-if="item.msg_type === '预案通知'" class="item-content">
-            <div class="line-item">
-              <div class="item-label">预案名称：</div>
-              <div class="item-value">{{ item.detail.plan_name }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">响应级别：</div>
-              <div class="item-value">{{ item.detail.response_level }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">发布时间：</div>
-              <div class="item-value">{{ item.detail.sent_time }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">任务内容：</div>
-              <div class="item-value">{{ item.detail.yzy_content || "暂无内容" }}</div>
-            </div>
+          <div class="item-title-text">{{ item.title }}</div>
+        </div>
+        <!--预案通知-->
+        <div v-if="item.msg_type === '预案通知'" class="item-content">
+          <div class="line-item">
+            <div class="item-label">预案名称：</div>
+            <div class="item-value">{{ item.detail.plan_name }}</div>
           </div>
-          <!-- 事件接报 -->
-          <div v-else-if="item.msg_type === '事件接报'" class="item-content">
-            <div class="line-item">
-              <div class="item-label">事件名称：</div>
-              <div class="item-value">{{ item.detail.event_title }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">事件等级：</div>
-              <div class="item-value">{{ item.detail.event_level }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">发生时间：</div>
-              <div class="item-value">{{ item.detail.event_time }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">事发地点：</div>
-              <div class="item-value">{{ item.detail.address }}</div>
-            </div>
+          <div class="line-item">
+            <div class="item-label">响应级别：</div>
+            <div class="item-value">{{ item.detail.response_level }}</div>
           </div>
-          <!-- 任务消息 -->
-          <div v-else-if="item.msg_type === '任务消息'" class="item-content">
-            <div class="line-item">
-              <div class="item-label">事件名称：</div>
-              <div class="item-value">{{ item.detail.event_title }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">发布时间：</div>
-              <div class="item-value">{{ item.detail.creation_time }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">任务内容：</div>
-              <div class="item-value">{{ item.detail.task_description }}</div>
-            </div>
+          <div class="line-item">
+            <div class="item-label">发布时间：</div>
+            <div class="item-value">{{ item.detail.sent_time }}</div>
           </div>
-          <!-- 在线点名 -->
-          <div v-else-if="item.msg_type === '在线点名'" class="item-content">
-            <div class="line-item">
-              {{ item.detail.call_title }}
-            </div>
-            <div class="line-item">
-              <div class="item-label">发送时间：</div>
-              <div class="item-value">{{ item.detail.create_time }}</div>
+          <div class="line-item">
+            <div class="item-label">任务内容：</div>
+            <div class="item-value">
+              {{ item.detail.yzy_content || "暂无内容" }}
             </div>
           </div>
-          <!-- 信息发布 -->
-          <div v-else-if="['预警信息', '灾情信息', '灾情信息', '指挥救援', '公众防范'].includes(item.msg_type)" class="item-content">
-            <div class="line-item">
-              <div class="item-label">发布时间：</div>
-              <div class="item-value">{{ item.recv_time }}</div>
-            </div>
-            <div class="line-item">
-              <div class="item-label">任务内容：</div>
-              <div class="item-value">{{ item.content }}</div>
-            </div>
+        </div>
+        <!-- 事件接报 -->
+        <div v-else-if="item.msg_type === '事件接报'" class="item-content">
+          <div class="line-item">
+            <div class="item-label">事件名称：</div>
+            <div class="item-value">{{ item.detail.event_title }}</div>
+          </div>
+          <div class="line-item">
+            <div class="item-label">事件等级：</div>
+            <div class="item-value">{{ item.detail.event_level }}</div>
+          </div>
+          <div class="line-item">
+            <div class="item-label">发生时间：</div>
+            <div class="item-value">{{ item.detail.event_time }}</div>
+          </div>
+          <div class="line-item">
+            <div class="item-label">事发地点：</div>
+            <div class="item-value">{{ item.detail.address }}</div>
+          </div>
+        </div>
+        <!-- 任务消息 -->
+        <div v-else-if="item.msg_type === '任务消息'" class="item-content">
+          <div class="line-item">
+            <div class="item-label">事件名称：</div>
+            <div class="item-value">{{ item.detail.event_title }}</div>
+          </div>
+          <div class="line-item">
+            <div class="item-label">发布时间：</div>
+            <div class="item-value">{{ item.detail.creation_time }}</div>
           </div>
+          <div class="line-item">
+            <div class="item-label">任务内容：</div>
+            <div class="item-value">{{ item.detail.task_description }}</div>
+          </div>
+        </div>
+        <!-- 在线点名 -->
+        <div v-else-if="item.msg_type === '在线点名'" class="item-content">
+          <div class="line-item">
+            {{ item.detail.call_title }}
+          </div>
+          <div class="line-item">
+            <div class="item-label">发送时间：</div>
+            <div class="item-value">{{ item.detail.create_time }}</div>
+          </div>
+        </div>
+        <!-- 信息发布 -->
+        <div
+          v-else-if="
+            [
+              '预警信息',
+              '灾情信息',
+              '灾情信息',
+              '指挥救援',
+              '公众防范'
+            ].includes(item.msg_type)
+          "
+          class="item-content"
+        >
+          <div class="line-item">
+            <div class="item-label">发布时间：</div>
+            <div class="item-value">{{ item.recv_time }}</div>
+          </div>
+          <div class="line-item">
+            <div class="item-label">任务内容：</div>
+            <div class="item-value">{{ item.content }}</div>
+          </div>
+        </div>
 
-          <div v-else class="item-content">
-            <div class="line-item">
-              {{ item.content }}
-            </div>
+        <div v-else class="item-content">
+          <div class="line-item">
+            {{ item.content }}
           </div>
+        </div>
       </div>
     </van-list>
   </div>
@@ -158,7 +176,7 @@ const opt_info_type = [
   { text: "隐患巡查", value: "隐患巡查" },
   { text: "风险排查", value: "风险排查" },
   { text: "数据采集", value: "数据采集" },
-  
+
   { text: "预警信息", value: "预警信息" },
   { text: "灾情信息", value: "灾情信息" },
   { text: "处置信息", value: "处置信息" },
@@ -175,25 +193,26 @@ const opt_info_order = [
   { text: "降序", value: "desc" }
 ];
 
-const get_info_type_color = (val) => {
-  if(val == "任务消息") {
-    return "info_type_2"
-  }
-  else if(['预警信息', '灾情信息', '灾情信息', '指挥救援', '公众防范'].includes(val)) {
-    return "info_type_3"
+const get_info_type_color = val => {
+  if (val == "任务消息") {
+    return "info_type_2";
+  } else if (
+    ["预警信息", "灾情信息", "灾情信息", "指挥救援", "公众防范"].includes(val)
+  ) {
+    return "info_type_3";
   }
-  return "info_type_0"
-}
+  return "info_type_0";
+};
 
 const onConfirmTime = () => {
   timeRef.value.toggle();
   queryParams.value.page = 0;
   getList();
-}
+};
 
 const onCancelTime = () => {
   timeRef.value.toggle();
-}
+};
 
 const timeRef = ref(null);
 const info_list = ref([]);
@@ -206,8 +225,8 @@ const queryParams = ref({
   page: 0,
   page_size: 5,
   info_type: "",
-  begin_time: dayjs().add(-3, 'month').format('YYYY-MM-DD').split("-"),
-  end_time: dayjs().format('YYYY-MM-DD').split("-"),
+  begin_time: dayjs().add(-3, "month").format("YYYY-MM-DD").split("-"),
+  end_time: dayjs().format("YYYY-MM-DD").split("-"),
   event_level: "",
   info_order: "desc",
   search_keyword: ""
@@ -235,16 +254,21 @@ const change_info_order = () => {
   getList();
 };
 
-const handleInfo = (item) => {
-  // router.push("/infoDetails?id=" + item.id);
-  router.push(item.detail.detail_url);
-}
+const handleInfo = item => {
+  if (item.msg_type === "值班消息") {
+    router.push({ name: "Duty" });
+  } else if (item.msg_type === "在线点名") {
+    router.push({ name: "rollCallRecord2" });
+  } else {
+    router.push(item.detail.detail_url);
+  }
+};
 
 const getList = () => {
   queryParams.value.page++;
   let params = queryParams.value;
-  params['begin_time_s'] = params.begin_time.join("-");
-  params['end_time_s'] = params.end_time.join("-");
+  params["begin_time_s"] = params.begin_time.join("-");
+  params["end_time_s"] = params.end_time.join("-");
   // console.log('params:', queryParams.value, params);
   MsgCenterList(params)
     .then(res => {
@@ -305,25 +329,25 @@ const getList = () => {
     padding: 0 12px 8px 90px;
     .item-title-text {
       font-size: 16px;
-      color: #414F64;
+      color: #414f64;
       font-weight: bold;
     }
 
     .info_type {
       font-size: 14px;
       padding: 3px 10px;
-      color:#fff;
+      color: #fff;
       position: absolute;
       top: 0;
       left: 0;
     }
 
     .info_type_0 {
-      background: #FFAF00;
+      background: #ffaf00;
     }
 
     .info_type_1 {
-      background: #FF1818;
+      background: #ff1818;
     }
 
     .info_type_2 {
@@ -331,17 +355,17 @@ const getList = () => {
     }
 
     .info_type_3 {
-      background: #FF9F9F;
+      background: #ff9f9f;
     }
 
     .info_type_4 {
-      background: #A4D3FF;
+      background: #a4d3ff;
     }
   }
   .item-content {
-      padding: 0 12px 12px;
-      font-size: 14px;
-      color: #414f64;
+    padding: 0 12px 12px;
+    font-size: 14px;
+    color: #414f64;
     .line-item {
       display: flex;
       padding: 3px 0;

src/views/threePreventionResponsiblePerson/editPersonInformation.vue

@@ -197,6 +197,11 @@ const rules = reactive({
   type_list: [{ required: true, message: "请选择责任类别" }]
 });
 
+const props = defineProps({
+  isShowStructure: Boolean
+});
+const emits = defineEmits(["confirm"]);
+
 let showPicker = ref(false);
 const handleSelect = data => {
   form.value.area_name = data.length > 0 ? data[data.length - 1].label : "";
@@ -258,6 +263,7 @@ const onSubmit = () => {
     .then(() => {
       showSuccessToast("提交成功");
       getInfo();
+      emits("confirm");
     })
     .finally(() => {
       submitting.value = false;

src/views/threePreventionResponsiblePerson/index.vue

@@ -10,14 +10,14 @@
     <div class="select-box">
       <div class="adress-box" @click="showStructure">
         <div class="blue-rectangle" />
-        <div v-if="!!requestParameters.checkedId" class="block1">
+        <div class="block1" v-if="!!requestParameters.area_code">
           <div>{{ upOneLevel }}</div>
-          <div style="margin: 0 5px">{{ ">" }}</div>
+          <div style="margin: 0 5px">{{ '>' }}</div>
           <div style="color: #1d92ff">{{ adressContent }}</div>
         </div>
-        <div v-else class="block1">
+        <div class="block1" v-else>
           <div>广东省</div>
-          <div style="margin: 0 5px">{{ ">" }}</div>
+          <div style="margin: 0 5px">{{ '>' }}</div>
           <div style="color: #1d92ff">茂名市</div>
         </div>
       </div>
@@ -27,7 +27,7 @@
           is-link
           readonly
           placeholder="选择类型"
-          style="width: 122px"
+          class="choose"
           @click="showPicker = true"
         />
         <van-popup
@@ -55,7 +55,7 @@
       finished-text="没有更多了"
       @load="onLoad"
     >
-      <div v-for="(item, index) in persons" :key="item.id">
+      <div v-for="(item,index) in persons" :key="item.id">
         <div class="person-box" @click="showPersonalInformation(item)">
           <div class="circle">
             <img
@@ -71,21 +71,10 @@
               </div>
             </div>
             <div class="text-ellipsis">{{ item.position }}</div>
-            <div
-              style="
-                margin-top: 5px;
-                margin-bottom: 10px;
-                display: flex;
-                flex-wrap: wrap;
-              "
-            >
-              <span
-                v-for="i in item.type_parent_list"
-                :key="i"
-                class="type-name"
-              >
+            <div style="margin-top: 5px; margin-bottom: 10px;display: flex;flex-wrap: wrap">
+              <span v-for="i in item.type_parent_list" :key="i" class="type-name">
                 {{ i.type_parent }}
-                <span v-if="index === item.length - 1" class="force-newline" />
+                <span v-if="index === item.length - 1" class="force-newline"></span>
               </span>
             </div>
           </div>
@@ -94,11 +83,7 @@
       </div>
     </van-list>
   </div>
-  <organizationalStructure
-    v-if="isShowStructure"
-    v-model:isShowStructure="isShowStructure"
-    @confirm="handleSelect"
-  />
+  <organizationalStructure v-if="isShowStructure" v-model:isShowStructure="isShowStructure" @confirm="handleSelect" />
 </template>
 
 <script setup lang="ts">
@@ -114,7 +99,7 @@ import { getPersonalData, getPersonalType } from "@/api/persons";
 const router = useRouter();
 const keywords = ref("");
 let responsibility_type = ref([]);
-const fieldValue = ref("三防指挥部");
+const fieldValue = ref("所有类型");
 const showPicker = ref(false);
 const onConfirm = ({ selectedValues, selectedOptions }) => {
   showPicker.value = false; //用于控制 van-picker 组件的显示状态,将其设置为 false 表示隐藏选择器。
@@ -136,7 +121,7 @@ const requestParameters = ref({
   page: 1,
   pageSize: 10,
   Name: keywords,
-  checkedId: ""
+  area_code: ""
 });
 const persons = ref([]);
 const onLoad = () => {
@@ -161,11 +146,12 @@ const onLoad = () => {
   });
 };
 onMounted(() => {
-  getDicts("responsibility_type").then(res => {
-    res.data.unshift({ dictLabel: "所有类型", dictValue: "" });
-    responsibility_type.value = res.data;
-  });
+  // getDicts("responsibility_type").then(res => {
+  //   res.data.unshift({ dictLabel: "所有类型", dictValue: "" });
+  //   responsibility_type.value = res.data;
+  // });
   getPersonalType(requestParameters.value).then(res => {
+    res.data.unshift({ dictLabel: "所有类型", dictValue: "" });
     responsibility_type = res.data || [];
   });
 });
@@ -192,10 +178,14 @@ const filterNode = (value, data) => {
   return data.label.indexOf(value) !== -1;
 };
 let selectedTreeId = ref([]);
-const handleSelect = data => {
-  adressContent.value = data.label;
-  upOneLevel.value = data.value;
-  requestParameters.value.checkedId = data.id;
+const handleSelect = (data) => {
+  if (data) {
+    adressContent.value = data.label;
+    upOneLevel.value = data.value;
+    requestParameters.value.area_code = data.id;
+  }
+  requestParameters.value.page = 1;
+  onLoad();
 };
 </script>
 
@@ -365,4 +355,7 @@ const handleSelect = data => {
   height: calc(100vh - 154px);
   overflow: scroll;
 }
+.choose {
+  width: 150px;
+}
 </style>

src/views/threePreventionResponsiblePerson/organizationalStructure.vue

@@ -54,11 +54,7 @@
         </div>
       </div>
     </div>
-    <editPersonInformation
-      v-if="isShowInformation"
-      :isShowStructure="isShowStructure"
-      @toHomepage="closeContent"
-    />
+    <editPersonInformation v-if="isShowInformation" :isShowStructure="isShowStructure" @confirm="closeContent" />
     <div class="footer">
       <div class="footer-item1">
         <img v-if="!isShowInformation" :src="archSel" style="height: 24px" />
@@ -76,13 +72,7 @@
           style="height: 24px"
         />
         <img v-else :src="inform_checked" style="height: 24px" />
-        <div
-          v-if="isShowInformation"
-          style="color: #1d92ff"
-          @click="handleToPersonInfo"
-        >
-          个人信息
-        </div>
+        <div v-if="isShowInformation" style="color: #1d92ff" @click="handleToPersonInfo">个人信息</div>
         <div v-else @click="handleToPersonInfo">个人信息</div>
       </div>
     </div>
@@ -103,7 +93,7 @@ import type Node from "element-plus/es/components/tree/src/model/node";
 import { getTree } from "@/api/tree";
 import EditPersonInformation from "@/views/threePreventionResponsiblePerson/editPersonInformation.vue";
 
-const propps = defineProps({
+const props = defineProps({
   isShowStructure: Boolean
 });
 const keywords = ref("");
@@ -145,8 +135,8 @@ const backToFram = () => {
   isShowInformation.value = false;
 };
 const closeContent = data1 => {
-  debugger;
   emits("update:isShowStructure", false);
+  emits("confirm");
 };
 
 interface Tree {

src/views/threePreventionResponsiblePerson/personInformation.vue

@@ -31,7 +31,7 @@
                   {{ personalInformation.state === false ? "在线" : "离线" }}
                 </div>
               </div>
-              <div style="margin-top: 15px">行政区划：茂名市</div>
+              <div style="margin-top: 15px">行政区划：{{personalInformation.area_name}}</div>
             </div>
           </div>
         </div>
@@ -72,21 +72,12 @@ import { getPersonalCard } from "@/api/persons";
 
 const isShowInformation = ref(false);
 const personalInformation = ref({});
-const requestParameters = ref({
-  id: "",
-  name: "",
-  type: [],
-  type_parent_id: "",
-  checkedId: ""
-});
 const route = useRoute();
 const userId = ref(route.query.id);
 getPersonalCard(userId.value).then(res => {
   personalInformation.value = res.data || [];
 });
 
-
-// const personType = personalInformation.value.type.toString();
 const showPersonalInformation = item => {
   isShowInformation.value = true;
   personalInformation.value = item;