Merge branch 'master' of http://gitea.biutag.com/supervision/supervision-vue

src/views/datav/MailVisits.vue

@@ -39,7 +39,7 @@
                 </el-col>
               </el-row>
 
-              <datav-card >
+              <datav-card>
                 <datav-tabs v-model="activeTab">
                   <datav-tab-item label="分县市局" name="1">
                     <datav-tabs
@@ -191,13 +191,13 @@
                   </div>
                 </el-col>
               </el-row>
-<!--              <datav-chart-bar-->
+              <!--              <datav-chart-bar-->
-<!--                  sub-title="数量"-->
+              <!--                  sub-title="数量"-->
-<!--                  :data="data3"-->
+              <!--                  :data="data3"-->
-<!--                  :max="7"-->
+              <!--                  :max="7"-->
-<!--              />-->
+              <!--              />-->
 
-              <datav-card >
+              <datav-card>
                 <datav-tabs v-model="activeTabRight">
                   <datav-tab-item label="分县市局" name="1">
                     <datav-tabs
@@ -212,14 +212,14 @@
                       </datav-tab-item>
                       <datav-tab-item label="缠访闹访" name="2">
                         <datav-chart-bar
-                            :data="fxsjRepeatMailList"
+                            :data="fxsjEntanglementMailList"
                             :max="11"
                             size="large"
                         />
                       </datav-tab-item>
                       <datav-tab-item label="群体集访" name="3">
                         <datav-chart-bar
-                            :data="jsdwBarList"
+                            :data="fxsjMassMailList"
                             :max="11"
                             size="large"
                         />
@@ -241,14 +241,14 @@
                       </datav-tab-item>
                       <datav-tab-item label="缠访闹访" name="2">
                         <datav-chart-bar
-                            :data="fxsjRepeatMailList"
+                            :data="bwzdEntanglementMailList"
                             :max="11"
                             size="large"
                         />
                       </datav-tab-item>
                       <datav-tab-item label="群体集访" name="3">
                         <datav-chart-bar
-                            :data="jsdwBarList"
+                            :data="bwzdMassMailList"
                             :max="11"
                             size="large"
                         />
@@ -327,7 +327,6 @@ const option = {
     },
   ],
 };
