supervision
/
supervision-vue
4
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

main
sjh 1 year ago
parent
8cd4ca936b 710519c16d
commit
474c4617b8
7 changed files with 673 additions and 444 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/datav.ts
  2. 1
      src/layout/components/Aside.vue
  3. 16
      src/utils/feedback.ts
  4. 50
      src/views/data/Ajhc.vue
  5. 3
      src/views/datav/CaseVerif.vue
  6. 228
      src/views/datav/MailVisits.vue
  7. 53
      src/views/system/Police.vue

8
src/api/datav.ts
Unescape View File

@ -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) { export function getRightsComfortData(times) {
return request.get({ return request.get({
url: `/datav/rightsComfort?beginTime=${times[0]}&endTime=${times[1]}` url: `/datav/rightsComfort?beginTime=${times[0]}&endTime=${times[1]}`

1
src/layout/components/Aside.vue
Unescape View File

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

16
src/utils/feedback.ts
Unescape View File

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

50
src/views/data/Ajhc.vue
Unescape View File

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

3
src/views/datav/CaseVerif.vue
Unescape View File

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

228
src/views/datav/MailVisits.vue
Unescape View File

@ -10,7 +10,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="descriptions_cell text-center"> <div class="descriptions_cell text-center">
<div class="descriptions_content"> <div class="descriptions_content">
6259 {{ overview.firstMail }}
</div> </div>
<div class="descriptions_label"> <div class="descriptions_label">
初信初访 初信初访
@ -20,7 +20,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="descriptions_cell text-center"> <div class="descriptions_cell text-center">
<div class="descriptions_content"> <div class="descriptions_content">
988 {{ overview.secondMail }}
</div> </div>
<div class="descriptions_label"> <div class="descriptions_label">
重复信访 重复信访
@ -30,7 +30,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="descriptions_cell text-center"> <div class="descriptions_cell text-center">
<div class="descriptions_content"> <div class="descriptions_content">
2120 {{ overview.leaderReceiveMail }}
</div> </div>
<div class="descriptions_label"> <div class="descriptions_label">
领导接访 领导接访
@ -38,18 +38,72 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<datav-card >
<datav-tabs v-model="activeTab">
<datav-tab-item label="分县市局" name="1">
<datav-tabs
v-model="activeMailTab"
type="bottom-button"
>
<datav-tab-item label="初信初访" name="1">
<datav-chart-bar <datav-chart-bar
sub-title="办结率" :data="fxsjFirstMailList"
:data="data1" size="large"
/> />
<div class="flex tab-title flex center mt-20" style="margin-bottom: 20px"> </datav-tab-item>
<div class="tab-title-item active"> <datav-tab-item label="重复信访" name="2">
初信初访 <datav-chart-bar
</div> :data="fxsjRepeatMailList"
<div class="tab-title-item">重复信访</div> :max="11"
<div class="tab-title-item">领导接访</div> size="large"
</div> />
</datav-tab-item>
<datav-tab-item label="领导接访" name="3">
<datav-chart-bar
:data="fxsjLeaderViewMailList"
:max="11"
size="large"
/>
</datav-tab-item>
</datav-tabs>
</datav-tab-item>
<datav-tab-item label="部委支队" name="2">
<datav-tabs
v-model="activeTab"
type="bottom-button"
>
<datav-tab-item label="初信初访" name="1">
<datav-chart-bar
:data="bwzdFirstMailList"
size="large"
/>
</datav-tab-item>
<datav-tab-item label="重复信访" name="2">
<datav-chart-bar
:data="bwzdRepeatMailList"
:max="11"
size="large"
/>
</datav-tab-item>
<datav-tab-item label="领导接访" name="3">
<datav-chart-bar
:data="bwzdLeaderViewMailList"
:max="11"
size="large"
/>
</datav-tab-item>
</datav-tabs>
</datav-tab-item>
</datav-tabs>
</datav-card> </datav-card>
</datav-card>
<datav-card title="信访问题类型"> <datav-card title="信访问题类型">
<v-charts <v-charts
style="height: 300px" style="height: 300px"
@ -65,27 +119,27 @@
</div> </div>
<div class="flex gap-42"> <div class="flex gap-42">
<datav-statistic <datav-statistic
:value="7247" :value="overview.total"
title="信访总件数" title="信访总件数"
style="width: 20%" style="width: 20%"
/> />
<datav-statistic <datav-statistic
:value="562" :value="overview.countryMail"
title="国家信访" title="国家信访"
style="width: 20%" style="width: 20%"
/> />
<datav-statistic <datav-statistic
:value="1463" :value="overview.policeMail"
title="公安部信访" title="公安部信访"
style="width: 20%" style="width: 20%"
/> />
<datav-statistic <datav-statistic
:value="5153" :value="overview.commissionerMail"
title="局长信箱" title="局长信箱"
style="width: 20%" style="width: 20%"
/> />
<datav-statistic <datav-statistic
:value="39" :value="overview.numMail"
title="12337信访" title="12337信访"
style="width: 20%" style="width: 20%"
/> />
@ -109,7 +163,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="descriptions_cell text-center"> <div class="descriptions_cell text-center">
<div class="descriptions_content"> <div class="descriptions_content">
25 {{ overview.leaderViewMail }}
</div> </div>
<div class="descriptions_label"> <div class="descriptions_label">
领导督办 领导督办
@ -119,7 +173,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="descriptions_cell text-center"> <div class="descriptions_cell text-center">
<div class="descriptions_content"> <div class="descriptions_content">
21 {{ overview.tangleMail }}
</div> </div>
<div class="descriptions_label"> <div class="descriptions_label">
缠访闹访 缠访闹访
@ -129,7 +183,7 @@
<el-col :span="8"> <el-col :span="8">
<div class="descriptions_cell text-center"> <div class="descriptions_cell text-center">
<div class="descriptions_content"> <div class="descriptions_content">
126 {{ overview.massMail }}
</div> </div>
<div class="descriptions_label"> <div class="descriptions_label">
群体集访 群体集访
@ -137,18 +191,74 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<!-- <datav-chart-bar-->
<!-- sub-title="数量"-->
<!-- :data="data3"-->
<!-- :max="7"-->
<!-- />-->
<datav-card >
<datav-tabs v-model="activeTabRight">
<datav-tab-item label="分县市局" name="1">
<datav-tabs
v-model="activeMailTabRight"
type="bottom-button"
>
<datav-tab-item label="领导督办" name="1">
<datav-chart-bar <datav-chart-bar
sub-title="数量" :data="fxsjFirstMailList"
:data="data3" size="large"
:max="7"
/> />
<div class="flex tab-title flex center mt-20" style="margin-bottom: 20px"> </datav-tab-item>
<div class="tab-title-item active"> <datav-tab-item label="缠访闹访" name="2">
领导督办 <datav-chart-bar
</div> :data="fxsjRepeatMailList"
<div class="tab-title-item">缠访闹访</div> :max="11"
<div class="tab-title-item">群体集访</div> size="large"
</div> />
</datav-tab-item>
<datav-tab-item label="群体集访" name="3">
<datav-chart-bar
:data="jsdwBarList"
:max="11"
size="large"
/>
</datav-tab-item>
</datav-tabs>
</datav-tab-item>
<datav-tab-item label="部委支队" name="2">
<datav-tabs
v-model="activeMailTabRight"
type="bottom-button"
>
<datav-tab-item label="领导督办" name="1">
<datav-chart-bar
:data="fxsjFirstMailList"
size="large"
/>
</datav-tab-item>
<datav-tab-item label="缠访闹访" name="2">
<datav-chart-bar
:data="fxsjRepeatMailList"
:max="11"
size="large"
/>
</datav-tab-item>
<datav-tab-item label="群体集访" name="3">
<datav-chart-bar
:data="jsdwBarList"
:max="11"
size="large"
/>
</datav-tab-item>
</datav-tabs>
</datav-tab-item>
</datav-tabs>
</datav-card>
</datav-card> </datav-card>
<datav-card title="追责问责情况"> <datav-card title="追责问责情况">
<v-charts <v-charts
@ -163,10 +273,14 @@
</div> </div>
</el-scrollbar> </el-scrollbar>
</template> </template>
<script setup> <script setup>
import vCharts from "vue-echarts"; import vCharts from "vue-echarts";
import changshaMap from "@/assets/data/changsha.json"; import changshaMap from "@/assets/data/changsha.json";
import * as echarts from "echarts/core"; import * as echarts from "echarts/core";
import {getMailVisitsData} from "@/api/datav";
import moment from "moment/moment.js";
echarts.registerMap("changsha", changshaMap); echarts.registerMap("changsha", changshaMap);
const option = { const option = {
@ -311,8 +425,6 @@ const data1 = [
numerator: 641, numerator: 641,
denominator: 720, denominator: 720,
}, },
{ {
name: "望城分局", name: "望城分局",
value: 85, value: 85,
@ -443,6 +555,58 @@ const option3 = {
}, },
], ],
}; };
const activeTab = ref("1");
const activeMailTab = ref("1");
const activeTabRight=ref("1");
const activeMailTabRight=ref("1");
// 总数对象
const overview = ref({
total: 0,
countryMail: 0,
policeMail: 0,
commissionerMail: 0,
numMail: 0,
firstMail: 0,
secondMail: 0,
leaderReceiveMail: 0,
leaderViewMail: 0,
tangleMail: 0,
massMail: 0,
});
// 分局初重领信
const fxsjFirstMailList = ref([]);
const fxsjRepeatMailList = ref([]);
const fxsjLeaderViewMailList= ref([]);
// 部委初重信
const bwzdFirstMailList = ref([]);
const bwzdRepeatMailList = ref([]);
const bwzdLeaderViewMailList= 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;
fxsjFirstMailList.value = data.fxsjFirstMailList;
fxsjRepeatMailList.value = data.fxsjRepeatMailList;
fxsjLeaderViewMailList.value = data.fxsjLeaderViewMailList;
bwzdFirstMailList.value = data.bwzdFirstMailList;
bwzdRepeatMailList.value = data.bwzdRepeatMailList;
bwzdLeaderViewMailList.value = data.bwzdLeaderViewMailList;
});
}
watch(time, () => {
getData();
})
onMounted(() => {
getData();
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/style/datav.scss"; @import "@/style/datav.scss";

53
src/views/system/Police.vue
Unescape View File

@ -78,7 +78,7 @@
</el-row> </el-row>
</el-form> </el-form>
<div class="mb-25 flex between"> <div class="mb-25 flex between">
<div> <div class="flex gap">
<el-button <el-button
type="primary" type="primary"
@click="handleAdd" @click="handleAdd"
@ -89,6 +89,37 @@
</template> </template>
新增警员</el-button 新增警员</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>
<div> <div>
<el-button type="primary" @click="getList"> <el-button type="primary" @click="getList">
@ -445,6 +476,8 @@
</el-dialog> </el-dialog>
</template> </template>
<script setup> <script setup>
import { BASE_PATH } from "@/api/request";
import { getToken } from "@/utils/token";
import { UserFilled } from "@element-plus/icons-vue"; import { UserFilled } from "@element-plus/icons-vue";
import { import {
listPolice, listPolice,
@ -584,6 +617,24 @@ async function handleDel(row) {
feedback.msgSuccess("操作成功"); feedback.msgSuccess("操作成功");
getList(); 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> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
</style> </style>
Write Preview
Loading…
Cancel
Save