zy_oyj/sgxt_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
Esacpe
2025-09-24 17:45:43 +08:00
parent c46e14b76b d62fe13f0f
commit d58f1568a6
4 changed files with 252 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/index.vue
View File

@ -8,7 +8,8 @@
</el-button> </el-button>
</template> </template>
<div class="flex just-center"> <div class="flex just-center">
<el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm" @click="handleApplication(it)">{{it.zdmc }}</el-button> <el-button size="small" type="primary" v-for="it in D_GS_BK_SQLX" :key="it.dm"
@click="handleApplication(it)">{{ it.zdmc }}</el-button>
</div> </div>
</el-popover> </el-popover>
<el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click"> <el-popover placement="bottom" :visible="visiblefp" :width="400" trigger="click">
@ -40,25 +41,19 @@
</div> </div>
<!-- 表格 --> <!-- 表格 -->
<div class="tabBox"> <div class="tabBox">
<MyTable <MyTable :tableData="pageData.tableData" :tableColumn="pageData.tableColumn" :tableHeight="pageData.tableHeight"
:tableData="pageData.tableData" :key="pageData.keyCount" :tableConfiger="pageData.tableConfiger" :controlsWidth="pageData.controlsWidth"
:tableColumn="pageData.tableColumn" @chooseData="chooseData" fixed="right">
:tableHeight="pageData.tableHeight" <template #qtLb="{ row }">
:key="pageData.keyCount" <DictTag :tag="false" :value="row.qtLb" :options="D_GS_ZDQT_LB" />
:tableConfiger="pageData.tableConfiger"
:controlsWidth="pageData.controlsWidth"
@chooseData="chooseData"
fixed="right"
>
<template #qtLb="{ row }">
<DictTag :tag="false" :value="row.qtLb" :options="D_GS_ZDQT_LB" />
</template> </template>
<template #qtFxdj="{ row }"> <template #qtFxdj="{ row }">
<DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ" /> <DictTag :tag="false" :value="row.qtFxdj" :options="D_GS_ZDQT_FXDJ" />
</template> </template>
<template #bqList="{ row }"> <template #bqList="{ row }">
<ul > <ul>
<li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{ item.bqFz || 0 }} 分) </li> <li class="one_text_detail marks mb4" :key="index" v-for="(item, index) in row.bqList">{{ item.bqMc }}({{
item.bqFz || 0 }} 分) </li>
</ul> </ul>
</template> </template>
<template #zdryList="{ row }"> <template #zdryList="{ row }">
@ -70,8 +65,8 @@
<!-- 操作 --> <!-- 操作 -->
<template #controls="{ row }"> <template #controls="{ row }">
<el-link size="small" type="success" @click="handleremove(row.id)">移除</el-link> <el-link size="small" type="success" @click="handleremove(row.id)">移除</el-link>
<el-link size="small" type="primary" v-if=" row.qtZt == '01'" @click="handleSend(row.id)">办结</el-link> <el-link size="small" type="primary" v-if="row.qtZt == '01'" @click="handleSend(row.id)">办结</el-link>
<el-link size="small" type="success" v-if=" row.qtZt == '01'" @click="addEdit('edit', row)">编辑</el-link> <el-link size="small" type="success" v-if="row.qtZt == '01'" @click="addEdit('edit', row)">编辑</el-link>
<el-link size="small" type="success" @click="addEdit('detail', row)">详情</el-link> <el-link size="small" type="success" @click="addEdit('detail', row)">详情</el-link>
<el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link> <el-link size="small" type="danger" @click="deleteRow(row.id)">删除</el-link>
</template> </template>
@ -82,10 +77,12 @@
}"></Pages> }"></Pages>
</div> </div>
<!-- 编辑 - 新增--> <!-- 编辑 - 新增-->
<EditForm v-if="show" @updateDate="getList" ref="editFormDiloag" :dic="{D_BZ_XB,D_GS_ZDQT_LB,D_GS_ZDQT_FXDJ,D_GS_ZDR_CZZT}" /> <EditForm v-if="show" @updateDate="getList" ref="editFormDiloag"
:dic="{ D_BZ_XB, D_GS_ZDQT_LB, D_GS_ZDQT_FXDJ, D_GS_ZDR_CZZT }" />
<!-- 选择用户 --> <!-- 选择用户 -->
<ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" /> <!-- 转线索 --> <ChooseUser v-model="chooseUserVisible" @choosedUsers="handleUserSelected" :roleIds="roleIds" /> <!-- 转线索 -->
<ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList" :dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm> <ZxsForm v-if="showzxs" ref="zxsDilof" @change="getList"
:dic="{ D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX }"></ZxsForm>
</div> </div>
</template> </template>
@ -101,7 +98,7 @@ import { qcckGet, qcckPost, qcckDelete } from "@/api/qcckApi.js";
import { ElMessage } from "element-plus"; import { ElMessage } from "element-plus";
import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue"; import { reactive, ref, onMounted, getCurrentInstance, nextTick } from "vue";
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { D_GS_ZDR_CZZT,D_GS_BK_SQLX, D_GS_ZDQT_FXDJ, D_GS_ZDR_RYJB, D_GS_ZDQT_LB, D_GS_ZDR_BK_ZT, D_GS_BQ_LX, D_GS_ZDQT_ZT, D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDR_CZZT","D_GS_BK_SQLX", "D_GS_ZDQT_FXDJ", "D_GS_ZDR_RYJB", "D_GS_ZDQT_LB", "D_GS_ZDR_BK_ZT", "D_GS_BQ_LX", "D_GS_ZDQT_ZT", "D_BZ_SF", "D_BZ_XB", "D_GS_XS_LY", "D_BZ_SSZT", "D_GS_XS_LX", "D_GS_XS_QTLX"); //获取字典数据 const { D_GS_ZDR_CZZT, D_GS_BK_SQLX, D_GS_ZDQT_FXDJ, D_GS_ZDR_RYJB, D_GS_ZDQT_LB, D_GS_ZDR_BK_ZT, D_GS_BQ_LX, D_GS_ZDQT_ZT, D_BZ_SF, D_BZ_XB, D_GS_XS_LY, D_BZ_SSZT, D_GS_XS_LX, D_GS_XS_QTLX } = proxy.$dict("D_GS_ZDR_CZZT", "D_GS_BK_SQLX", "D_GS_ZDQT_FXDJ", "D_GS_ZDR_RYJB", "D_GS_ZDQT_LB", "D_GS_ZDR_BK_ZT", "D_GS_BQ_LX", "D_GS_ZDQT_ZT", "D_BZ_SF", "D_BZ_XB", "D_GS_XS_LY", "D_BZ_SSZT", "D_GS_XS_LX", "D_GS_XS_QTLX"); //获取字典数据
const showzxs = ref(false); const showzxs = ref(false);
const queryFrom = ref({}); const queryFrom = ref({});
const ids = ref([]); const ids = ref([]);
@ -174,20 +171,20 @@ const pageData = reactive({
}, },
controlsWidth: 280, controlsWidth: 280,
tableColumn: [ tableColumn: [
{ label: "群体名称", prop: "qtMc",width:150 }, { label: "群体名称", prop: "qtMc", width: 150 },
{ label: "群体类别", prop: "qtLb" , showSolt: true,width:150 }, { label: "群体类别", prop: "qtLb", showSolt: true, width: 150 },
{ label: "风险等级", prop: "qtFxdj" , showSolt: true,width:150 }, { label: "风险等级", prop: "qtFxdj", showSolt: true, width: 150 },
{ label: "背景资料", prop: "qtBjzl" ,width:150 }, { label: "背景资料", prop: "qtBjzl", width: 150 },
{ label: "背景信息", prop: "bgxx", showSolt: true ,width:150 }, { label: "背景信息", prop: "bgxx", showSolt: true, width: 150 },
{ label: "管辖单位", prop: "gxSsdwmc",width:150 }, { label: "管辖单位", prop: "gxSsdwmc", width: 150 },
{ label: "列控原因", prop: "zdrLkyy",width:150 }, { label: "列控原因", prop: "zdrLkyy", width: 150 },
{ label: "开始时间", prop: "zdrRkkssj",width:150 }, { label: "开始时间", prop: "zdrRkkssj", width: 150 },
{ label: "截至时间", prop: "zdrRkjssj" ,width:150 }, { label: "截至时间", prop: "zdrRkjssj", width: 150 },
{ label: "稳控人数", prop: "zdryList", showSolt: true,width:150 }, { label: "稳控人数", prop: "zdryList", showSolt: true, width: 150 },
{ label: "状态", prop: "qtZt", showSolt: true,width:150 }, { label: "状态", prop: "qtZt", showSolt: true, width: 150 },
{ label: "标签", prop: "bqList", showSolt: true ,showOverflowTooltip:true,width:400 }, { label: "标签", prop: "bqList", showSolt: true, showOverflowTooltip: true, width: 400 },
{ label: "创建单位", prop: "xtCjbmmc" ,width:150 }, { label: "创建单位", prop: "xtCjbmmc", width: 150 },
{ label: "创建时间", prop: "xtCjsj",width:150 }, { label: "创建时间", prop: "xtCjsj", width: 150 },
] ]
}); });
@ -199,7 +196,7 @@ onMounted(() => {
//送审 //送审
const handleSend = (id) => { const handleSend = (id) => {
proxy.$confirm("确定要办结？", "警告", { type: "warning" }).then(() => { proxy.$confirm("确定要办结？", "警告", { type: "warning" }).then(() => {
qcckPost({}, "/mosty-gsxt//tbGsxtZdqt/qtbj/"+id).then(() => { qcckPost({}, "/mosty-gsxt//tbGsxtZdqt/qtbj/" + id).then(() => {
proxy.$message({ type: "success", message: "办结成功" }); proxy.$message({ type: "success", message: "办结成功" });
getList(); getList();
}); });
@ -235,7 +232,7 @@ const changeSize = (val) => {
const getList = () => { const getList = () => {
pageData.tableConfiger.loading = true; pageData.tableConfiger.loading = true;
// 群体类型D_ZDRY_RYLX(01 重点 02 普通) // 群体类型D_ZDRY_RYLX(01 重点 02 普通)
let data = { qtlx:'01',...pageData.pageConfiger, ...queryFrom.value }; let data = { qtlx: '01', ...pageData.pageConfiger, ...queryFrom.value };
qcckGet(data, "/mosty-gsxt/tbGsxtZdqt/selectPage").then((res) => { qcckGet(data, "/mosty-gsxt/tbGsxtZdqt/selectPage").then((res) => {
pageData.tableData = res.records || []; pageData.tableData = res.records || [];
pageData.total = res.total; pageData.total = res.total;
@ -260,7 +257,7 @@ const chooseData = (data) => {
}; };
// 选择申请数据数据 // 选择申请数据数据
const handleApplication = () => { const handleApplication = () => {
if (ids.value.length === 0)return ElMessage.error("请先选择需要布控的重点群体"); if (ids.value.length === 0) return ElMessage.error("请先选择需要布控的重点群体");
qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addBksq").then(() => { qcckPost({ ids: ids.value }, "/mosty-gsxt/tbGsxtZdqt/addBksq").then(() => {
ElMessage.success("申请成功"); ElMessage.success("申请成功");
visible.value = false; visible.value = false;
@ -277,7 +274,7 @@ const handleUserSelected = (val) => {
const handlefp = () => { const handlefp = () => {
if (ids.value.length === 0) return ElMessage.error("请先选择需要分配的重点群体"); if (ids.value.length === 0) return ElMessage.error("请先选择需要分配的重点群体");
qcckPost({ ids: ids.value, uid: obj.value.fpid },"/mosty-gsxt/tbGsxtZdqt/addGkmj").then(() => { qcckPost({ ids: ids.value, uid: obj.value.fpid }, "/mosty-gsxt/tbGsxtZdqt/addGkmj").then(() => {
ElMessage.success("分配成功"); ElMessage.success("分配成功");
visible.value = false; visible.value = false;
visiblefp.value = false; visiblefp.value = false;
@ -308,7 +305,7 @@ const handleZxs = () => {
}; };
// 删除数据 // 删除数据
const deleteRow = (id) =>{ const deleteRow = (id) => {
proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => { proxy.$confirm("确定要删除", "警告", { type: "warning" }).then(() => {
qcckDelete({}, "/mosty-gsxt/tbGsxtZdqt/" + id).then(() => { qcckDelete({}, "/mosty-gsxt/tbGsxtZdqt/" + id).then(() => {
proxy.$message({ type: "success", message: "删除成功" }); proxy.$message({ type: "success", message: "删除成功" });
@ -328,7 +325,7 @@ defineExpose({});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.marks{ .marks {
padding: 0 4px; padding: 0 4px;
white-space: nowrap; white-space: nowrap;
background: #73acf1; background: #73acf1;
@ -341,5 +338,4 @@ defineExpose({});
.el-loading-mask { .el-loading-mask {
background: rgba(0, 0, 0, 0.5) !important; background: rgba(0, 0, 0, 0.5) !important;
} }
</style> </style>

9
src/views/backOfficeSystem/DeploymentDisposal/mpvGroup/model/portrayal.vue
View File

@ -5,17 +5,14 @@
<h3>群体成员画像</h3> <h3>群体成员画像</h3>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div style="width: 50%;"><PieChart :chartData="ywlbtj" title="业务类型"/></div> <div style="width: 50%;"><PieChart :chartData="ywlbtj" title="业务类型"/></div>
<div style="width: 50%;"><BarChart :chartData="gkjbtj" title="管控级别分布"/></div> <div style="width: 50%;"><BarChart :chartData="gkjbtj" title="管控级别分布"/></div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div style="width: 50%;"><PieChart :chartData="qytj" title="区域分布"/></div> <div style="width: 50%;"><PieChart :chartData="qytj" title="区域分布"/></div>
<div style="width: 50%;"><BarChart :chartData="zyfbtj" title="管控级别分布"/></div> <div style="width: 50%;"><BarChart :chartData="zyfbtj" title="管控级别分布"/></div>
</div> </div>
<div style="display: flex;"> <div style="display: flex;">
<div style="width: 50%;"><LineChart :chartData="nlfbtj" title="年龄分布"/></div> <div style="width: 50%;"><LineChart :chartData="nlfbtj" title="年龄分布"/></div>
<div style="width: 50%;"><PieChart :chartData="whcdtj" title="文化程度分布"/></div></div> <div style="width: 50%;"><PieChart :chartData="whcdtj" title="文化程度分布"/></div></div>
</div> </div>

384
src/views/backOfficeSystem/JudgmentHome/ResearchHome/index.vue
View File

@ -3,9 +3,9 @@
<!-- 左边 --> <!-- 左边 -->
<div class="leftbox"> <div class="leftbox">
<div class="title"> <div class="title">
<span v-for="idx in 3" :key="idx" :class="'sircleL'+idx" class="sircle mr5"></span> <span v-for="idx in 3" :key="idx" :class="'sircleL' + idx" class="sircle mr5"></span>
<span class="ml10 mr10">专题统计</span> <span class="ml10 mr10">专题统计</span>
<span v-for="idx in 3" :key="idx" :class="'sircleR'+idx" class="sircle ml5"></span> <span v-for="idx in 3" :key="idx" :class="'sircleR' + idx" class="sircle ml5"></span>
</div> </div>
<div class="commCnt"> <div class="commCnt">
<div class="hh50"> <div class="hh50">
@ -14,7 +14,7 @@
<MoreBarEcharts echartsId="cztjEcharts" :data="obj.data_lxtj"></MoreBarEcharts> <MoreBarEcharts echartsId="cztjEcharts" :data="obj.data_lxtj"></MoreBarEcharts>
</div> </div>
</div> </div>
<div class="hh50"> <div class="hh50">
<div class="comm-title">会商统计</div> <div class="comm-title">会商统计</div>
<div class="echartsBox"> <div class="echartsBox">
@ -26,39 +26,36 @@
<!-- 右边 --> <!-- 右边 -->
<div class="rightbox"> <div class="rightbox">
<div class="title"> <div class="title">
<span v-for="idx in 3" :key="idx" :class="'sircleL'+idx" class="sircle mr5"></span> <span v-for="idx in 3" :key="idx" :class="'sircleL' + idx" class="sircle mr5"></span>
<span class="ml10 mr10">专题研判</span> <span class="ml10 mr10">专题研判</span>
<span v-for="idx in 3" :key="idx" :class="'sircleR'+idx" class="sircle ml5"></span> <span v-for="idx in 3" :key="idx" :class="'sircleR' + idx" class="sircle ml5"></span>
<el-button class="btn" type="primary" @click="handleYP">研判报告</el-button> <el-button class="btn" type="primary" @click="handleYP">研判报告</el-button>
</div> </div>
<div class="commCnt" > <div class="commCnt">
<div ref="searchBox"> <div ref="searchBox">
<el-form :model="searchList" ref="searchFormRef" :inline="true"> <el-form :model="searchList" ref="searchFormRef" :inline="true">
<el-form-item label="类型"> <el-form-item label="类型">
<el-cascader @change="changeCascader" :disabled="readonly_lx" v-model="searchList.lx" clearable :options="cascaderList" :props="{ checkStrictly: true }" placeholder="请选择类型"/> <el-cascader ref="cascaRef" @change="changeCascader" :disabled="readonly_lx" v-model="searchList.lx" clearable
:options="cascaderList" :props="{ checkStrictly: true,multiple: true }" placeholder="请选择类型" />
</el-form-item> </el-form-item>
<el-form-item label="人员"> <el-form-item label="人员">
<el-input @change="changeRy" v-model="searchList.ry" :disabled="readonly_ry" clearable placeholder="请输入姓名或身份证"></el-input> <el-input @change="changeRy" v-model="searchList.ry" :disabled="readonly_ry" clearable
placeholder="请输入姓名或身份证"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="地点"> <el-form-item label="地点">
<div class="flex align-center"> <div class="flex align-center">
<el-select v-model="searchList.dd" @change="changeBm" style="width: 180px;" :disabled="readonly_dd" placeholder="行政区划"> <el-select v-model="searchList.dd" @change="changeBm" style="width: 180px;" :disabled="readonly_dd"
placeholder="行政区划">
<el-option label="区域" value="1"></el-option> <el-option label="区域" value="1"></el-option>
<el-option label="部门" value="2"></el-option> <el-option label="部门" value="2"></el-option>
</el-select> </el-select>
<el-input @change="changeRy" :disabled="readonly_dd" v-model="searchList.xxdz" clearable placeholder="请输入详细地址"></el-input> <el-input @change="changeRy" :disabled="readonly_dd" v-model="searchList.xxdz" clearable
placeholder="请输入详细地址"></el-input>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="时间"> <el-form-item label="时间">
<el-date-picker <el-date-picker v-model="searchList.datetimes" type="datetimerange" unlink-panels :range-separator="'至'"
v-model="searchList.datetimes" start-placeholder="开始日期时间" end-placeholder="结束日期时间" value-format="YYYY-MM-DD HH:mm:ss" />
type="datetimerange"
unlink-panels
:range-separator="'至'"
start-placeholder="开始日期时间"
end-placeholder="结束日期时间"
value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="onSearch">查询</el-button> <el-button type="primary" @click="onSearch">查询</el-button>
@ -66,40 +63,29 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<ul class="listBox" :style="{ height:pageData.boxHeight +'px'}"> <ul class="listBox" :style="{ height: pageData.boxHeight + 'px' }">
<li class="list-item" ref="listBoxRef" v-for="(it,idx) in list" :key="idx"> <li class="list-item" ref="listBoxRef" v-for="(it, idx) in list" :key="idx">
<div class="comm-title title-s">{{ it.title }}</div> <div class="comm-title title-s">{{ it.title }}</div>
<div class="list-table" > <div class="list-table">
<MyTable <MyTable :tableData="it.tableList" :tableColumn="it.tableColumn" :key="idx + '' + it.keyCount" :fixed="false"
:tableData="it.tableList" :tableHeight="pageData.tableHeight" :tabelModel="it.title" :tableConfiger="pageData.tableConfiger"
:tableColumn="it.tableColumn" :controlsWidth="pageData.controlsWidth">
:key="idx+''+it.keyCount" <template #jqlbdm="{ row }">
:fixed="false" <DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
:tableHeight="pageData.tableHeight" </template>
:tabelModel="it.title"
:tableConfiger="pageData.tableConfiger"
:controlsWidth="pageData.controlsWidth"
>
<template #jqlbdm="{ row }">
<DictTag :tag="false" :value="row.jqlbdm" :options="JQLB" />
</template>
<template #controls="{ row }"> <template #controls="{ row }">
<el-link type="primary" size="small" @click="handleHs(row)">网上会商</el-link> <el-link type="primary" size="small" @click="handleHs(row)">网上会商</el-link>
</template> </template>
</MyTable> </MyTable>
<Pages <Pages @changeNo="changeNo($event, it.title)" @changeSize="changeSize($event, it.title)"
@changeNo="changeNo($event,it.title)" :tableHeight="pageData.tableHeight" :pageConfiger="{ ...it.pageConfiger }"></Pages>
@changeSize="changeSize($event,it.title)"
:tableHeight="pageData.tableHeight"
:pageConfiger="{ ...it.pageConfiger }"
></Pages>
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<YpModel v-model="showModel" :textContent="textContent" ></YpModel> <YpModel v-model="showModel" :textContent="textContent"></YpModel>
<!-- 弹窗 --> <!-- 弹窗 -->
<DetailDialog ref="detaileRef"></DetailDialog> <DetailDialog ref="detaileRef"></DetailDialog>
</template> </template>
@ -116,13 +102,13 @@ import MyTable from "@/components/aboutTable/DarkTable.vue";
import Pages from "@/components/aboutTable/Pages.vue"; import Pages from "@/components/aboutTable/Pages.vue";
import { useRoute, useRouter } from 'vue-router'; import { useRoute, useRouter } from 'vue-router';
const router = useRouter(); const router = useRouter();
import { nextTick, onMounted, reactive,getCurrentInstance ,ref, watch } from 'vue'; import { nextTick, onMounted, reactive, getCurrentInstance, ref, watch } from 'vue';
const { proxy } = getCurrentInstance(); const { proxy } = getCurrentInstance();
const { JQLB} = proxy.$dict("JQLB"); //获取字典数据 const { JQLB } = proxy.$dict("JQLB"); //获取字典数据
const readonly_lx = ref(false) const readonly_lx = ref(false)
const readonly_ry = ref(false) const readonly_ry = ref(false)
const readonly_dd = ref(false) const readonly_dd = ref(false)
const cascaRef=ref()
const showModel = ref(false); const showModel = ref(false);
const detaileRef = ref(); const detaileRef = ref();
const searchBox = ref(); const searchBox = ref();
@ -130,99 +116,101 @@ const listBoxRef = ref();
const textContent = ref(''); const textContent = ref('');
// 图数据 // 图数据
const obj = reactive({ const obj = reactive({
data_lxtj:{ data_lxtj: {
xData:['网络舆情','警情','案件','风险隐患'], xData: ['网络舆情', '警情', '案件', '风险隐患'],
color:[['#0DBAC5','#28EEBF'],['#F06C0D','#EEB416']], color: [['#0DBAC5', '#28EEBF'], ['#F06C0D', '#EEB416']],
labelColor:'#000', labelColor: '#000',
list:[ list: [
{label:'总数',val:[0,0,0,0]}, { label: '总数', val: [0, 0, 0, 0] },
] ]
}, },
data_hstj:{ data_hstj: {
xData:['网络舆情','警情','案件','风险隐患'], xData: ['网络舆情', '警情', '案件', '风险隐患'],
color:['#0386FB','#00FFFF'], color: ['#0386FB', '#00FFFF'],
labelColor:'#000', labelColor: '#000',
list:[ list: [
{label:'总数',val:[0,0,10,0]}, { label: '总数', val: [0, 0, 10, 0] },
] ]
} }
}) })
const searchList = ref({}) const searchList = ref({})
let cascaderList = ref([ let cascaderList = ref([
{ value: '01', label: '网络舆情',leaf: true }, { value: '01', label: '网络舆情', leaf: true },
{ value: '02', label: '警情',children:[ {
{ value: '021', label: '治安警情',leaf: true }, value: '02', label: '警情', children: [
{ value: '022', label: '刑事警情',leaf: true }, { value: '021', label: '治安警情', leaf: true },
{ value: '023', label: '交通警情',leaf: true }, { value: '022', label: '刑事警情', leaf: true },
] }, { value: '023', label: '交通警情', leaf: true },
{ value: '03', label: '案件',leaf: true }, ]
{ value: '04', label: '风险隐患',leaf: true }, },
{ value: '03', label: '案件', leaf: true },
{ value: '04', label: '风险隐患', leaf: true },
]) ])
// 每个列表对应的值 // 每个列表对应的值
const list = reactive([ const list = reactive([
{ {
title:'网络舆情', //标题 title: '网络舆情', //标题
tableList:[], tableList: [],
keyCount:0, keyCount: 0,
pageConfiger:{ pageConfiger: {
page:1, page: 1,
total:0, total: 0,
pageSize:6, pageSize: 6,
}, },
tableColumn:[ tableColumn: [
{ label: "舆情标题", prop: "yqbt",showOverflowTooltip: true}, { label: "舆情标题", prop: "yqbt", showOverflowTooltip: true },
{ label: "舆情内容", prop: "yqnr",showOverflowTooltip: true}, { label: "舆情内容", prop: "yqnr", showOverflowTooltip: true },
{ label: "舆情来源", prop: "yqly",showOverflowTooltip: true}, { label: "舆情来源", prop: "yqly", showOverflowTooltip: true },
{ label: "舆情时间", prop: "yqsj",showOverflowTooltip: true}, { label: "舆情时间", prop: "yqsj", showOverflowTooltip: true },
], ],
}, },
{ {
title:'警情', //标题 title: '警情', //标题
tableList:[], tableList: [],
keyCount:1, keyCount: 1,
pageConfiger:{ pageConfiger: {
page:1, page: 1,
total:0, total: 0,
pageSize:6, pageSize: 6,
}, },
tableColumn:[ tableColumn: [
{ label: "接警单编号", prop: "jjdbh",showOverflowTooltip: true}, { label: "接警单编号", prop: "jjdbh", showOverflowTooltip: true },
{ label: "报警电话", prop: "bjdh",showOverflowTooltip: true}, { label: "报警电话", prop: "bjdh", showOverflowTooltip: true },
{ label: "报警时间", prop: "bjsj",showOverflowTooltip: true}, { label: "报警时间", prop: "bjsj", showOverflowTooltip: true },
{ label: "报警内容", prop: "bjnr",showOverflowTooltip: true}, { label: "报警内容", prop: "bjnr", showOverflowTooltip: true },
{ label: "警情类型", prop: "jqlbdm",showSolt:true,showOverflowTooltip: true}, { label: "警情类型", prop: "jqlbdm", showSolt: true, showOverflowTooltip: true },
], ],
}, },
{ {
title:'案件', //标题 title: '案件', //标题
tableList:[], tableList: [],
keyCount:2, keyCount: 2,
pageConfiger:{ pageConfiger: {
page:1, page: 1,
total:0, total: 0,
pageSize:6, pageSize: 6,
}, },
tableColumn:[ tableColumn: [
{ label: "案件编号", prop: "ajbh",showOverflowTooltip: true}, { label: "案件编号", prop: "ajbh", showOverflowTooltip: true },
{ label: "案件内容", prop: "ajnr",showOverflowTooltip: true}, { label: "案件内容", prop: "ajnr", showOverflowTooltip: true },
{ label: "案件类型", prop: "ajlx",showOverflowTooltip: true}, { label: "案件类型", prop: "ajlx", showOverflowTooltip: true },
{ label: "案件时间", prop: "ajsj",showOverflowTooltip: true}, { label: "案件时间", prop: "ajsj", showOverflowTooltip: true },
], ],
}, },
{ {
title:'风险隐患', //标题 title: '风险隐患', //标题
tableList:[], tableList: [],
keyCount:3, keyCount: 3,
pageConfiger:{ pageConfiger: {
page:1, page: 1,
total:0, total: 0,
pageSize:6, pageSize: 6,
}, },
tableColumn:[ tableColumn: [
{ label: "隐患标题", prop: "yhbt",showOverflowTooltip: true}, { label: "隐患标题", prop: "yhbt", showOverflowTooltip: true },
{ label: "隐患内容", prop: "yhnr",showOverflowTooltip: true}, { label: "隐患内容", prop: "yhnr", showOverflowTooltip: true },
{ label: "隐患类型", prop: "yhlx",showOverflowTooltip: true}, { label: "隐患类型", prop: "yhlx", showOverflowTooltip: true },
{ label: "上报时间", prop: "sbsj",showOverflowTooltip: true}, { label: "上报时间", prop: "sbsj", showOverflowTooltip: true },
], ],
}, },
]) ])
@ -235,12 +223,21 @@ const pageData = reactive({
rowHieght: 61, rowHieght: 61,
showSelectType: "null", showSelectType: "null",
loading: false, loading: false,
showIndex:false, showIndex: false,
rowHeight: 30, rowHeight: 30,
}, },
controlsWidth: 120, //操作栏宽度 controlsWidth: 120, //操作栏宽度
}); });
watch(() => JQLB.value, (val) => {
if (val) {
cascaderList.value[1].children = val.map((el) => {
return { value: el.dm, label: el.zdmc, leaf: true }
})
}
},
{
deep: true, immediate: true
})
onMounted(() => { onMounted(() => {
// getCount(); //获取统计数据 // getCount(); //获取统计数据
tabHeightFn() tabHeightFn()
@ -263,8 +260,8 @@ const getCount = () => {
}; };
// 分页 // 分页
const changeNo = (e,type) =>{ const changeNo = (e, type) => {
switch(type){ switch (type) {
case '网络舆情': case '网络舆情':
list[0].pageConfiger.page = e; list[0].pageConfiger.page = e;
break; break;
@ -281,8 +278,8 @@ const changeNo = (e,type) =>{
} }
getJqList() getJqList()
} }
const changeSize = (e,type) =>{ const changeSize = (e, type) => {
switch(type){ switch (type) {
case '网络舆情': case '网络舆情':
list[0].pageConfiger.pageSize = e; list[0].pageConfiger.pageSize = e;
break; break;
@ -301,47 +298,55 @@ const changeSize = (e,type) =>{
} }
// 警情列表 // 警情列表
const getJqList = () =>{ const getJqList = () => {
let params = { let params = {
pageCurrent: list[1].pageConfiger.page, pageCurrent: list[1].pageConfiger.page,
pageSize: list[1].pageConfiger.pageSize, pageSize: list[1].pageConfiger.pageSize,
} }
lzJcjPjdbSelectPage(params).then(res=>{ lzJcjPjdbSelectPage(params).then(res => {
list[1].tableList = res.records || []; list[1].tableList = res.records || [];
list[1].pageConfiger.total = res.total; list[1].pageConfiger.total = res.total;
//模拟的统计警情接口 //模拟的统计警情接口
obj.data_lxtj.list = [{ label: '总数', val: [0,res.total,0,0] }]; obj.data_lxtj.list = [{ label: '总数', val: [0, res.total, 0, 0] }];
obj.data_hstj.list = [{ label: '总数', val: [0,res.total,0,0] }]; obj.data_hstj.list = [{ label: '总数', val: [0, res.total, 0, 0] }];
}) })
} }
const handleHs = (val) =>{ const handleHs = (val) => {
router.push({path:'/MeetingRoom',query:{tsypid:val.id}}) router.push({ path: '/MeetingRoom', query: { tsypid: val.id } })
} }
const handleYP = () =>{ const handleYP = () => {
let arr=cascaRef.value.getCheckedNodes()
searchForm.value.jqlbdms=arr.map((el)=>{
return el.value
})
let params = { let params = {
hskssj:searchForm.value.kssj, hskssj: searchForm.value.kssj,
hsjssj:searchForm.value.jssj, hsjssj: searchForm.value.jssj,
jqlbdms:searchForm.value.jqlbdms
} }
qcckPost(params,'/mosty-gsxt/wshs/getDcypbg').then(res=>{ qcckPost(params, '/mosty-gsxt/lzJcjPjdb/getJqDcypbg').then(res => {
let data = res || {}; let data = res || {};
let html = `<p class="html_bt">${data.bt}</p>` let html = `<p class="html_bt">${data.bt}</p>`
html+=`<p>${data.head}</p>` html += `<p>${data.head}</p>`
html+=`<p>${data.nr}</p>` html += `<p>${data.nr}</p>`
html+=`<p>${data.bc}</p>` html += `<p>${data.bc}</p>`
html+=`<p>${data.end}</p>` html += `<p>${data.end}</p>`
textContent.value = html; textContent.value = html;
showModel.value = true; showModel.value = true;
}) })
} }
// 选择类型 // 选择类型
const changeCascader = (val) =>{ const changeCascader = (val) => {
console.log(val,'val');
console.log(cascaRef.value.getCheckedNodes(),'++++++++');
readonly_lx.value = false; readonly_lx.value = false;
readonly_ry.value = val ? true : false readonly_ry.value = val ? true : false
readonly_dd.value = val ? true : false readonly_dd.value = val ? true : false
@ -350,7 +355,7 @@ const changeCascader = (val) =>{
} }
// 选择人员 // 选择人员
const changeRy = (val) =>{ const changeRy = (val) => {
readonly_ry.value = false; readonly_ry.value = false;
readonly_lx.value = val ? true : false readonly_lx.value = val ? true : false
readonly_dd.value = val ? true : false readonly_dd.value = val ? true : false
@ -358,7 +363,7 @@ const changeRy = (val) =>{
searchList.value.ssbm = '' searchList.value.ssbm = ''
} }
// 选择地点 // 选择地点
const changeBm = (val) =>{ const changeBm = (val) => {
readonly_dd.value = false; readonly_dd.value = false;
readonly_lx.value = val ? true : false readonly_lx.value = val ? true : false
readonly_ry.value = val ? true : false readonly_ry.value = val ? true : false
@ -366,7 +371,7 @@ const changeBm = (val) =>{
searchList.value.ry = '' searchList.value.ry = ''
} }
// 重置 // 重置
const resetForm = () =>{ const resetForm = () => {
searchForm.value = {} searchForm.value = {}
readonly_lx.value = false readonly_lx.value = false
readonly_ry.value = false readonly_ry.value = false
@ -374,10 +379,10 @@ const resetForm = () =>{
} }
// 搜索 // 搜索
const onSearch = () =>{ const onSearch = () => {
if(searchList.value.lx || searchList.value.ry || searchList.value.dd){ if (searchList.value.lx || searchList.value.ry || searchList.value.dd) {
detaileRef.value.init(searchList.value) detaileRef.value.init(searchList.value)
}else{ } else {
ElMessage.warning('请选择查询条件') ElMessage.warning('请选择查询条件')
} }
} }
@ -397,25 +402,27 @@ const tabHeightFn = () => {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.yp—home{ .yp—home {
width: 100%; width: 100%;
height: 100%; height: 100%;
padding-top: 15px; padding-top: 15px;
box-sizing: border-box; box-sizing: border-box;
color: #000; color: #000;
.leftbox{
width:500px; .leftbox {
width: 500px;
height: 100%; height: 100%;
margin-right: 10px; margin-right: 10px;
background: #fff; background: #fff;
} }
.rightbox{
.rightbox {
flex: 1 0 0; flex: 1 0 0;
background: #fff; background: #fff;
} }
} }
@mixin common($width: 16px,$opacity:1){ @mixin common($width: 16px, $opacity: 1) {
height: $width; height: $width;
width: $width; width: $width;
border-radius: 50%; border-radius: 50%;
@ -424,35 +431,43 @@ const tabHeightFn = () => {
} }
// 共同 // 共同
.title{ .title {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
height: 60px; height: 60px;
font-size: 24px; font-size: 24px;
position: relative; position: relative;
.sircle{
.sircle {
display: inline-block; display: inline-block;
} }
.sircleL1{
@include common(8px,0.5); .sircleL1 {
@include common(8px, 0.5);
} }
.sircleL2{
@include common(12px,0.75); .sircleL2 {
@include common(12px, 0.75);
} }
.sircleL3{
.sircleL3 {
@include common(16px); @include common(16px);
} }
.sircleR1{
.sircleR1 {
@include common(16px); @include common(16px);
} }
.sircleR2{
@include common(12px,0.75); .sircleR2 {
@include common(12px, 0.75);
} }
.sircleR3{
@include common(8px,0.5); .sircleR3 {
@include common(8px, 0.5);
} }
.btn{
.btn {
position: absolute; position: absolute;
top: 50%; top: 50%;
right: 10px; right: 10px;
@ -460,35 +475,37 @@ const tabHeightFn = () => {
} }
} }
.commCnt{ .commCnt {
height: calc(100% - 60px); height: calc(100% - 60px);
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
padding: 10px 20px; padding: 10px 20px;
box-sizing: border-box; box-sizing: border-box;
.comm-title{
.comm-title {
position: relative; position: relative;
font-size: 20px; font-size: 20px;
&::before{
&::before {
content: ''; content: '';
position: absolute; position: absolute;
bottom: 0; bottom: 0;
left: 0; left: 0;
width: 78px; width: 78px;
height: 4px; height: 4px;
background: linear-gradient( 90deg, #3596F9 0%, rgba(53,150,249,0) 100%); background: linear-gradient(90deg, #3596F9 0%, rgba(53, 150, 249, 0) 100%);
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
} }
} }
.echartsBox{ .echartsBox {
height: calc(100% - 30px); height: calc(100% - 30px);
margin-top: 4px; margin-top: 4px;
} }
} }
.listBox{ .listBox {
height: calc(100% - 110px); height: calc(100% - 110px);
margin-top: 4px; margin-top: 4px;
border-radius: 10px; border-radius: 10px;
@ -496,66 +513,71 @@ const tabHeightFn = () => {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
overflow: hidden; overflow: hidden;
.list-item{
.list-item {
width: 49.5%; width: 49.5%;
height: calc(100% / 2 - 5px); height: calc(100% / 2 - 5px);
box-shadow: 0px 0px 4px 0px rgba(0,0,0,0.02); box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.02);
border-radius: 8px 8px 8px 8px; border-radius: 8px 8px 8px 8px;
border: 1px solid #E8EDF6; border: 1px solid #E8EDF6;
padding: 4px 4px; padding: 4px 4px;
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 5px; margin-bottom: 5px;
.title-s{
.title-s {
font-size: 16px; font-size: 16px;
} }
.list-table{
.list-table {
margin-top: 5px; margin-top: 5px;
overflow: hidden; overflow: hidden;
} }
} }
.list-item:nth-child(2n+1){
.list-item:nth-child(2n+1) {
margin-right: 1%; margin-right: 1%;
} }
} }
::v-deep .searchBox{
margin-bottom:0 !important; ::v-deep .searchBox {
margin-bottom: 0 !important;
padding: 2px !important; padding: 2px !important;
} }
::v-deep .el-table .table_blue_row { ::v-deep .el-table .table_blue_row {
background: #fff !important; background: #fff !important;
} }
::v-deep .el-table th.el-table__cell{
::v-deep .el-table th.el-table__cell {
font-size: 13px; font-size: 13px;
background: #EFF5F7; background: #EFF5F7;
} }
::v-deep .el-table__empty-block{ ::v-deep .el-table__empty-block {
width: 100%!important; width: 100% !important;
} }
::v-deep .el-scrollbar__view{ ::v-deep .el-scrollbar__view {
border-right: none; border-right: none;
} }
::v-deep .el-table .el-table__cell{ ::v-deep .el-table .el-table__cell {
padding: 0; padding: 0;
} }
::v-deep .el-table th.el-table__cell>.cell{ ::v-deep .el-table th.el-table__cell>.cell {
padding: 8px 0; padding: 8px 0;
} }
::v-deep .el-link { ::v-deep .el-link {
margin: 3px; margin: 3px;
} }
.html_bt >>>p{
.html_bt>>>p {
color: red; color: red;
} }
::v-deep .el-date-editor .el-range-separator { ::v-deep .el-date-editor .el-range-separator {
color: #333; color: #333;
} }
</style> </style>

7
vue.config.js
View File

@ -3,10 +3,15 @@ const path = require("path");
function resolve(dir) { function resolve(dir) {
return path.join(__dirname, dir); return path.join(__dirname, dir);
} }
<<<<<<< HEAD
const serverHost = "http://192.168.1.32:8006"//波哥 const serverHost = "http://192.168.1.32:8006"//波哥
=======
// const serverHost = "http://47.108.232.77:9537"//波哥
>>>>>>> d62fe13f0fc132011350e58f5ca2d061210f35b5
// const serverHost = "http://192.168.0.231:8006"//线上 // const serverHost = "http://192.168.0.231:8006"//线上
// const serverHost = "http://192.168.1.117:8006"//周 // const serverHost = "http://192.168.1.117:8006"//周
// const serverHost = "http://192.168.1.98:8006"//毛毛 const serverHost = "http://192.168.1.98:8006"//毛毛
module.exports = { module.exports = {
// configureWebpack: { // configureWebpack: {