Merge remote-tracking branch 'origin/master'

src/views/sensitivePerception/ModelClue.vue

@@ -79,7 +79,7 @@
                             width="200"
                         >
                             <template #default="{ row }">
-                                <span>{{ activeModelClue.involveParentDepartName }}</span><span>{{ activeModelClue.involveDepartName ? '/' + activeModelClue.involveDepartName : '' }}</span>
+                                <span>{{ row.involveParentDepartName }}</span><span>{{ row.involveDepartName ? '/' + row.involveDepartName : '' }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column

src/views/sensitivePerception/ModelClueTask.vue

@@ -62,16 +62,32 @@
                             prop="size"
                             align="center"
                         />
-                        <el-table-column label="办结数量" align="center" />
-                        <el-table-column label="查实数量" align="center" />
-                        <el-table-column label="涉及单位数" align="center" />
-                        <el-table-column label="涉及人数" align="center" />
+                        <el-table-column
+                            label="办结数量"
+                            align="center"
+                            prop="completedSize"
+                        />
+                        <el-table-column
+                            label="查实数量"
+                            align="center"
+                            prop="verifySize"
+                        />
+                        <el-table-column
+                            label="涉及单位数"
+                            align="center"
+                            prop="departSize"
+                        />
+                        <el-table-column
+                            label="涉及人数"
+                            align="center"
+                            prop="personalSize"
+                        />
                         <el-table-column label="操作" width="200">
                             <template #default="{ row }">
                                 <el-button
                                     type="primary"
                                     link
-                                    @click="handleRemoveManuel(row)"
+                                    @click="handleStatisticsShow(row.id)"
                                     >任务统计</el-button
                                 >
                             </template>
@@ -96,7 +112,51 @@
         </el-row>
     </div>
 
-    <el-dialog></el-dialog>
+    <el-dialog title="任务统计" v-model="statisticsShow" width="80vw">
+        <div style="min-height: 500px">
+            <div class="table-container">
+                <el-table :data="list">
+                    <el-table-column
+                        label="单位名称"
+                        prop="taskName"
+                        width="200"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="问题数量"
+                        prop="modelName"
+                        width="200"
+                        show-overflow-tooltip
+                    />
+                    <el-table-column
+                        label="办结数量"
+                        prop="distributionTime"
+                        width="200"
+                    />
+                    <el-table-column
+                        label="问题条数"
+                        prop="size"
+                        align="center"
+                    />
+                    <el-table-column
+                        label="办结率"
+                        align="center"
+                        prop="completedSize"
+                    />
+                    <el-table-column
+                        label="查实数量"
+                        align="center"
+                        prop="verifySize"
+                    />
+                    <el-table-column
+                        label="涉及人数"
+                        align="center"
+                        prop="personalSize"
+                    />
+                </el-table>
+            </div>
+        </div>
+    </el-dialog>
 </template>
 <script lang="ts" setup>
 import { listModelClueTask } from "@/api/sensitivePerception/modelClueTask";
@@ -126,6 +186,11 @@ function reset() {
     query.value = {};
     getList();
 }
+
+const statisticsShow = ref(false);
+async function handleStatisticsShow(id) {
+    statisticsShow.value = true;
+}
 </script>
 <style lang="scss" scoped>
 </style>

src/views/system/Police.vue

@@ -628,12 +628,18 @@ function beforeUpload() {
     });
 }
 function handleSuccess(result) {
+    console.log('handleSuccess', result)
     importLoading.close();
+    if (result.code !== 200) {
+        feedback.msgError(result.message);
+        return
+    }
     getList()
 }
 function handleError(result) {
+    console.log(result)
     importLoading.close();
-    feedback.msgError(result.msg || "上传失败！");
+    feedback.msgError(result.message || "上传失败！");
 }
 </script>
 <style lang="scss" scoped>