Merge remote-tracking branch 'origin/master'

src/api/datav.ts

@@ -6,6 +6,14 @@ export function getCaseVerifData(times) {
     });
 }
 
+export function getMailVisitsData(times) {
+    return request.get({
+        url: `/datav/mailVisits?beginTime=${times[0]}&endTime=${times[1]}`
+    });
+}
+
+
+
 export function getRightsComfortData(times) {
     return request.get({
         url: `/datav/rightsComfort?beginTime=${times[0]}&endTime=${times[1]}`

src/layout/components/Aside.vue

@@ -62,7 +62,6 @@
 <script setup>
 import { MenuEnum } from "@/enums/appEnums";
 import useUserStore from "@/stores/modules/user";
-
 const asideCollapse = ref(false);
 const userStore = useUserStore();
 const routes = computed(() => userStore.routes);

src/utils/feedback.ts

@@ -19,15 +19,25 @@ export class Feedback {
     }
     // 错误消息
     msgError(msg: string) {
-        ElMessage.error(msg)
+        ElMessage.error({
+            message: msg,
+            type: 'error',
+            duration: 5000
+        })
     }
     // 成功消息
     msgSuccess(msg: string) {
-        ElMessage.success(msg)
+        ElMessage.success({
+            message: msg,
+            type: 'success'
+        })
     }
     // 警告消息
     msgWarning(msg: string) {
-        ElMessage.warning(msg)
+        ElMessage.warning({
+            message: msg,
+            type: 'warning'
+        })
     }
     // 弹出提示
     alert(msg: string) {

src/views/data/Ajhc.vue

@@ -122,12 +122,7 @@
                 <el-table-column label="业务类别" prop="businessTypeName" />
                 <el-table-column label="涉嫌问题" prop="involveProblem" />
                 <el-table-column label="涉及警种" prop="policeTypeName" />
-                <el-table-column label="涉及单位" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span>{{ row.secondDepartName }}</span>
-                            <span>{{ row.thirdDepartName }}</span>
-                        </template>
-                    </el-table-column>
+                <el-table-column label="涉及单位" prop="involveDepartName" />
                 <el-table-column
                     label="具体内容"
                     prop="thingDesc"
@@ -145,6 +140,7 @@
                 </el-table-column>
                 <el-table-column label="操作" width="200">
                     <template #default="{ row }">
+                        
                         <template
                             v-if="
                                 row.distributionState ===
@@ -170,7 +166,7 @@
                                 >移除</el-button
                             >
                         </template>
-
+                        
                         <el-button type="danger" link @click="handleDel(row)"
                             >删除</el-button
                         >
@@ -230,11 +226,7 @@
                         prop="discoveryTime"
                         show-overflow-tooltip
                     />
-                    <el-table-column
-                        label="问题发生时间"
-                        prop="happenTime"
-                        show-overflow-tooltip
-                    />
+                    <el-table-column label="问题发生时间" prop="happenTime" show-overflow-tooltip />
                     <el-table-column
                         label="问题来源"
                         prop="problemSources"
@@ -253,12 +245,10 @@
                     <el-table-column label="业务类别" prop="businessTypeName" />
                     <el-table-column label="涉嫌问题" prop="involveProblem" />
                     <el-table-column label="涉及警种" prop="policeTypeName" />
-                    <el-table-column label="涉及单位" show-overflow-tooltip>
-                        <template #default="{ row }">
-                            <span>{{ row.secondDepartName }}</span>
-                            <span>{{ row.thirdDepartName }}</span>
-                        </template>
-                    </el-table-column>
+                    <el-table-column
+                        label="涉及单位"
+                        prop="involveDepartName"
+                    />
                     <el-table-column
                         label="具体内容"
                         prop="thingDesc"
@@ -266,6 +256,7 @@
                     />
                     <el-table-column label="操作" width="140">
                         <template #default="{ row }">
+                            
                             <el-button
                                 type="info"
                                 link
@@ -333,7 +324,10 @@
             </el-form-item>
         </el-form>
         <footer class="flex end mt-20">
-            <el-button type="primary" size="large" @click="handleSubmit"
+            <el-button
+                type="primary"
+                size="large"
+                @click="handleSubmit"
                 >确认下发</el-button
             >
         </footer>
@@ -356,7 +350,7 @@ const catchStore = useCatchStore();
 const dict = catchStore.getDicts([
     "distributionState",
     "timeLimit",
-    "approvalFlow",
+    "approvalFlow"
 ]);
 
 const query = ref({
@@ -405,7 +399,7 @@ function handleShowDistributeDialog() {
     distributeShow.value = true;
 }
 const form = ref({});
-const formRef = ref();
+const formRef = ref()
 
 function handleRemoveDistribute(row) {
     distributeList.value.splice(
@@ -417,14 +411,14 @@ function handleRemoveDistribute(row) {
 }
 
 async function handleSubmit() {
-    await formRef.value.validate();
-    form.value.data = distributeList.value;
-    await distributeCaseVerif(form.value);
-    form.value = {};
-    distributeShow.value = false;
-    distributeListShow.value = false;
-    feedback.msgSuccess("下发成功");
-    getList();
+    await formRef.value.validate()
+    form.value.data = distributeList.value
+    await distributeCaseVerif(form.value)
+    form.value = {}
+    distributeShow.value = false
+    distributeListShow.value = false
+    feedback.msgSuccess('下发成功')
+    getList()
 }
 </script>
 <style lang="scss" scoped>

src/views/datav/CaseVerif.vue

@@ -23,6 +23,7 @@
                                         size="large"
                                     />
                                 </datav-tab-item>
+
                             </datav-tabs>
                         </datav-card>
                         <datav-card title="案件问题性质">
@@ -136,6 +137,7 @@
         </div>
     </el-scrollbar>
 </template>
+
 <script setup>
 import vCharts from "vue-echarts";
 import changshaMap from "@/assets/data/changsha.json";
@@ -371,6 +373,7 @@ const option4 = {
 
 const activeTab = ref("1");
 </script>
+
 <style lang="scss" scoped>
 @import "@/style/datav.scss";
 </style>

src/views/system/Police.vue

@@ -78,7 +78,7 @@
                 </el-row>
             </el-form>
             <div class="mb-25 flex between">
-                <div>
+                <div class="flex gap">
                     <el-button
                         type="primary"
                         @click="handleAdd"
@@ -89,6 +89,37 @@
                         </template>
                         新增警员</el-button
                     >
+
+                    <el-upload
+                        :multiple="false"
+                        :show-file-list="false"
+                        :action="`${BASE_PATH}/police/import`"
+                        :headers="{ Authorization: getToken() }"
+                        :before-upload="beforeUpload"
+                        @success="handleSuccess"
+                        @error="handleError"
+                        accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+                        v-perms="['police:import']"
+                    >
+                        <el-button
+                            type="primary"
+                            
+                        >
+                            <template #icon>
+                                <icon name="el-icon-Upload" />
+                            </template>
+                            导入警员</el-button
+                        >
+                    </el-upload>
+
+                    <a
+                        class="link"
+                        :href="`${BASE_PATH}/templates/数字督察警员权限导入模板.xlsx`"
+                        target="__blank"
+                        style="padding: 8px"
+                        v-perms="['police:import']"
+                        >数字督察警员权限导入模板</a
+                    >
                 </div>
                 <div>
                     <el-button type="primary" @click="getList">
@@ -445,6 +476,8 @@
     </el-dialog>
 </template>
 <script setup>
+import { BASE_PATH } from "@/api/request";
+import { getToken } from "@/utils/token";
 import { UserFilled } from "@element-plus/icons-vue";
 import {
     listPolice,
@@ -584,6 +617,24 @@ async function handleDel(row) {
     feedback.msgSuccess("操作成功");
     getList();
 }
+
+import { ElLoading } from "element-plus";
+let importLoading;
+function beforeUpload() {
+    importLoading = ElLoading.service({
+        lock: true,
+        text: "数据导入中",
+        background: "rgba(0, 0, 0, 0.7)",
+    });
+}
+function handleSuccess(result) {
+    importLoading.close();
+    getList()
+}
+function handleError(result) {
+    importLoading.close();
+    feedback.msgError(result.msg || "上传失败！");
+}
 </script>
 <style lang="scss" scoped>
 </style>