diff --git a/jwtech-admin-page/src/api/common.js b/jwtech-admin-page/src/api/common.js index 88becbb5..2e758dd7 100644 --- a/jwtech-admin-page/src/api/common.js +++ b/jwtech-admin-page/src/api/common.js @@ -17,6 +17,15 @@ export function legalLinkProject(data){ data: data }) } +// 项目法人关联项目列表 +export function legalProjectList(data){ + return request({ + url: '/common/bindPro', + method: 'post', + data: data + }) +} + //文件上传(只适合小文件) export function uploadFile(data){ diff --git a/jwtech-admin-page/src/assets/logo/2fa3bc74bd6979bf2dcb67fc0003836b.png b/jwtech-admin-page/src/assets/logo/2fa3bc74bd6979bf2dcb67fc0003836b.png new file mode 100644 index 00000000..5e80f4b7 Binary files /dev/null and b/jwtech-admin-page/src/assets/logo/2fa3bc74bd6979bf2dcb67fc0003836b.png differ diff --git a/jwtech-admin-page/src/assets/logo/logo_shuili.png b/jwtech-admin-page/src/assets/logo/logo_shuili.png new file mode 100644 index 00000000..0d553cb6 Binary files /dev/null and b/jwtech-admin-page/src/assets/logo/logo_shuili.png differ diff --git a/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue b/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue index 4d32e238..ff51694d 100644 --- a/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue +++ b/jwtech-admin-page/src/layout/components/Sidebar/Logo.vue @@ -11,8 +11,19 @@

{{ title }}

+

{{ title }}

+ v24.3.0
@@ -23,6 +34,7 @@ // import logoImg from '@/assets/logo/log-2.png' import logoImg from "@/assets/logo/logo-shuili.jpg"; // import logoImg from '@/assets/logo/logo.png' +import logo from "@/assets/logo/logo_shuili.png"; export default { name: "SidebarLogo", @@ -35,10 +47,11 @@ export default { }, data() { return { - title: "广东省水工程建设管理系统", + // title: "广东省水工程建设管理系统", + title: "智慧水利水工程应用", // title: '安全知识图谱管理平台', // logo: logoImg, - logo: "", + logo: logo, }; }, created() { diff --git a/jwtech-admin-page/src/utils/permission.js b/jwtech-admin-page/src/utils/permission.js index ceca18fb..a65a4e5d 100644 --- a/jwtech-admin-page/src/utils/permission.js +++ b/jwtech-admin-page/src/utils/permission.js @@ -7,11 +7,12 @@ import store from '@/store' */ export function checkPermi(value) { if (value && value instanceof Array && value.length > 0) { + const all_permission = "*:*:*"; const permissions = store.getters && store.getters.permissions const permissionDatas = value const hasPermission = permissions.some(permission => { - return permissionDatas.includes(permission) + return all_permission === permission || permissionDatas.includes(permission) }) if (!hasPermission) { diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/processShow/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/processShow/index.vue index 921effdb..5726fb37 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/processShow/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/processShow/index.vue @@ -88,15 +88,15 @@ export default { content: "项目完工", timestamp: "2022-10-20", size: "large", - icon: "el-icon-check", - color: "#36B29E", + icon: "el-icon-minus", + color: "#ccc", }, { content: "竣工验收", timestamp: "2022-12-31", size: "large", - icon: "el-icon-check", - color: "#36B29E", + icon: "el-icon-minus", + color: "#ccc", }, ], }; diff --git a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue index 61822792..fadbe5fd 100644 --- a/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue +++ b/jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue @@ -32,6 +32,7 @@ label="预警状态" align="center" prop="resultType" + :formatter="resultTypeFormat" min-width="120" /> { + this.resultTypeOptions = response.data; + }); this.getDicts("Warning_items").then((response) => { this.warningItemsOptions = response.data; }); @@ -768,10 +774,14 @@ export default { this.resultId = ""; this.activeNode = 1; }, - // 预警状态字典翻译 + // 预警事项字典翻译 warnTypeFormat(row, column) { return this.selectDictLabel(this.warningItemsOptions, row.warnType); }, + // 预警状态字典翻译 + resultTypeFormat(row, column) { + return this.selectDictLabel(this.resultTypeOptions, row.resultType); + }, /** 查询预警结果列表 */ getList() { this.loading = true; diff --git a/jwtech-admin-page/src/views/project/bid/options/index.vue b/jwtech-admin-page/src/views/project/bid/options/index.vue index d510a0d0..34fb2243 100644 --- a/jwtech-admin-page/src/views/project/bid/options/index.vue +++ b/jwtech-admin-page/src/views/project/bid/options/index.vue @@ -28,7 +28,12 @@ @tab-click="handleClick" style="margin-bottom: 20px" > - +