-
 const option1 = ref({
   xAxis: {
     type: "category",
@@ -388,134 +387,6 @@ const option1 = ref({
     },
   ],
 });
-
-const data1 = [
-  {
-    name: "雨花分局",
-    value: 98,
-    unit: "%",
-    numerator: 776,
-    denominator: 791,
-  },
-  {
-    name: "岳麓分局",
-    value: 97,
-    unit: "%",
-    numerator: 772,
-    denominator: 795,
-  },
-  {
-    name: "开福分局",
-    value: 92,
-    unit: "%",
-    numerator: 750,
-    denominator: 815,
-  },
-  {
-    name: "天心分局",
-    value: 92,
-    unit: "%",
-    numerator: 661,
-    denominator: 718,
-  },
-  {
-    name: "芙蓉分局",
-    value: 89,
-    unit: "%",
-    numerator: 641,
-    denominator: 720,
-  },
-  {
-    name: "望城分局",
-    value: 85,
-    unit: "%",
-    numerator: 451,
-    denominator: 530,
-  },
-  {
-    name: "浏阳市局",
-    value: 79,
-    unit: "%",
-    numerator: 451,
-    denominator: 570,
-  },
-  {
-    name: "长沙县局",
-    value: 70,
-    unit: "%",
-    numerator: 350,
-    denominator: 500,
-  },
-];
-
-const data3 = [
-
-  {
-    name: "天心分局",
-    value: 7
-  },
-  {
-    name: "芙蓉分局",
-    value: 6
-  },
-  {
-    name: "开福分局",
-    value: 5
-  },
-  {
-    name: "岳麓分局",
-    value: 2
-  },
-  {
-    name: "雨花分局",
-    value: 2
-  },
-  {
-    name: "望城分局",
-    value: 1
-  },
-  {
-    name: "浏阳市局",
-    value: 1
-  },
-  {
-    name: "长沙县局",
-    value: 1
-  },
-];
-
-
-const data2 = [
-  {
-    name: "开福分局",
-    value: 9700
-  },
-  {
-    name: "芙蓉分局",
-    value: 9021
-  },
-  {
-    name: "岳麓分局",
-    value: 8512
-  },
-  {
-    name: "雨花分局",
-    value: 8021
-  },
-  {
-    name: "望城分局",
-    value: 7111
-  },
-  {
-    name: "浏阳市局",
-    value: 6622
-  },
-  {
-    name: "长沙县局",
-    value: 6221
-  },
-];
-
 const option2 = {
   series: [
     {
@@ -535,7 +406,6 @@ const option2 = {
     },
   ],
 };
-
 const option3 = {
   series: [
     {
@@ -555,10 +425,12 @@ const option3 = {
     },
   ],
 };
+
+
 const activeTab = ref("1");
 const activeMailTab = ref("1");
-const activeTabRight=ref("1");
+const activeTabRight = ref("1");
-const activeMailTabRight=ref("1");
+const activeMailTabRight = ref("1");
 // 总数对象
 const overview = ref({
   total: 0,
@@ -577,16 +449,23 @@ const overview = ref({
 // 分局初重领信
 const fxsjFirstMailList = ref([]);
 const fxsjRepeatMailList = ref([]);
-const fxsjLeaderViewMailList= ref([]);
+const fxsjLeaderViewMailList = ref([]);
 // 部委初重信
 const bwzdFirstMailList = ref([]);
 const bwzdRepeatMailList = ref([]);
-const bwzdLeaderViewMailList= ref([]);
+const bwzdLeaderViewMailList = ref([]);
+// 分局缠闹
+const fxsjEntanglementMailList = ref([]);
+const fxsjMassMailList = ref([]);
+
+// 部委缠闹
+const bwzdEntanglementMailList = ref([]);
+const bwzdMassMailList = ref([]);
+
 const time = ref([
   moment().startOf("year").format("YYYY-MM-DD"),
   moment().format("YYYY-MM-DD"),
 ]);
-
 function getData() {
   getMailVisitsData(time.value).then((data) => {
     overview.value = data.overview;
@@ -596,6 +475,10 @@ function getData() {
     bwzdFirstMailList.value = data.bwzdFirstMailList;
     bwzdRepeatMailList.value = data.bwzdRepeatMailList;
     bwzdLeaderViewMailList.value = data.bwzdLeaderViewMailList;
+    fxsjEntanglementMailList.value = data.fxsjEntanglementMailList
+    fxsjMassMailList.value = data.fxsjMassMailList
+    bwzdEntanglementMailList.value = data.bwzdEntanglementMailList
+    bwzdMassMailList.value = data.bwzdMassMailList
   });
 }
 

src/views/datav/RightsComfort.vue

@@ -263,34 +263,34 @@ const option1 = ref({
 });
 
 const data1 = [
-    {
+    // {
-        name: "开福分局",
+    //     name: "开福分局",
-        value: 31
+    //     value: 31
-    },
+    // },
-    {
+    // {
-        name: "芙蓉分局",
+    //     name: "芙蓉分局",
-        value: 30
+    //     value: 30
-    },
+    // },
-    {
+    // {
-        name: "岳麓分局",
+    //     name: "岳麓分局",
-        value: 22
+    //     value: 22
-    },
+    // },
-    {
+    // {
-        name: "雨花分局",
+    //     name: "雨花分局",
-        value: 20
+    //     value: 20
-    },
+    // },
-    {
+    // {
-        name: "望城分局",
+    //     name: "望城分局",
-        value: 15
+    //     value: 15
-    },
+    // },
-    {
+    // {
-        name: "浏阳市局",
+    //     name: "浏阳市局",
-        value: 9
+    //     value: 9
-    },
+    // },
-    {
+    // {
-        name: "长沙县局",
+    //     name: "长沙县局",
-        value: 9
+    //     value: 9
-    },
+    // },
 ];
 
 const data2 = [
@@ -325,21 +325,21 @@ const data2 = [
 ];
 
 const option2 = {
-    series: [
+    // series: [
-        {
+    //     {
-            type: "pie",
+    //         type: "pie",
-            radius: ["40%", "70%"],
+    //         radius: ["40%", "70%"],
-            label: {
+    //         label: {
-                color: "#fff",
+    //             color: "#fff",
-            },
+    //         },
-            data: [
+    //         data: [
-                { value: 311, name: "故意伤害" },
+    //             { value: 311, name: "故意伤害" },
-                { value: 735, name: "袭警罪" },
+    //             { value: 735, name: "袭警罪" },
-                { value: 580, name: "寻衅滋事" },
+    //             { value: 580, name: "寻衅滋事" },
-                { value: 484, name: "妨碍公务" }
+    //             { value: 484, name: "妨碍公务" }
-            ],
+    //         ],
-        },
+    //     },
-    ],
+    // ],
 };
 
 const option3 = computed(() => {
@@ -374,39 +374,39 @@ const option4 = computed(() => {
 
 const option6 = {
     series: [
-        {
+        // {
-            type: "pie",
+        //     type: "pie",
-            radius: ["40%", "70%"],
+        //     radius: ["40%", "70%"],
-            label: {
+        //     label: {
-                color: "#fff",
+        //         color: "#fff",
-            },
+        //     },
-            data: [
+        //     data: [
-                { value: 211, name: "民警" },
+        //         { value: 211, name: "民警" },
-                { value: 655, name: "辅警" },
+        //         { value: 655, name: "辅警" },
-                { value: 666, name: "协警" },
+        //         { value: 666, name: "协警" },
-                { value: 312, name: "巡防队员" }
+        //         { value: 312, name: "巡防队员" }
-            ],
+        //     ],
-        },
+        // },
     ],
 };
 
 const option5 = {
     series: [
-        {
+        // {
-            type: "pie",
+        //     type: "pie",
-            radius: ["40%", "70%"],
+        //     radius: ["40%", "70%"],
-            label: {
+        //     label: {
-                color: "#fff",
+        //         color: "#fff",
-            },
+        //     },
-            data: [
+        //     data: [
-                { value: 211, name: "其它" },
+        //         { value: 211, name: "其它" },
-                { value: 655, name: "网络侵权" },
+        //         { value: 655, name: "网络侵权" },
-                { value: 666, name: "110警情" },
+        //         { value: 666, name: "110警情" },
-                { value: 321, name: "安保维稳" },
+        //         { value: 321, name: "安保维稳" },
-                { value: 211, name: "执勤处室" },
+        //         { value: 211, name: "执勤处室" },
-                { value: 421, name: "组织调解" },
+        //         { value: 421, name: "组织调解" },
-            ],
+        //     ],
-        },
+        // },
     ],
 };
 </script>

src/views/sensitivePerception/ModelClue.vue

@@ -106,6 +106,20 @@
                                 }}</span>
                             </template>
                         </el-table-column>
+                      <el-table-column
+                          label="处理状态"
+                          align="center"
+                          width="120"
+                      >
+                        <template #default="{ row }">
+                                <span>{{
+                                    getDictLable(
+                                        dict.handleState,
+                                        row.status
+                                    )
+                                  }}</span>
+                        </template>
+                      </el-table-column>
                         <el-table-column label="操作" width="180">
                             <template #default="{ row }">
                                 <el-button
@@ -182,6 +196,17 @@
                     }}</span>
                 </div>
             </div>
+            <div class="row mt-10">
+              <div class="col col-6">
+                <label>处理状态</label>
+                <span>{{
+                    getDictLable(
+                        dict.handleState,
+                        activeModelClue.status
+                    )
+                  }}</span>
+              </div>
+            </div>
             <h3>详细信息</h3>
             <div style="min-height: 200px">
                 <el-empty description="无数据" />
@@ -201,7 +226,7 @@ import useCatchStore from "@/stores/modules/catch";
 import { getDictLable } from "@/utils/util";
 
 const catchStore = useCatchStore();
-const dict = catchStore.getDicts(["distributionState"]);
+const dict = catchStore.getDicts(["distributionState","handleState"]);
 
 const query = ref({});