Merge remote-tracking branch 'origin/dev' into dev

src/layout/components/Navbar.vue

@@ -99,7 +99,7 @@ const appStore = useAppStore();
 const userStore = useUserStore();
 const settingsStore = useSettingsStore();
 const noticeStore = storeToRefs(useNoticeStore());
-const newNotice = ref(<number>0);
+const newNotice = ref(<number>2);
 const showLogo = computed(() => settingsStore.sidebarLogo);
 const isCollapse = computed(() => !appStore.sidebar.opened);
 const nickName = computed(() => userStore.nickname);

src/types/components.d.ts

@@ -27,7 +27,6 @@ declare module 'vue' {
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
@@ -50,19 +49,14 @@ declare module 'vue' {
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']

src/views/comprehensiveGuarantee/MaterialReserveManagement/addInbound.vue

@@ -21,18 +21,18 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="运单号：" prop="transport_order_number">
-            <el-input v-model="form.transport_order_number" placeholder="请输入运单号" style="width: 468px" />
-          </el-form-item>
-
-          <el-form-item label="捐赠人联系电话：" prop="donator_phone">
+          <el-form-item v-if="form.is_donation === 'Y'" label="捐赠人联系电话：" prop="donator_phone">
             <el-input v-model="form.donator_phone" placeholder="请输入捐赠人联系电话" style="width: 468px" />
           </el-form-item>
 
-          <el-form-item label="捐赠人姓名：" prop="donator_name">
+          <el-form-item v-if="form.is_donation === 'Y'" label="捐赠人姓名：" prop="donator_name">
             <el-input v-model="form.donator_name" placeholder="请输入捐赠人姓名" style="width: 468px" />
           </el-form-item>
 
+          <el-form-item label="运单号：" prop="transport_order_number">
+            <el-input v-model="form.transport_order_number" placeholder="请输入运单号" style="width: 468px" />
+          </el-form-item>
+
           <el-form-item label="审核人：" prop="reviewer">
             <el-input v-model="form.reviewer" placeholder="请输入审核人" style="width: 468px" />
           </el-form-item>

src/views/dataManagement/index.vue

@@ -92,7 +92,7 @@ const tableData = ref([
     operation: '',
     plannedArea: 122,
     actualArea: 123,
-    updateTime: '2023/12/12 12:13'
+    updateTime: '2023-12-12 12:13'
   },
   {
     id: 2,
@@ -104,7 +104,7 @@ const tableData = ref([
     operation: '',
     plannedArea: 122,
     actualArea: 123,
-    updateTime: '2023/12/12 12:13'
+    updateTime: '2023-12-12 12:13'
   },
   {
     id: 3,
@@ -116,14 +116,14 @@ const tableData = ref([
     operation: '',
     plannedArea: 122,
     actualArea: 123,
-    updateTime: '2023/12/12 12:13'
+    updateTime: '2023-12-12 12:13'
   }
 ]);
 
 const total = ref(30); // 总条目数
 const pageSize = ref(10); // 每页显示条目数
 
-const dataUpdateTime = ref('2023/12/12 12:13');
+const dataUpdateTime = ref('2023-12-12 12:13');
 const dataSourceUnit = ref('茂名市应急管理局');
 
 const handleExcelUpload = (event) => {

src/views/emergencyCommandMap/RightSection/SelectPlan.vue

@@ -1,8 +1,7 @@
 <template>
-  <Dialog ref="dialogRef" v-model="isDialogVisible" type="lg" title="预案任务下发" @confirm="startSelectedPlan" @close="handleCloseDialog">
+  <Dialog ref="dialogRef" v-model="isDialogVisible" type="lg" :style="{ height: '220px' }" title="预案任务下发" @confirm="startSelectedPlan" @close="handleCloseDialog">
     <div class="dialog-content">
       <div class="dialog-body">
-        <!--        <div class="plan-selector">-->
         <el-form-item label="预案名称：" label-width="200px">
           <el-select
             id="plan-select"
@@ -14,26 +13,11 @@
             :teleported="false"
             @change="startSelectedPlan"
           >
-            <!--        <option value="">请选择预案</option>-->
             <el-option v-for="plan in plans" :key="plan.plan_id" :value="plan.plan_id">{{ plan.plan_name }}</el-option>
           </el-select>
         </el-form-item>
       </div>
     </div>
-    <!-- 预案选择器 -->
-    <!--    <div class="plan-selector">-->
-    <!--      <label>预案名称：</label>-->
-    <!--      <el-select id="plan-select" v-model="selectedPlanId" class="custom-select" placeholder="请选择预案" popper-class="custom-select-popper" size="large" :teleported=false @change="startSelectedPlan">-->
-    <!--        &lt;!&ndash;        <option value="">请选择预案</option>&ndash;&gt;-->
-    <!--        <el-option v-for="plan in plans" :key="plan.plan_id" :value="plan.plan_id">{{ plan.plan_name }}</el-option>-->
-    <!--      </el-select>-->
-    <!--    </div>-->
-    <!--    <template #footer>-->
-    <!--      <span class="dialog-footer">-->
-    <!--        <button class="com" @click="startSelectedPlan">确定并启动预案</button>-->
-    <!--        <button class="custom-button" @click="hideDialog">取消</button>-->
-    <!--      </span>-->
-    <!--    </template>-->
   </Dialog>
 </template>
 <script lang="ts" setup>

src/views/emergencyCommandMap/RightSection/TaskDelivery.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :hide-title="false" v-model="dialogVisible" type="xl" :title="props.title" @close="closeDialog">
+  <Dialog v-model="dialogVisible" :hide-title="false" type="xl" :title="props.title" @close="closeDialog">
     <div class="content">
       <el-skeleton :loading="loading" animated>
         <template #template>
@@ -28,10 +28,9 @@
       </el-skeleton>
     </div>
     <template #footer>
-      <div class="dialog-footer" style="margin-right:8px">
-        <div class="common-btn" @click="closeDialog" style="margin-right: 20px">取 消</div>
+      <div class="dialog-footer" style="margin-right: 8px">
+        <div class="common-btn" style="margin-right: 20px" @click="closeDialog">取 消</div>
         <div class="common-btn-primary2" @click="sendTasks">确认发送H5短信</div>
-
       </div>
     </template>
   </Dialog>
@@ -94,11 +93,11 @@ const sendTasks = () => {
 
   // 领导批示内容
   let task_list = {};
-  tasks.value.map((v)=>{
-    if(v.content2 && v.content2 != "") {
-      task_list[v.dept_id] =  v.content2
+  tasks.value.map((v) => {
+    if (v.content2 && v.content2 != '') {
+      task_list[v.dept_id] = v.content2;
     }
-  })
+  });
   // console.log(tasks.value);
   sendTask({ eventId: props.eventId, tasks: task_list })
     .then(() => {
@@ -113,8 +112,8 @@ const handleShowApprove = (item) => {
   item.show = !!!item.show;
 };
 const handleCancel = (item) => {
-  item.content2 = "";
-  item.comment = "";
+  item.content2 = '';
+  item.comment = '';
   item.show = false;
 };
 const handleSubmit = (item) => {

src/views/informationissue/informationApplication.vue

@@ -91,7 +91,7 @@
                   v-model="formData.examine_user"
                   :fetch-suggestions="querySearch"
                   placeholder="请输入审核人姓名"
-                  style="width: 478px !important; margin-left: 20px"
+                  style="width: 460px !important; margin-left: 20px"
                   @select="handleSelect"
                 >
                   <template #default="{ item }">

src/views/informationissue/informationList.vue

@@ -6,8 +6,14 @@
           <el-form ref="queryFormRef" :model="queryParams" label-width="auto">
             <el-row :gutter="20">
               <el-col :span="8">
-                <div style="margin-bottom:10px;">
-                  <el-segmented v-model="queryParams.dispose_status" :options="disposeStatusOptions" size="large" block @change="handleDisposeStatus" />
+                <div style="margin-bottom: 10px">
+                  <el-segmented
+                    v-model="queryParams.dispose_status"
+                    :options="disposeStatusOptions"
+                    size="large"
+                    block
+                    @change="handleDisposeStatus"
+                  />
                 </div>
               </el-col>
             </el-row>
@@ -47,7 +53,7 @@
           </template>
         </el-table-column>
         <el-table-column label="发布单位" align="center" prop="publish_group" />
-        <el-table-column label="信息内容" align="left" prop="content"  width="400"/>
+        <el-table-column label="信息内容" align="left" prop="content" width="400" />
         <el-table-column label="发布时间" align="center" prop="publish_time" />
         <el-table-column label="发布渠道" align="center" prop="publish_channel" />
         <el-table-column label="发布申请人" align="center" prop="nick_name" />

src/views/informationissue/sendDetail.vue

@@ -6,21 +6,21 @@
           <div v-show="showSearch">
             <el-form ref="queryFormRef" :model="queryParams" label-width="100px">
               <el-row :gutter="20">
-                <el-col :span="5">
+                <el-col :span="4">
                   <el-form-item label="渠道：">
                     <el-select v-model="queryParams.channel" placeholder="全部">
                       <el-option v-for="(option, index) in channelOptions" :key="index" :label="option.label" :value="option.value"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="5">
+                <el-col :span="4">
                   <el-form-item label="发布状态：">
                     <el-select v-model="queryParams.publishStatus" placeholder="请选择">
                       <el-option v-for="(option, index) in publishStatusOptions" :key="index" :label="option.label" :value="option.value"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="5">
+                <el-col :span="4">
                   <el-form-item label="反馈状态：">
                     <el-select v-model="queryParams.feedbackStatus" placeholder="请选择">
                       <el-option
@@ -37,9 +37,10 @@
                     <el-input v-model="queryParams.searchInput" placeholder="请输入内容"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="4">
+                <el-col :span="5">
                   <el-form-item>
                     <el-button type="primary" @click="handleSearch">搜索</el-button>
+                    <el-button icon="Refresh" @click="resetSearch">重置</el-button>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -114,7 +115,6 @@ const data = reactive({
   queryParams: {
     page: 1,
     page_size: 10,
-    info_id: '',
     channel: '',
     publishStatus: '',
     feedbackStatus: '',
@@ -142,6 +142,12 @@ const fetchTableData = () => {
 
 // 处理搜索
 const handleSearch = () => {
+  queryParams.value.page = 1;
+  fetchTableData();
+};
+const resetSearch = () => {
+  const newQueryParams = { page: 1, page_size: 10, channel: '', publishStatus: '', feedbackStatus: '', searchInput: '' };
+  Object.assign(queryParams.value, newQueryParams);
   fetchTableData();
 };
 // 选择改变时触发