增加项目编号

neim-biz/src/main/java/com/jiayue/biz/domain/ProjectBasicInfo.java

@@ -34,5 +34,6 @@ public class ProjectBasicInfo {
     private String TPowerGeneration;
     //项目理论有效小时数
     private String TAvailableHours;
-
+    //项目编号
+    private String projectNo;
 }

neim-biz/src/main/java/com/jiayue/biz/dto/ProjectDto.java

@@ -41,5 +41,6 @@ public class ProjectDto {
     private String TPowerGeneration;
     //项目理论有效小时数
     private String TAvailableHours;
-
+    //项目编号
+    private String projectNo;
 }

neim-biz/src/main/java/com/jiayue/biz/service/impl/ProjectServiceImpl.java

@@ -73,6 +73,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 projectDto.setWd(projectInfo.getProjectBasicInfo().getWd());
                 projectDto.setTAvailableHours(projectInfo.getProjectBasicInfo().getTAvailableHours());
                 projectDto.setTPowerGeneration(projectInfo.getProjectBasicInfo().getTPowerGeneration());
+                projectDto.setProjectNo(projectInfo.getProjectBasicInfo().getProjectNo());
                 if (projectInfo.getProjectBasicInfo().getPosition() != null && !projectInfo.getProjectBasicInfo().getPosition().equals("")) {
                     String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
                     projectDto.setLongitude(split[0]);
@@ -222,6 +223,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         projectBasicInfo.setWd(projectDto.getWd());
         projectBasicInfo.setTAvailableHours(projectDto.getTAvailableHours());
         projectBasicInfo.setTPowerGeneration(projectDto.getTPowerGeneration());
+        projectBasicInfo.setProjectNo(projectDto.getProjectNo());
         if (projectDto.getLongitude() != null && projectDto.getLatitude() != null) {
             if (projectDto.getLongitude().equals("") && projectDto.getLatitude().equals("")) {
                 projectBasicInfo.setPosition("");

neim-ui/src/views/dataQuery/project/index.vue

@@ -24,7 +24,10 @@
         </el-button>
       </div>
 
-      <el-table v-loading="loading" border :data="projectList.slice((page.currentPage-1)*page.pageSize,page.currentPage*page.pageSize)" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" border
+                :data="projectList.slice((page.currentPage-1)*page.pageSize,page.currentPage*page.pageSize)"
+                @selection-change="handleSelectionChange">
+        <el-table-column label="项目编号" width="80" align="center" prop="projectNo"/>
         <el-table-column label="项目全称" align="center" prop="projectName"/>
         <el-table-column label="项目简称" align="center" prop="projectNameEasy"/>
         <el-table-column label="项目状态" align="center" prop="projectState"/>
@@ -70,22 +73,31 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row :gutter="20" class="mb8">
           <el-col :span="12">
+            <el-form-item label="项目编号" prop="projectNo">
+              <el-input v-model="form.projectNo" placeholder="请输入项目名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="项目全称" prop="projectName">
               <el-input v-model="form.projectName" placeholder="请输入项目名称"/>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目简称" prop="projectNameEasy">
               <el-input v-model="form.projectNameEasy" placeholder="请输入项目简称"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目状态" prop="projectState">
               <el-input v-model="form.projectState" placeholder="请输入项目状态"/>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目类别" prop="projectType">
               <el-select v-model="form.projectType" placeholder="请选择" style="width: 100%" clearable>
@@ -98,8 +110,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目类型" prop="projectSort">
               <el-select v-model="form.projectSort" placeholder="请选择" style="width: 100%" clearable>
@@ -112,6 +122,9 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="关联设备" prop="equipment">
               <el-select v-model="form.equipment" placeholder="请选择" style="width: 100%" multiple clearable>
@@ -125,40 +138,37 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目经度" prop="longitude">
               <el-input v-model="form.longitude" placeholder="请输入经度"/>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目纬度" prop="latitude">
               <el-input v-model="form.latitude" placeholder="请输入纬度"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目理论主风向" prop="wd" label-width="120px">
               <el-input v-model="form.wd" placeholder="请输入主风向"/>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目理论发电量" prop="tpowerGeneration" label-width="120px">
               <el-input v-model="form.tpowerGeneration" placeholder="请输入理论发电量"/>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20" class="mb8">
           <el-col :span="12">
             <el-form-item label="项目理论有效小时数" prop="tavailableHours" label-width="150px">
               <el-input v-model="form.tavailableHours" placeholder="请输入理论有效小时数"/>
             </el-form-item>
           </el-col>
-
-
-
         </el-row>
         <el-form-item label="项目拐点坐标" prop="coordinates" label-width="100px">
           <el-input v-model="form.coordinates" placeholder="请输入项目拐点坐标" type="textarea" :rows="2"/>
@@ -192,6 +202,7 @@ import {
 import {listAllDisabled} from "@/api/biz/dataQuery/windTowerStatusInfo";
 import {companyListInfo} from "@/api/biz/dataQuery/company";
 import {getPointMap} from "@/api/biz/dataQuery/largeScreenPage";
+
 export default {
   name: "Project",
   data() {
@@ -362,6 +373,7 @@ export default {
     reset() {
       this.form = {
         id: null,
+        projectNo: null,
         projectName: null,
         projectNameEasy: null,
         projectState: null,
@@ -372,9 +384,9 @@ export default {
         resourcesOverview: null,
         projectOverview: null,
         equipment: null,
-        wd:null,
-        tpowerGeneration:null,
-        tavailableHours:null
+        wd: null,
+        tpowerGeneration: null,
+        tavailableHours: null
       };
       this.resetForm("form");
     },
@@ -411,6 +423,7 @@ export default {
       }
       this.form = {
         id: row.id,
+        projectNo: row.projectNo,
         projectName: row.projectName,
         projectNameEasy: row.projectNameEasy,
         projectState: row.projectState,
@@ -421,10 +434,10 @@ export default {
         resourcesOverview: row.resourcesOverview,
         projectOverview: row.projectOverview,
         equipment: a,
-        coordinates:row.coordinates,
-        wd:row.wd,
-        tpowerGeneration:row.tpowerGeneration,
-        tavailableHours:row.tavailableHours
+        coordinates: row.coordinates,
+        wd: row.wd,
+        tpowerGeneration: row.tpowerGeneration,
+        tavailableHours: row.tavailableHours
       }
       this.title = "修改&保存";
       this.open = true;
@@ -472,7 +485,7 @@ export default {
     //     ...this.queryParams
     //   }, `project_${new Date().getTime()}.xlsx`)
     // },
-    getPoint(){
+    getPoint() {
       getPointMap().then(res => {
         sessionStorage.setItem("allPointInfo", JSON.stringify({info: res.data}))
         this.$store.dispatch('equipmentInfo/allPointInfo', JSON.stringify({info: res.data}))

neim-ui/src/views/largeScreenPage/Subpage/preProjectResources.vue

@@ -96,7 +96,7 @@
                 referrerpolicy="no-referrer"
                 src="../../../assets/largeScreenImg/index/tiltleLeftSign.png"
               />
-              一类项目
+              A类项目
             </span>
           <div class="dialogInfo">
             <p class="pInfo" v-for="item in projectOne" @click="projectNameClick(item)">{{ item.projectSort }}</p>
@@ -109,27 +109,27 @@
                 referrerpolicy="no-referrer"
                 src="../../../assets/largeScreenImg/index/tiltleLeftSign.png"
               />
-              二类项目
+              B类项目
             </span>
           <div class="dialogInfo">
             <p class="pInfo" v-for="item in projectTwo" @click="projectNameClick(item)">{{ item.projectSort }}</p>
           </div>
         </div>
 
-        <div class="projectInfoBox">
-            <span class="dialogInfoTitle">
-              <img
-                class="tiltleLeftSign"
-                referrerpolicy="no-referrer"
-                src="../../../assets/largeScreenImg/index/tiltleLeftSign.png"
-              />
-              三类备选
-            </span>
-          <div class="dialogInfo">
-            <p class="pInfo" v-for="item in projectThree" @click="projectNameClick(item)">{{ item.projectSort }}</p>
-          </div>
-
-        </div>
+<!--        <div class="projectInfoBox">-->
+<!--            <span class="dialogInfoTitle">-->
+<!--              <img-->
+<!--                class="tiltleLeftSign"-->
+<!--                referrerpolicy="no-referrer"-->
+<!--                src="../../../assets/largeScreenImg/index/tiltleLeftSign.png"-->
+<!--              />-->
+<!--              三类备选-->
+<!--            </span>-->
+<!--          <div class="dialogInfo">-->
+<!--            <p class="pInfo" v-for="item in projectThree" @click="projectNameClick(item)">{{ item.projectSort }}</p>-->
+<!--          </div>-->
+
+<!--        </div>-->
       </div>
     </div>
   </div>
@@ -507,10 +507,10 @@ export default {
   background: url(../../../assets/largeScreenImg/zaiyunAndqianqi/dialogBg.png) 100% no-repeat;
   background-size: 100% 100%;
   padding: 1%;
-  width: 55%;
+  width: 35%;
   position: absolute;
-  top: 10%;
-  left: 20%;
+  top: 15%;
+  left: 30%;
   z-index: 100001;
 }
 
@@ -535,7 +535,7 @@ export default {
 
 .projectInfoBox {
   margin-top: 2%;
-  width: 34%;
+  width: 50%;
 }
 
 .dialogInfo {

neim-ui/src/views/largeScreenPage/Subpage/projectEvolve.vue

@@ -34,11 +34,11 @@
               prop="taskContent"  width="210"
               label="工作内容" align="center">
             </el-table-column>
-            <el-table-column
-              prop="planTime"
-              label="计划完成时间"
-              width="150" align="center">
-            </el-table-column>
+<!--            <el-table-column-->
+<!--              prop="planTime"-->
+<!--              label="计划完成时间"-->
+<!--              width="150" align="center">-->
+<!--            </el-table-column>-->
             <el-table-column
               prop="detailedTaskContent"
               label="详细工作内容">
@@ -120,7 +120,8 @@ export default {
     },
     // 合并单元格
     handleSpanMethod({rowIndex, columnIndex}) {
-      if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
+      // if (columnIndex === 0 || columnIndex === 1 || columnIndex === 2) {
+      if (columnIndex === 0 || columnIndex === 1 ) {
         const _row = this.spanArr[rowIndex];
         const _col = _row > 0 ? 1 : 0;
         return {