修改

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){

jwtech-admin-page/src/layout/components/Sidebar/Logo.vue

@@ -11,8 +11,19 @@
         <h1 v-else class="sidebar-title">{{ title }}</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+        <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 class="sidebar-title">{{ title }}</h1>
+        <span
+          style="
+            height: 100%;
+            display: inline-block;
+            margin-left: 10px;
+            color: #ffff;
+            transform: translateY(3px);
+          "
+          >v24.3.0</span
+        >
       </router-link>
     </transition>
   </div>
@@ -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() {

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) {

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",
         },
       ],
     };

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"
       />
       <el-table-column
@@ -545,6 +546,8 @@ export default {
 
       // 预警事项字典
       warningItemsOptions: [],
+      // 预警状态字典
+      resultTypeOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -666,6 +669,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts("early_warning_state").then((response) => {
+      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;

jwtech-admin-page/src/views/project/bid/options/index.vue

@@ -28,7 +28,12 @@
       @tab-click="handleClick"
       style="margin-bottom: 20px"
     >
-      <el-tab-pane label="招标计划" name="bidBasePage" :lazy="true">
+      <el-tab-pane
+        v-if="checkPermi(['projectBid:zbjh:index'])"
+        label="招标计划"
+        name="bidBasePage"
+        :lazy="true"
+      >
         <bidBasePage
           :proNo="formData.proNo"
           :projectCode="formData.projectCode"
@@ -38,6 +43,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectBid:zgysgg:index'])"
         label="资格预审公告"
         name="PreQualificationPage"
         :disabled="!routeList[1].isEdit"
@@ -50,6 +56,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectBid:zbgg:index'])"
         label="招标公告"
         name="TenderAnnouncementPage"
         :disabled="!routeList[1].isEdit"
@@ -62,6 +69,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectBid:zbwj:index'])"
         label="招标文件"
         name="biddingFile"
         :disabled="!routeList[1].isEdit"
@@ -75,6 +83,7 @@
       </el-tab-pane>
 
       <el-tab-pane
+        v-if="checkPermi(['projectBid:zbhxrgs:index'])"
         label="中标候选人公示"
         name="candidatePage"
         :disabled="!routeList[1].isEdit"
@@ -87,6 +96,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectBid:zbjg:index'])"
         label="中标结果"
         name="winningResultPage"
         :disabled="!routeList[1].isEdit"
@@ -99,6 +109,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectBid:xmht:index'])"
         label="项目合同"
         name="con"
         :disabled="!routeList[1].isEdit"
@@ -114,6 +125,7 @@
   </div>
 </template>
 <script>
+import { checkPermi, checkRole } from "@/utils/permission";
 import bidBasePage from "./bidBasePage.vue";
 import PreQualificationPage from "./PreQualificationPage.vue";
 import TenderAnnouncementPage from "./TenderAnnouncementPage.vue";
@@ -173,6 +185,8 @@ export default {
     this.getList();
   },
   methods: {
+    checkRole,
+    checkPermi,
     /** 查询初步设计信息列表 */
     getList() {
       // getProjectinfo(this.$route.query.baseDataId).then((response) => {

jwtech-admin-page/src/views/project/plan/options/index.vue

@@ -22,10 +22,15 @@
       @tab-click="handleClick"
       style="margin-bottom: 20px"
     >
-      <el-tab-pane label="计划基本信息" name="planBasePage">
+      <el-tab-pane
+        v-if="checkPermi(['projectPlan:jhjbxx:index'])"
+        label="计划基本信息"
+        name="planBasePage"
+      >
         <planBasePage ref="basePage" />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectPlan:jhbzspxx:index'])"
         label="计划编制审批信息"
         name="ApprovalPage"
         :disabled="!routeList[1].isEdit"
@@ -35,6 +40,7 @@
         <ApprovalPage :proNo="formData.proNo" :planId="formData.id" />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectPlan:jhbpxx:index'])"
         label="计划报批信息"
         name="SubmitApprovalPage"
         :disabled="!routeList[1].isEdit"
@@ -47,6 +53,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectPlan:jhssxx:index'])"
         label="计划实施信息"
         name="ImplementationPage"
         :disabled="!routeList[1].isEdit"
@@ -60,6 +67,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectPlan:jhpjxx:index'])"
         label="计划评价信息"
         name="EvaluationPage"
         :disabled="!routeList[1].isEdit"
@@ -71,6 +79,7 @@
   </div>
 </template>
 <script>
+import { checkPermi, checkRole } from "@/utils/permission";
 import planBasePage from "./planBasePage.vue";
 import ApprovalPage from "./ApprovalPage.vue";
 import SubmitApprovalPage from "./SubmitApprovalPage.vue";
@@ -132,6 +141,8 @@ export default {
     });
   },
   methods: {
+    checkRole,
+    checkPermi,
     goBack() {
       this.$router.back();
     },

jwtech-admin-page/src/views/project/special/options/index.vue

@@ -22,10 +22,15 @@
       @tab-click="handleClick"
       style="margin-bottom: 20px"
     >
-      <el-tab-pane label="专题基本信息" name="basePage">
+      <el-tab-pane
+        v-if="checkPermi(['projectSpecial:ztjbxx:index'])"
+        label="专题基本信息"
+        name="basePage"
+      >
         <basePage :formData="formData" ref="basePage" />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectSpecial:ztrwsxx:index'])"
         label="专题任务书信息"
         name="taskPage"
         :disabled="!routeList[1].isEdit"
@@ -34,6 +39,7 @@
         <taskPage :proNo="formData.proNo" />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectSpecial:ztssxx:index'])"
         label="专题实施信息"
         name="ImplementationPage"
         :disabled="!routeList[1].isEdit"
@@ -45,6 +51,7 @@
         />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectSpecial:zthtgl:index'])"
         label="专题合同管理"
         name="ContractPage"
         :disabled="!routeList[1].isEdit"
@@ -53,6 +60,7 @@
         <ContractPage :proNo="formData.proNo" />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectSpecial:ztwdgl:index'])"
         label="专题文档管理"
         name="documentPage"
         :disabled="!routeList[1].isEdit"
@@ -61,6 +69,7 @@
         <documentPage :proNo="formData.proNo" />
       </el-tab-pane>
       <el-tab-pane
+        v-if="checkPermi(['projectSpecial:ztcg:index'])"
         label="专题成果"
         name="resultsPage"
         :disabled="!routeList[1].isEdit"
@@ -72,6 +81,7 @@
   </div>
 </template>
 <script>
+import { checkPermi, checkRole } from "@/utils/permission";
 import basePage from "./basePage.vue";
 import taskPage from "./taskPage.vue";
 import ImplementationPage from "./ImplementationPage.vue";
@@ -129,6 +139,8 @@ export default {
     this.getList();
   },
   methods: {
+    checkRole,
+    checkPermi,
     goBack() {
       this.$router.back();
     },

jwtech-admin-page/src/views/projectAndEnterpriseBindingMange/enterpriseBinding/index.vue

@@ -0,0 +1,3 @@
+<template>
+  <div>qiye</div>
+</template>

jwtech-admin-page/src/views/projectAndEnterpriseBindingMange/projectBinding/index.vue

@@ -0,0 +1,34 @@
+<template>
+  <div>xaingmu</div>
+</template>
+<script>
+import { legalLinkProject, legalProjectList } from "@/api/common";
+export default {
+  data() {
+    return {
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {
+          projectName: null,
+          adcd: null,
+        },
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
+      },
+    };
+  },
+  created() {
+    legalProjectList(this.queryParams).then((res) => {
+      console.log(res);
+    });
+  },
+};
+</script>