bugfix

components/IncidentListFilter.vue

@@ -35,6 +35,8 @@
     </view>
     <PyhRdtpicker
         :show="isShowDate"
+        :start="start"
+        :end="end"
         @showchange="showDatechange"
         :value="searchData.acceptDate"
         @change="bindDateChange"
@@ -81,7 +83,7 @@
 <script setup>
   import PyhRdtpicker from '@/components/PyhRdtpicker/PyhRdtpicker.vue';
   import { defineEmits, ref, reactive, defineProps } from 'vue'
-  import { startOfDay, endOfDay, format, startOfWeek, endOfWeek, add } from 'date-fns'
+  import { startOfYear, endOfYear, format, add } from 'date-fns'
   import { onLoad } from '@dcloudio/uni-app'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { api_area, api_incidentcategory } from "@/http/api.js"
@@ -102,6 +104,9 @@
   // 登记时间
   const isShowDate = ref(false)
   
+  const start = ref(format(startOfYear(add(new Date(), { years: -5})), 'yyyy-MM-dd'));
+  const end = ref(format(endOfYear(add(new Date(), { years: 0})), 'yyyy-MM-dd'));
+  
   const tabs = reactive([
     // { name: '全部事件', value: 'all' },
     { name: '待我处理', value: 'todoingAll' },
@@ -121,7 +126,7 @@
     selected: 'todoingAll',
     area: {id: 0, area: '全部'},
     category: {id: 0, category: '全部'},
-    acceptDate: [format(startOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), 'yyyy-MM-dd'), format(endOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), 'yyyy-MM-dd')],
+    acceptDate: [],
   })
   
   // 显示登记时间
@@ -158,7 +163,7 @@
     searchData.selected = 'todoingAll';
     searchData.area = {id: 0, area: '全部'};
     searchData.category = {id: 0, category: '全部'};
-    searchData.acceptDate = [format(startOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), 'yyyy-MM-dd'), format(endOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), 'yyyy-MM-dd')];
+    searchData.acceptDate = [];
     console.log(searchData.acceptDate)
   }
   

manifest.json

@@ -62,7 +62,7 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.4.163", //请求的目标域名
+                    "target" : "http://192.168.3.111", //请求的目标域名
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

pages/buildIncident/buildIncident.vue

@@ -401,7 +401,7 @@
         incidentData,
         incidentBuildStore.incidentBuild.data,
         {
-          priority: incidentBuildStore.incidentBuild.data.category ? incidentBuildStore.incidentBuild.data.category.priority : undefined,
+          priority: incidentBuildStore.incidentBuild.data.category ? (incidentBuildStore.incidentBuild.data.category.priority ? incidentBuildStore.incidentBuild.data.category.priority.id : undefined) : undefined,
           description: incidentBuildStore.incidentBuild.data.category ? incidentBuildStore.incidentBuild.data.category.mutiCategory : undefined,
         },
       );

pages/incidentList/incidentList.vue

@@ -66,7 +66,7 @@
 <script setup>
   import IncidentListFilter from '@/components/IncidentListFilter.vue';
   import IncidentAttachment from '@/components/IncidentAttachment.vue';
-  import { startOfDay, endOfDay, format, startOfWeek, endOfWeek, add } from 'date-fns'
+  import { startOfDay, endOfDay, format, add } from 'date-fns'
   import { ref, reactive, computed } from 'vue'
   import { onLoad, onPullDownRefresh, onReachBottom, onTabItemTap } from '@dcloudio/uni-app'
   import { api_getDictionary, api_incident, api_incident_count, api_incidentTask } from "@/http/api.js"
@@ -131,7 +131,7 @@
       selected: 'todoingAll',
       area: {id: 0, area: '全部'},
       category: {id: 0, category: '全部'},
-      acceptDate: [format(startOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), 'yyyy-MM-dd'), format(endOfWeek(add(new Date(), { weeks: -1}), { weekStartsOn: 1 }), 'yyyy-MM-dd')],
+      acceptDate: [],
     },//筛选框数据
   })