admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 惠州政务系统需求

Browse Source
This commit is contained in:
jiayu 2024-09-10 11:41:34 +08:00
parent 39ff2f8a74
commit 2bf5b1c2b1
12 changed files with 97 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@ -2,12 +2,12 @@
NODE_ENV = 'development'
# 本地环境接口地址(/api/index.ts文件中使用)
# VITE_API_URL = 'http://192.168.34.155:6688'
VITE_API_URL = 'http://192.168.34.155:6688'
# VITE_API_URL = 'http://183.63.230.59:6090'
# VITE_API_URL = 'http://2xliv7gs.shenzhuo.vip:55296'
VITE_WPAPI_URL = "http://jxjzw.zhgdyun.com:8081"
# VITE_API_URL = "http://jxjzw.zhgdyun.com:9013"
VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090'
# VITE_API_URL = 'https://xmglcs.hyjgxt.cn:6090'
# 上传
# VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='

139
src/stores/interface/index.ts
View File

@ -1,69 +1,70 @@
/* GlobalState */
export interface GlobalState {
Message: Object | null;
token: string | null;
userInfo: any | null;
accountType: number | undefined;
enterpriseType: number[];
moduleId: string | null;
menuName: string | null;
account: string | null;
assemblySize: AssemblySizeType | "";
language: string | null;
themeConfig: ThemeConfigProps;
projectDateAuth: number | null; // 0必选校验 1去除校验
moduleName: string | null; // 点击首页页面存的标题
editPassword: boolean | null;
openDropdown: boolean | null;
path: string | null;
isManager: string | null;
leftMenuIndex: number;
}
/* themeConfigProp */
export interface ThemeConfigProps {
maximize: boolean;
layout: LayoutType;
primary: string;
isDark: boolean;
isGrey: boolean;
isCollapse: boolean;
isWeak: boolean;
breadcrumb: boolean;
breadcrumbIcon: boolean;
tabs: boolean;
tabsIcon: boolean;
footer: boolean;
}
export type AssemblySizeType = "default" | "small" | "large";
export type LayoutType = "vertical" | "classic" | "transverse" | "columns";
/* tabsMenuProps */
export interface TabsMenuProps {
icon: string;
title: string;
path: string;
name: string;
close: boolean;
}
/* TabsState */
export interface TabsState {
tabsMenuList: TabsMenuProps[];
}
/* AuthState */
export interface AuthState {
routeName: string;
authButtonList: {
[key: string]: string[];
};
authMenuList: Menu.MenuOptions[];
}
/* keepAliveState */
export interface keepAliveState {
keepAliveName: string[];
}
/* GlobalState */
export interface GlobalState {
Message: Object | null;
isDraft: Boolean | false;
token: string | null;
userInfo: any | null;
accountType: number | undefined;
enterpriseType: number[];
moduleId: string | null;
menuName: string | null;
account: string | null;
assemblySize: AssemblySizeType | "";
language: string | null;
themeConfig: ThemeConfigProps;
projectDateAuth: number | null; // 0必选校验 1去除校验
moduleName: string | null; // 点击首页页面存的标题
editPassword: boolean | null;
openDropdown: boolean | null;
path: string | null;
isManager: string | null;
leftMenuIndex: number;
}
/* themeConfigProp */
export interface ThemeConfigProps {
maximize: boolean;
layout: LayoutType;
primary: string;
isDark: boolean;
isGrey: boolean;
isCollapse: boolean;
isWeak: boolean;
breadcrumb: boolean;
breadcrumbIcon: boolean;
tabs: boolean;
tabsIcon: boolean;
footer: boolean;
}
export type AssemblySizeType = "default" | "small" | "large";
export type LayoutType = "vertical" | "classic" | "transverse" | "columns";
/* tabsMenuProps */
export interface TabsMenuProps {
icon: string;
title: string;
path: string;
name: string;
close: boolean;
}
/* TabsState */
export interface TabsState {
tabsMenuList: TabsMenuProps[];
}
/* AuthState */
export interface AuthState {
routeName: string;
authButtonList: {
[key: string]: string[];
};
authMenuList: Menu.MenuOptions[];
}
/* keepAliveState */
export interface keepAliveState {
keepAliveName: string[];
}

15
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/index.vue
View File

@ -93,6 +93,21 @@ const next = async (data: { [key: string]: OverviewForm }, isTemporary: any, isS
addRepostData.value.annexFiles = annexFileList.value.filter(v => !map.has(v.fileUrl) && map.set(v.fileUrl, v));
console.log(annexFileList.value, 111222);
console.log(addRepostData.value, 111222);
delete addRepostData.value.engineeringSingles;
console.info(isTemporary, "isTemporary");
addRepostData.value.engineeringStageEightList?.map(item => {
let eightAnnexFileList: AnnexFile[] = [];
item.engineeringSingles.forEach((data: any) => {
if (data.files.length) {
eightAnnexFileList.push(...data.files);
}
});
const map = new Map();
item.annexFiles = eightAnnexFileList.filter(v => !map.has(v.fileUrl) && map.set(v.fileUrl, v));
delete item.engineeringSingles;
});
if (isTemporary) {
await temporarySave();
return;

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue
View File

@ -144,7 +144,7 @@
<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
</div>
<footer class="footer">
<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer>
</div>

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue
View File

@ -116,7 +116,7 @@
<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
</div>
<footer class="footer">
<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
<el-button type="primary" @click="prev">上一步</el-button>
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer>

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue
View File

@ -154,7 +154,7 @@
<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
</div>
<footer class="footer">
<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
<el-button type="primary" @click="prev">上一步</el-button>
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer>

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue
View File

@ -78,7 +78,7 @@
<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
</div>
<footer class="footer">
<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
<el-button type="primary" @click="prev">上一步</el-button>
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer>

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue
View File

@ -105,7 +105,7 @@
<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
</div>
<footer class="footer">
<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
<el-button type="primary" @click="prev">上一步</el-button>
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer>

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue
View File

@ -102,7 +102,7 @@
<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
</div>
<footer class="footer">
<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
<el-button type="primary" @click="prev">上一步</el-button>
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer>

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue
View File

@ -86,7 +86,7 @@
<FileUpload v-model="showFilesUpload" @update:files="handlechange" :files="current.files" :reset="true" />
</div>
<footer class="footer">
<el-button type="primary" @click="next(ruleFormRef, !store.Message ? true : false, true)">保存</el-button>
<el-button type="primary" @click="next(ruleFormRef, store.isDraft ? true : false, true)">保存</el-button>
<el-button type="primary" @click="prev">上一步</el-button>
<el-button type="primary" @click="next(ruleFormRef)">下一步</el-button>
</footer>

2
src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview8.vue
View File

@ -632,7 +632,7 @@ onMounted(async () => {
name: curr.fileName,
size: +curr.fileSize,
type: "image/png",
response: { ...curr }
response: { ...curr, contentType: "image/png" }
});
});
j.files = files;

2
src/views/goverment/huizhou/preProjectManagement/index.vue
View File

@ -243,6 +243,7 @@ const confirmReform = () => {
// 新增项目
const handleAddItem = async () => {
store.Message = null;
store.isDraft = true;
const res: any = await getQueryUnSubmitApi({});
console.info(res, "----res---");
if (res.result) {
@ -255,6 +256,7 @@ const handleAddItem = async () => {
const onEdit = async (row: any) => {
const res: any = await getPreIdEngApproveList({ id: row.id });
store.Message = res.result;
store.isDraft = false;
approvalTitle.value = "编辑";
detailsDialog.value = true;
// relativeId.value = row.id;