Web/daimp-front
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
姚俊旭 2025-05-27 11:59:06 +08:00
commit 53cdca5961
4 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/micro/app.js
View File

@ -18,10 +18,10 @@ export const leftApps = [
icon: 'images/platform/icon-admin.png', icon: 'images/platform/icon-admin.png',
}, },
{ {
name: 'sub-app', name: 'sub-app2',
entry: VITE_APP_SUB_GAS, entry: VITE_APP_SUB_GAS,
activeRule: '/sub-app', activeRule: '/sub-app',
title: 'APP2', title: 'APP',
icon: 'images/platform/icon-app.png', icon: 'images/platform/icon-app.png',
}, },
{ {
@ -49,10 +49,10 @@ export const rightApps = [
icon: 'images/platform/icon-admin.png', icon: 'images/platform/icon-admin.png',
}, },
{ {
name: 'sub-app', name: 'sub-app1',
entry: VITE_APP_SUB_GAS, entry: VITE_APP_SUB_GAS,
activeRule: '/sub-app', activeRule: '/sub-app',
title: 'APP1', title: 'APP',
icon: 'images/platform/icon-app.png', icon: 'images/platform/icon-app.png',
}, },
{ {

4
main/src/views/index.vue
View File

@ -36,9 +36,9 @@ import { getAssetsFile } from '@/utils';
const gotoPage = (row) => { const gotoPage = (row) => {
// window.history.pushState({}, row.name, row.activeRule); // window.history.pushState({}, row.name, row.activeRule);
if (row.title == 'APP1') { if (row.name == 'sub-app1') {
window.location.href = 'https://www.pgyer.com/MXd3uUrO'; window.location.href = 'https://www.pgyer.com/MXd3uUrO';
} else if (row.title == 'APP2') { } else if (row.name == 'sub-app2') {
window.location.href = 'https://www.pgyer.com/4SVVtpob'; window.location.href = 'https://www.pgyer.com/4SVVtpob';
} else { } else {
window.location.href = row.activeRule; window.location.href = row.activeRule;

6
sub-government-affairs-service/src/apis/businessEntity/index.js
View File

@ -29,13 +29,11 @@ export function editBusinessSubject(data) {
* 生产经营主体 - 分页查询 * 生产经营主体 - 分页查询
* @param {Object} params 查询参数 * @param {Object} params 查询参数
*/ */
export function fetchBusinessSubjectList(query) { export function fetchBusinessSubjectList(params) {
return request({ return request({
url: '/product-business/business/businessPage', url: '/product-business/business/businessPage',
method: 'get', method: 'get',
params: { params,
businessSubjectQuery: JSON.stringify(query),
},
}); });
} }

26
sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
View File

@ -245,32 +245,6 @@ const rowUpdate = (row, index, done, loading) => {
}); });
}; };
// 删除
// const rowDel = (row, index, done) => {
// if (isEmpty(row)) return;
// app
// .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning',
// })
// .then(() => {
// console.info('删除', row.recordId);
// delOperationRecord(row.recordId || '')
// .then((res) => {
// if (res.code === 200) {
// app.$message.success('删除成功！');
// loadData();
// done();
// }
// })
// .catch((err) => {
// app.$message.error(err.msg);
// });
// })
// .catch(() => {});
// };
const onBatchDel = () => { const onBatchDel = () => {
let ids = handleIds(); let ids = handleIds();
if (!ids.length || ids.length <= 0) { if (!ids.length || ids.length <= 0) {