Browse Source

删除登录定时器loading,非行政人员隐藏计划等

dev-V1.0.6
wangmingyong@163.com 3 months ago
parent
commit
2fc1cbfad0
  1. 3
      zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust
  2. 15
      zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue
  3. 4
      zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue
  4. 8
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue
  5. 6
      zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue

3
zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust

@ -1,6 +1,7 @@
# VITE_APP_PROXY_TARGET = 'http://139.186.148.21:8080' # VITE_APP_PROXY_TARGET = 'http://139.186.148.21:8080'
# VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api' # VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api'
VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080' # VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080'
VITE_APP_PROXY_TARGET = 'http://172.16.21.93:8080'
# 页面标题 # 页面标题
VITE_APP_TITLE = 执法监督码•执法监督 VITE_APP_TITLE = 执法监督码•执法监督
VITE_APP_LOGO_TITLE = 执法监督码•执法监督 VITE_APP_LOGO_TITLE = 执法监督码•执法监督

15
zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/report/registration/indexList.vue

@ -309,7 +309,8 @@ const timePeriodText = computed(() => {
const formatDate = (row: any) => { const formatDate = (row: any) => {
if (!row.enforcementTime) return ''; if (!row.enforcementTime) return '';
const d = new Date(row.enforcementTime); const d = new Date(row.enforcementTime);
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`; const pad = (n: number) => String(n).padStart(2, '0');
return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`;
}; };
/** 排序变更 */ /** 排序变更 */
@ -456,7 +457,7 @@ const closeDetailDialog = () => {
<!-- 列表表格 --> <!-- 列表表格 -->
<div ref="tableRef"> <div ref="tableRef">
<el-table v-loading="loading" :data="tableData" border stripe style="width: 100%" :height="tableHeight" @sort-change="handleSortChange"> <el-table v-loading="loading" :data="tableData" border stripe style="width: 100%" :height="tableHeight" @sort-change="handleSortChange">
<el-table-column label="执法单位" prop="bureauDeptName" align="center" min-width="150" show-overflow-tooltip /> <el-table-column label="执法单位" prop="bureauDeptName" align="center" min-width="250" show-overflow-tooltip />
<el-table-column label="被执法企业名称" prop="enterpriseName" align="center" min-width="180" show-overflow-tooltip /> <el-table-column label="被执法企业名称" prop="enterpriseName" align="center" min-width="180" show-overflow-tooltip />
<el-table-column label="企业注册地" prop="district" width="100" align="center" /> <el-table-column label="企业注册地" prop="district" width="100" align="center" />
<el-table-column label="企业所属街道" prop="street" width="120" align="center" /> <el-table-column label="企业所属街道" prop="street" width="120" align="center" />
@ -466,7 +467,7 @@ const closeDetailDialog = () => {
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="执法事项" prop="lawEnforcementItemText" align="center" min-width="150" show-overflow-tooltip /> <el-table-column label="执法事项" prop="lawEnforcementItemText" align="center" min-width="150" show-overflow-tooltip />
<el-table-column label="执法时间" width="110" align="center" sortable="custom" prop="enforcementTime"> <el-table-column label="执法时间" width="210" align="center" sortable="custom" prop="enforcementTime">
<template #default="{ row }">{{ formatDate(row) }}</template> <template #default="{ row }">{{ formatDate(row) }}</template>
</el-table-column> </el-table-column>
<el-table-column label="联合执法" width="90" align="center"> <el-table-column label="联合执法" width="90" align="center">
@ -531,8 +532,8 @@ const closeDetailDialog = () => {
/> />
<!-- 详情弹窗 --> <!-- 详情弹窗 -->
<el-dialog v-model="detailDialogVisible" title="执法详情" width="700px" append-to-body @close="closeDetailDialog"> <el-dialog v-model="detailDialogVisible" title="执法详情" width="800px" append-to-body @close="closeDetailDialog">
<el-descriptions v-if="detailRow" :column="2" border> <el-descriptions v-if="detailRow" :column="1" border>
<el-descriptions-item label="执法单位">{{ detailRow.bureauDeptName || '-' }}</el-descriptions-item> <el-descriptions-item label="执法单位">{{ detailRow.bureauDeptName || '-' }}</el-descriptions-item>
<el-descriptions-item label="被执法企业名称">{{ detailRow.enterpriseName || '-' }}</el-descriptions-item> <el-descriptions-item label="被执法企业名称">{{ detailRow.enterpriseName || '-' }}</el-descriptions-item>
<el-descriptions-item label="企业注册地">{{ detailRow.district || '-' }}</el-descriptions-item> <el-descriptions-item label="企业注册地">{{ detailRow.district || '-' }}</el-descriptions-item>
@ -548,8 +549,10 @@ const closeDetailDialog = () => {
<el-descriptions-item label="是否扫码">{{ detailRow.checkCss ? '否' : '是' }}</el-descriptions-item> <el-descriptions-item label="是否扫码">{{ detailRow.checkCss ? '否' : '是' }}</el-descriptions-item>
<el-descriptions-item label="未扫码原因">{{ noScanReasonOptions.find(d => d.dictValue === detailRow.checkCss)?.dictLabel || '-' }}</el-descriptions-item> <el-descriptions-item label="未扫码原因">{{ noScanReasonOptions.find(d => d.dictValue === detailRow.checkCss)?.dictLabel || '-' }}</el-descriptions-item>
<el-descriptions-item label="其他原因描述">{{ detailRow.otherReasons || '-' }}</el-descriptions-item> <el-descriptions-item label="其他原因描述">{{ detailRow.otherReasons || '-' }}</el-descriptions-item>
<el-descriptions-item label="是否投诉" :span="2">{{ detailRow.isComplaint === 1 ? '是' : '否' }}</el-descriptions-item> <el-descriptions-item label="是否投诉">{{ detailRow.isComplaint === 1 ? '是' : '否' }}</el-descriptions-item>
<el-descriptions-item width="150" label="创建时间">{{ detailRow.createTime ? formatDate(detailRow) : '-' }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>

4
zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue

@ -248,18 +248,14 @@ const loadPersonList = () => {
if (notUserId) { if (notUserId) {
params.notUserId = notUserId; params.notUserId = notUserId;
} }
// console.log(params);
getBureauUnitUsers(params, (res) => { getBureauUnitUsers(params, (res) => {
if (res.code === 200 || res.code === 0) { if (res.code === 200 || res.code === 0) {
let data = res.data || res.rows || []; let data = res.data || res.rows || [];
// 前端过滤:移除已选择的人员 // 前端过滤:移除已选择的人员
console.log(props.selectedPersons);
const selectedIds = props.selectedPersons.map(p => Number( p.userId || p.id)).filter(Boolean); const selectedIds = props.selectedPersons.map(p => Number( p.userId || p.id)).filter(Boolean);
console.log(selectedIds);
if (selectedIds.length > 0) { if (selectedIds.length > 0) {
data = data.filter(item => { data = data.filter(item => {
const id = item.userId || ''; const id = item.userId || '';
console.log(id,selectedIds.includes(id),'333');
return !selectedIds.includes(id); return !selectedIds.includes(id);
}); });
} }

8
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue

@ -208,10 +208,10 @@ onMounted(() => {
isLoading.value = useCommon.firstLoad; isLoading.value = useCommon.firstLoad;
// 安全超时:20秒后强制关闭loading,防止异常导致一直转圈 // // 安全超时:20秒后强制关闭loading,防止异常导致一直转圈
setTimeout(() => { // setTimeout(() => {
isLoading.value = false; // isLoading.value = false;
}, 20000); // }, 20000);
if (useCommon.token) { if (useCommon.token) {
isLoading.value = false; isLoading.value = false;

6
zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/enforcementMy.vue

@ -16,9 +16,9 @@
</div> </div>
</div> </div>
<!-- 菜单列表 --> <!-- 菜单列表(仅执法人员可见) -->
<div class="menu-wrap"> <div class="menu-wrap">
<div class="menu-card"> <div class="menu-card" v-if="commonStore.hasLaw">
<div <div
v-for="(item, idx) in menuList" v-for="(item, idx) in menuList"
:key="item.key" :key="item.key"

Loading…
Cancel
Save