修改

jwtech-admin-page/src/layout/components/Navbar.vue

@@ -29,7 +29,51 @@
         <!--          <size-select id="size-select" class="right-menu-item hover-effect" />-->
         <!--        </el-tooltip>-->
       </template>
-      <div class="funList">
+      <div class="funList1">
+        <el-dropdown trigger="click" placement="bottom">
+          <span class="CZbtn">
+            <i class="el-icon-s-promotion CZ"></i>
+            操作指南
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="操作手册1111111111111111.xls"
+                placement="left"
+              >
+                <el-button
+                  class="hid"
+                  type="text"
+                  icon="el-icon-download"
+                  @click="download('standard.xls', '良好行为认定标准.xls')"
+                >
+                  操作手册11111111111111111.xls
+                </el-button>
+              </el-tooltip>
+            </el-dropdown-item>
+            <el-dropdown-item>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="操作手册2222222222222222222.xls"
+                placement="left"
+              >
+                <el-button
+                  class="hid"
+                  type="text"
+                  icon="el-icon-download"
+                  @click="download('standard.xls', '良好行为认定标准.xls')"
+                >
+                  操作手册2222222222222222222.xls
+                </el-button>
+              </el-tooltip>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+      <div class="funList2">
         <el-tooltip
           class="item"
           effect="dark"
