解决代码冲突

src/components/negativeInfo/depart-dialog.vue

@@ -240,9 +240,6 @@
                             <el-empty v-if="problemTypeBarList.length === 0" />
                         </el-scrollbar>
                     </el-col>
-                    <el-col :span="8">
-                        <h5>单位问题标签</h5>
-                    </el-col>
                 </el-row>
                 <div style="margin-top: 60px">
                     <h5>问题变化趋势</h5>
@@ -284,7 +281,7 @@
                         @size-change="getNegativeList"
                         @current-change="getNegativeList"
                         :page-sizes="[10, 20, 50, 100]"
-                        v-model:page-size="query.size"
+                        v-model:page-size="negativeQuery.size"
                         v-model:current-page="negativeQuery.current"
                         layout="total, sizes, prev, pager, next"
                         :total="negativeTotal"
@@ -296,6 +293,7 @@
     </el-dialog>
 </template>
 <script setup>
+import vCharts from "vue-echarts";
 import { BASE_PATH } from "@/api/request";
 import { InspectCase } from "@/enums/dictEnums";
 import {
@@ -312,7 +310,7 @@ const props = defineProps({
 });
 
 const time = ref([
-    moment().startOf("year").format("YYYY-MM-DD HH:mm:ss"),
+    moment().subtract(12, 'month').format("YYYY-MM-DD HH:mm:ss"),
     moment().format("YYYY-MM-DD HH:mm:ss"),
 ]);
 const colors = [
@@ -360,7 +358,7 @@ async function getProfileData() {
     radarOption.value.radar.indicator = data.problemTypeRadarIndicator;
     radarOption.value.series[0].data[0].value = data.problemTypeRadarData;
 
-    // problemTypeBarList.value = data.problemTypeBarList;
+    problemTypeBarList.value = data.problemTypeBarList;
     loading.value = false;
 }
 

src/views/data/Mail12337.vue

@@ -33,7 +33,7 @@
                     <el-col :span="6">
                         <el-form-item label="登记时间">
                             <date-time-range-picker-ext
-                                v-model="query.discoverTime"
+                                v-model="query.discoveryTime"
                             />
                         </el-form-item>
                     </el-col>
@@ -90,7 +90,7 @@
 
                 <el-table-column
                     label="登记时间"
-                    prop="discoverTime"
+                    prop="discoveryTime"
                     width="150"
                 />
                 <el-table-column label="投诉人" prop="name" width="90" />
@@ -225,7 +225,7 @@
                         />
                         <el-table-column
                             label="信息受理登记时间"
-                            prop="discoverTime"
+                            prop="discoveryTime"
                             width="170"
                         >
                             <template #header>

src/views/sensitivePerception/DepartNegative.vue

@@ -166,7 +166,6 @@
 </template>
 <script lang="ts" setup>
 
-import vCharts from "vue-echarts";
 import {
     listDepartNegative,
     getDepartProfile,
@@ -180,10 +179,11 @@ const query = ref({
     size: 10,
     departLevel: "3",
     crtTime: [
-        moment().startOf("year").format("YYYY-MM-DD HH:mm:ss"),
+        moment().subtract(12, 'month').format("YYYY-MM-DD HH:mm:ss"),
         moment().format("YYYY-MM-DD HH:mm:ss"),
     ],
 });
+
 const list = ref<any[]>([]);
 const total = ref(0);
 
@@ -203,7 +203,7 @@ function reset() {
         size: 10,
         departLevel: "3",
         crtTime: [
-            moment().startOf("year").format("YYYY-MM-DD HH:mm:ss"),
+            moment().subtract(12, 'month').format("YYYY-MM-DD HH:mm:ss"),
             moment().format("YYYY-MM-DD HH:mm:ss"),
         ],
     };

src/views/sensitivePerception/PoliceNegative.vue

@@ -484,7 +484,7 @@ const query = ref({
     current: 1,
     size: 10,
     crtTime: [
-        moment().startOf("year").format("YYYY-MM-DD HH:mm:ss"),
+        moment().subtract(12, 'month').format("YYYY-MM-DD HH:mm:ss"),
         moment().format("YYYY-MM-DD HH:mm:ss"),
     ],
 });
@@ -507,7 +507,7 @@ function reset() {
         current: 1,
         size: 10,
         crtTime: [
-            moment().startOf("year").format("YYYY-MM-DD HH:mm:ss"),
+            moment().subtract(12, 'month').format("YYYY-MM-DD HH:mm:ss"),
             moment().format("YYYY-MM-DD HH:mm:ss"),
         ],
     };
@@ -579,7 +579,7 @@ async function handleShowProfile(row) {
 
 watch(activeRow, async () => {
     time.value = [
-        moment().startOf("year").format("YYYY-MM-DD HH:mm:ss"),
+        moment().subtract(12, 'month').format("YYYY-MM-DD HH:mm:ss"),
         moment().format("YYYY-MM-DD HH:mm:ss"),
     ];
     await getProfileData();