@@ -145,6 +189,13 @@ export default {
     this.getUser();
   },
   methods: {
+    download(filename, name) {
+      let a = document.createElement("a");
+      a.href = "/static/" + filename;
+      //路径中'/'为根目录，即index.html所在的目录
+      a.download = name;
+      a.click();
+    },
     getUser() {
       getUserProfile().then((response) => {
         // console.info(response.data);
@@ -240,7 +291,20 @@ export default {
     // line-height: 70px;
     // line-height: 50px;
 
-    .funList {
+    .funList1 {
+      margin-right: 20px;
+      // color: #fff;
+      // font-size: 20px;
+      .CZbtn {
+        color: #fff;
+        cursor: pointer;
+        .CZ {
+          font-size: 20px;
+          vertical-align: middle;
+        }
+      }
+    }
+    .funList2 {
       margin-right: 10px;
       color: #fff;
       font-size: 20px;
@@ -301,6 +365,13 @@ export default {
     }
   }
 }
+.hid {
+  width: 150px;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  word-break: break-all;
+}
 
 .center-in-center {
   position: absolute;

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

@@ -56,6 +56,8 @@ export default {
         newPath = "/project/plan";
       } else if (path.includes("/project/bid/")) {
         newPath = "/project/bid";
+      } else if (path.includes("/building/bid/")) {
+        newPath = "/building/bid";
       } else if (path.includes("/building/projectInfo/")) {
         newPath = "/building/projectInfo";
       } else if (

jwtech-admin-page/src/router/index.js

@@ -215,13 +215,15 @@ router.beforeEach((to, from, next) => {
       setToken(to.query.token);
       let toPath
       if (to.query.page === 'null') {
-        toPath="/largeScreen"
+        // toPath="/largeScreen"
+        toPath="/welcome"
         // next("/welcome")
       } else if (to.query.page) {
         toPath=to.query.page
         // next(to.query.page)
       } else {
-        toPath="/largeScreen"
+        // toPath = "/largeScreen"
+        toPath="/welcome"
         // next("/welcome")
       }
       isLegal().then(res => {
@@ -240,14 +242,14 @@ router.beforeEach((to, from, next) => {
   //   }
   //   next() 
   // }
-  else if (from.path === '/login' && to.path !== '/legalLinkProject' && to.path !== '/largeScreen') {
+  else if (from.path === '/login' && to.path !== '/legalLinkProject' && to.path !== '/welcome') {
       // console.log(54546486,isLegal());
       isLegal().then(res => {
         console.log("login--resres", res);
         if (!res.data) {
           next("/legalLinkProject")
         } else {
-          next("/largeScreen")
+          next("/welcome")
         }
       })
   } else if (from.path === '/legalLinkProject' && to.path === '/login') { 

jwtech-admin-page/src/views/building/partyConstructionDevelopment/index.vue

@@ -109,6 +109,18 @@
         fixed
       />
 
+      <el-table-column
+        label="项目名称"
+        align="center"
+        prop="projectName"
+        min-width="120"
+      />
+      <el-table-column
+        label="项目编码"
+        align="center"
+        prop="proCode"
+        min-width="120"
+      />
       <el-table-column
         label="是否开展"
         align="center"
@@ -184,6 +196,24 @@
       :close-on-click-modal="false"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="项目名称" prop="projectName">
+          <el-select
+            v-model="form.projectName"
+            placeholder="请输入项目名称"
+            filterable
+            clearable
+            size="small"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in projectNameOptions"
+              :key="dict.projectName + dict.id"
+              :label="dict.projectName + '[' + dict.proCode + ']'"
+              :value="dict.projectName + '[' + dict.proCode + ']'"
+              @click.native="getId(dict)"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="是否开展" prop="isCarry">
           <el-select
             v-model="form.isCarry"
@@ -219,6 +249,7 @@ import {
   updateDjjgd,
   exportDjjgd,
 } from "@/api/build/djjgd";
+import { listInfo } from "@/api/build/projectInfo";
 
 export default {
   name: "Djjgd",
@@ -228,7 +259,7 @@ export default {
       routeList: [
         {
           path: "/building/partyConstructionDevelopment",
-          routeName: "党建工地开展情况",
+          routeName: "党建进工地开展情况",
         },
       ],
       // 遮罩层
@@ -274,22 +305,49 @@ export default {
           sortBy: "desc",
         },
       },
+      proQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        ids: null,
+        data: {},
+        // 排序方式
+        params: {
+          // 按哪个字段排序
+          orderBy: "create_time",
+          // desc降序，升序asc
+          sortBy: "desc",
+        },
+      },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        isCarry: [{ required: true, message: "请选择是否开展", tigger: blur }],
+        projectName: [
+          { required: true, message: "请选择项目名称", trigger: "change" },
+        ],
+        isCarry: [
+          { required: true, message: "请选择是否开展", trigger: "change" },
+        ],
       },
       fileList: [],
+      //项目名称
+      projectNameOptions: [],
     };
   },
   created() {
     this.getList();
+    listInfo(this.proQueryParams).then((response) => {
+      this.projectNameOptions = response.records;
+    });
     this.getDicts("whether").then((response) => {
       this.isCarryOptions = response.data;
     });
   },
   methods: {
+    getId(res) {
+      this.form.proNo = res.proNo;
+      this.form.proCode = res.proCode;
+    },
     /** 查询党建工地开展情况列表 */
     getList() {
       this.loading = true;

jwtech-admin-page/src/views/building/projectFiling/index.vue

@@ -319,6 +319,7 @@ export default {
       listProjectProgressBy(this.queryParams).then((res) => {
         this.infoList = res.records;
         // console.log(77777, res);
+        this.total = res.total;
         this.loading = false;
       });
     },

jwtech-admin-page/src/views/building/projectInfo/index.vue

@@ -388,10 +388,10 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="项目法人" prop="projectLegalPerson">
+            <el-form-item label="项目法人单位" prop="projectLegalPerson">
               <el-input
                 v-model="form.projectLegalPerson"
-                placeholder="请输入项目法人"
+                placeholder="请输入项目法人单位"
               />
             </el-form-item>
           </el-col>
@@ -1271,7 +1271,7 @@ export default {
         projectLegalPerson: [
           {
             required: true,
-            message: "请输入项目法人",
+            message: "请输入项目法人单位",
             trigger: "blur",
           },
           { max: 250, message: "字符长度最大为250", trigger: "blur" },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/baseMsg.vue

@@ -40,7 +40,7 @@
       </el-descriptions-item>
 
       <el-descriptions-item span="2">
-        <template slot="label"> 项目法人 </template>
+        <template slot="label"> 项目法人单位 </template>
         {{ this.proMsg.projectLegalPerson }}
       </el-descriptions-item>
       <!-- <el-descriptions-item>
@@ -297,10 +297,10 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="项目法人" prop="projectLegalPerson">
+            <el-form-item label="项目法人单位" prop="projectLegalPerson">
               <el-input
                 v-model="form.projectLegalPerson"
-                placeholder="请输入项目法人"
+                placeholder="请输入项目法人单位"
               />
             </el-form-item>
           </el-col>
@@ -1026,7 +1026,7 @@ export default {
         projectLegalPerson: [
           {
             required: true,
-            message: "请输入项目法人",
+            message: "请输入项目法人单位",
             trigger: "blur",
           },
           { max: 250, message: "字符长度最大为250", trigger: "blur" },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/firmInfo.vue

@@ -17,7 +17,7 @@
     <el-row :gutter="25">
       <el-form :model="firmInfo" label-width="110px" label-position="top">
         <el-col :span="24">
-          <el-form-item label="项目法人">
+          <el-form-item label="项目法人单位">
             <el-input
               v-model="firmInfo.projectLegalPerson"
               :readonly="true"

jwtech-admin-page/src/views/building/projectInfo/projectProcess/index.vue

@@ -120,7 +120,7 @@
       </el-tab-pane>
       <el-tab-pane
         v-if="checkPermi(['building:jlgl:index'])"
-        label="监理管理"
+        label="建设监理"
         name="supervisionAndManagement"
         :disabled="!routeList[1].isEdit"
         :lazy="true"

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/clockingIn.vue

@@ -302,7 +302,6 @@
             icon="el-icon-download"
             size="mini"
             @click="importTemplate"
-            v-hasPermi="['build:attendance:importTemplate']"
             >模版下载</el-button
           >
           <span style="color: red; margin-left: 20px"

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/guaranteePaymentProjectFunds.vue

@@ -6,10 +6,10 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="单位名称" prop="enterpriseName">
+      <el-form-item label="提供担保单位名称" prop="enterpriseName">
         <el-input
           v-model="queryParams.cv.value"
-          placeholder="请输入单位名称"
+          placeholder="请输入提供担保单位名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -118,7 +118,7 @@
       />
 
       <el-table-column
-        label="单位名称"
+        label="提供担保单位名称"
         align="center"
         prop="enterpriseName"
         min-width="120"
@@ -248,11 +248,11 @@
       append-to-body
       :close-on-click-modal="false"
     >
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="单位名称" prop="enterpriseName">
+      <el-form ref="form" :model="form" :rules="rules" label-width="138px">
+        <el-form-item label="提供担保单位名称" prop="enterpriseName">
           <el-input
             v-model="form.enterpriseName"
-            placeholder="请输入单位名称"
+            placeholder="请输入提供担保单位名称"
           />
         </el-form-item>
         <el-form-item label="社会信用社代码" prop="socialCreditCode">
@@ -418,7 +418,15 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        enterpriseName: [
+          {
+            required: true,
+            message: "请输入提供担保单位名称",
+            trigger: "blur",
+          },
+        ],
+      },
       fileList: [],
     };
   },

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/specificMarginAccount.vue

@@ -23,7 +23,7 @@
           ></el-button>
         </el-input>
       </el-form-item>
-      <el-form-item label="账户开设时间" prop="accountsTime">
+      <el-form-item label="开户日期" prop="accountsTime">
         <el-date-picker
           clearable
           size="small"
@@ -31,7 +31,7 @@
           v-model="queryParams.data.accountsTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择账户开设时间"
+          placeholder="选择开户日期"
           @change="handleQuery"
         >
         </el-date-picker>
@@ -113,7 +113,7 @@
         fixed
       />
       <el-table-column
-        label="年月份"
+        label="人工费拨付日期"
         align="center"
         prop="yearMonthDate"
         min-width="120"
@@ -129,7 +129,7 @@
         min-width="120"
       />
       <el-table-column
-        label="账户开设时间"
+        label="开户日期"
         align="center"
         prop="accountsTime"
         min-width="120"
@@ -139,7 +139,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="开户行"
+        label="开户银行"
         align="center"
         prop="bank"
         min-width="120"
@@ -174,7 +174,7 @@
       </el-table-column>
 
       <el-table-column
-        label="余额（万元）"
+        label="账户余额（万元）"
         align="center"
         prop="balance"
         min-width="120"
@@ -224,7 +224,7 @@
       :close-on-click-modal="false"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <el-form-item label="年月份" prop="yearMonthDate">
+        <el-form-item label="人工费拨付日期" prop="yearMonthDate">
           <el-date-picker
             clearable
             size="small"
@@ -232,7 +232,7 @@
             v-model="form.yearMonthDate"
             type="month"
             value-format="yyyy-MM-dd"
-            placeholder="选择年月份"
+            placeholder="选择人工费拨付日期"
           >
           </el-date-picker>
         </el-form-item>
@@ -242,7 +242,7 @@
             placeholder="请输入专用账号"
           />
         </el-form-item>
-        <el-form-item label="账户开设时间" prop="accountsTime">
+        <el-form-item label="开户日期" prop="accountsTime">
           <el-date-picker
             clearable
             size="small"
@@ -250,12 +250,12 @@
             v-model="form.accountsTime"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择账户开设时间"
+            placeholder="选择开户日期"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="开户行" prop="bank">
-          <el-input v-model="form.bank" placeholder="请输入开户行" />
+        <el-form-item label="开户银行" prop="bank">
+          <el-input v-model="form.bank" placeholder="请输入开户银行" />
         </el-form-item>
         <el-form-item
           label="当月转入专用账户金额"
@@ -289,8 +289,12 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="余额" prop="balance">
-          <el-input v-model="form.balance" placeholder="请输入余额" readonly>
+        <el-form-item label="账户余额" prop="balance">
+          <el-input
+            v-model="form.balance"
+            placeholder="请输入账户余额"
+            readonly
+          >
             <template slot="append">万元</template>
           </el-input>
         </el-form-item>

jwtech-admin-page/src/views/building/projectInfo/projectProcess/qualityControl/index.vue

@@ -20,7 +20,7 @@
 
       <el-tab-pane
         v-if="checkPermi(['building:zlgl:xmhf'])"
-        label="项目划分"
+        label="工程项目划分"
         name="itemDivision"
         :lazy="true"
       >

jwtech-admin-page/src/views/evaluationEarlyWarning/earlyWarningManage/warning/options/warnMsg/index.vue

@@ -348,6 +348,13 @@
             placeholder="请输入经办人联系方式"
           />
         </el-form-item>
+        <el-form-item label="整改反馈" prop="feedback">
+          <el-input
+            v-model="warnForm.feedback"
+            placeholder="请输入整改反馈"
+            type="textarea"
+          />
+        </el-form-item>
         <el-form-item label="附件" prop="attachment">
           <el-upload
             class="upload-demo"
@@ -455,6 +462,14 @@
         <el-form-item label="经办人联系方式" prop="handlePhone">
           <el-input v-model="examineForm.handlePhone" placeholder="请输入" />
         </el-form-item> -->
+        <el-form-item label="整改反馈" prop="feedback">
+          <el-input
+            v-model="examineForm.feedback"
+            placeholder="请输入整改反馈"
+            type="textarea"
+            disabled
+          />
+        </el-form-item>
         <el-form-item label="审核人" prop="checkUser">
           <el-input
             v-model="examineForm.checkUser"
@@ -467,13 +482,6 @@
             placeholder="请输入审核人联系方式"
           />
         </el-form-item>
-        <el-form-item label="整改反馈" prop="feedback">
-          <el-input
-            v-model="examineForm.feedback"
-            placeholder="请输入整改反馈"
-            type="textarea"
-          />
-        </el-form-item>
 
         <!-- <el-form-item label="意见" prop="opinion">
           <el-input

jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/editPart.vue

@@ -454,6 +454,7 @@ export default {
       // 当前编辑的数据
       nowIndex: 0,
       updataType: "",
+      isFinishOptions: [],
     };
   },
   created() {
@@ -627,7 +628,7 @@ export default {
         this.fileList1 = JSON.parse(this.form.rectificationAttachment);
       }
       this.open = true;
-      this.title = "修改整改问题";
+      this.title = key === "XG" ? "修改问题" : "整改问题";
       // const id = row.id || this.ids;
       // getRectification(id).then((response) => {
       //   this.form = response.data;

jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/components/inspection.vue

@@ -173,7 +173,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-plus"
-                  @click="handleAdd(scope.row, 'SA')"
+                  @click="handleUpdate(scope.row, 'SA')"
                   v-hasPermi="[`warn:${auth}:childEdit`]"
                   >修改检查/新增问题</el-button
                 >
@@ -726,27 +726,29 @@ export default {
     handleAdd(row, keyType) {
       this.reset();
       this.keyType = keyType;
-      if (this.keyType === "SA") {
-        const id = row.id;
-        getInspections(id).then((response) => {
-          this.form = response.data;
-          this.form.projectName =
-            this.form.projectName + "[" + this.form.proCode + "]";
-          if (this.form.noticeAttachment) {
-            this.fileList1 = JSON.parse(this.form.noticeAttachment);
-          }
-          if (this.form.checklist) {
-            this.fileList2 = JSON.parse(this.form.checklist);
-          }
-          if (this.form.rectificationReport) {
-            this.fileList3 = JSON.parse(this.form.rectificationReport);
-          }
-        });
-      } else if (this.keyType === "FA") {
+      // if (this.keyType === "SA") {
+      //   const id = row.id;
+      //   getInspections(id).then((response) => {
+      //     this.form = response.data;
+      //     this.form.projectName =
+      //       this.form.projectName + "[" + this.form.proCode + "]";
+      //     if (this.form.noticeAttachment) {
+      //       this.fileList1 = JSON.parse(this.form.noticeAttachment);
+      //     }
+      //     if (this.form.checklist) {
+      //       this.fileList2 = JSON.parse(this.form.checklist);
+      //     }
+      //     if (this.form.rectificationReport) {
+      //       this.fileList3 = JSON.parse(this.form.rectificationReport);
+      //     }
+      //   });
+      // } else if (this.keyType === "FA") {
+      if (this.keyType === "FA") {
         this.form.projectName = row.projectName + "[" + row.proCode + "]";
         this.form.proNo = row.proNo;
         this.form.proCode = row.proCode;
       }
+      // }
       this.open = true;
       this.title = "添加" + this.memuTitle;
     },

jwtech-admin-page/src/views/evaluationEarlyWarning/supervisionInspection/qualityInspection/index.vue

@@ -20,12 +20,12 @@ export default {
   data() {
     return {
       menuType: "1",
-      memuTitle: "质量检查",
+      memuTitle: "质量管理监督检查",
       // 面包屑，路由信息
       routeList: [
         {
           path: "/evaluationEarlyWarning/supervisionInspection/qualityInspection",
-          routeName: "质量检查",
+          routeName: "质量管理监督检查",
         },
       ],
       auth: "qualityInspection",

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

@@ -283,8 +283,9 @@ export default {
       // 面包屑，路由信息
       routeList: [
         {
-          path: "/project/bid",
-          routeName: "招投标管理",
+          // path: "/project/bid",
+          path: "/building/bid",
+          routeName: "招标投标",
         },
       ],
     };
@@ -350,14 +351,16 @@ export default {
     },
     openOptions() {
       this.routeList.push({
-        path: "/project/bid/options",
+        // path: "/project/bid/options",
+        path: "/building/bid/options",
         routeName: "招标基本信息",
         isEdit: false,
       });
       // 存储面包屑信息
       this.$store.commit("setRouteList", JSON.stringify(this.routeList));
       this.$router.push({
-        path: "/project/bid/options",
+        // path: "/project/bid/options",
+        path: "/building/bid/options",
       });
     },
     /** 查询项目前期背景信息列表 */
@@ -439,7 +442,8 @@ export default {
       const id = row.id || this.ids;
       // getProjectinfo(id).then((response) => {
       this.routeList.push({
-        path: "/project/bid/options",
+        // path: "/project/bid/options",
+        path: "/building/bid/options",
         routeName: "招标计划",
         isEdit: true,
       });
@@ -451,7 +455,8 @@ export default {
       // 跳转到选项卡页面
       this.$router.push({
         // path: "/project/special/options",
-        path: "/project/bid/options?baseDataId=" + id,
+        // path: "/project/bid/options?baseDataId=" + id,
+        path: "/building/bid/options?baseDataId=" + id,
       });
       // });
     },

jwtech-admin-page/src/views/projectStatistics/projectStatisticsInvest/index.vue

@@ -316,6 +316,7 @@ export default {
       listProjectInvest(this.queryParams).then((res) => {
         this.infoList = res.records;
         // console.log(77777, res);
+        this.total = res.total;
         this.loading = false;
       });
     },

jwtech-admin-page/src/views/projectStatistics/projectStatisticsMsg/index.vue

@@ -249,6 +249,7 @@ export default {
       listProjectProgressBy(this.queryParams).then((res) => {
         this.infoList = res.records;
         // console.log(77777, res);
+        this.total = res.total;
         this.loading = false;
       });
     },

jwtech-admin-page/src/views/projectStatistics/projectStatisticsProgress/index.vue

@@ -246,6 +246,7 @@ export default {
       listProjectProgress(this.queryParams).then((res) => {
         this.infoList = res.records;
         // console.log(77777, res);
+        this.total = res.total;
         this.loading = false;
       });
     },