页面

wrdep-ui/src/views/dataManagement/dataIntegrity/index.vue

@@ -18,7 +18,7 @@
       </el-button>
     </div>
     <div class="mainBox">
-      <el-table :data="tableData" :cell-style="myclass" border style="width: 100%;margin-top: .5%"
+      <el-table :data="tableData.slice((page.currentPage-1)*page.pageSize,page.currentPage*page.pageSize)" :cell-style="myclass" border style="width: 100%;margin-top: .5%"
                 v-loading="loading">
         <el-table-column prop="mouth" label="月/日" align="center"></el-table-column>
         <el-table-column prop="01" label="1" align="center" width="50%"></el-table-column>
@@ -53,6 +53,17 @@
         <el-table-column prop="30" label="30" align="center" width="50%"></el-table-column>
         <el-table-column prop="31" label="31" align="center" width="50%"></el-table-column>
       </el-table>
+      <div class="block" style="float: right">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page=page.currentPage
+          :page-sizes="[12, 24, 36, 48]"
+          :page-size=page.pageSize
+          layout="total, sizes, prev, pager, next, jumper"
+          :total=page.total>
+        </el-pagination>
+      </div>
     </div>
   </el-card>
 </template>
@@ -70,6 +81,11 @@ export default {
       cftId: '',
       cftData: '',
       startDateAndEndDate: '',
+      page: {
+        total: 0, // 总页数
+        currentPage: 1, // 当前页数
+        pageSize: 12 // 每页显示多少条
+      },
     }
   },
   mounted() {
@@ -122,6 +138,15 @@ export default {
         }
       }
     },
+    /*pageSize改变*/
+    handleSizeChange(val) {
+      this.page.pageSize = val
+      this.page.currentPage = 1
+    },
+    /*currentPage改变*/
+    handleCurrentChange(val) {
+      this.page.currentPage = val
+    },
   }
 }
 </script>

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

@@ -28,11 +28,10 @@
         <el-table-column label="项目全称" align="center" prop="projectName"/>
         <el-table-column label="项目简称" align="center" prop="projectNameEasy"/>
         <el-table-column label="项目状态" align="center" prop="projectState"/>
-        <el-table-column label="项目类别" align="center" prop="projectType"/>
         <el-table-column label="项目类型" align="center" prop="projectSort" :formatter="formatSort"/>
         <el-table-column label="经度" align="center" prop="longitude"/>
         <el-table-column label="纬度" align="center" prop="latitude"/>
-        <el-table-column label="关联设备" align="center" prop="equipment"/>
+        <el-table-column label="关联设备" align="center" prop="relationEquipment" :formatter="formatEquipment"/>
 
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template slot-scope="scope">
@@ -86,18 +85,18 @@
               <el-input v-model="form.projectState" placeholder="请输入项目状态"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="项目类别" prop="projectType">
-              <el-select v-model="form.projectType" placeholder="请选择" style="width: 100%" clearable>
-                <el-option
-                  v-for="(item,index) in statusType"
-                  :key="index"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="项目类别" prop="projectType">-->
+<!--              <el-select v-model="form.projectType" placeholder="请选择" style="width: 100%" clearable>-->
+<!--                <el-option-->
+<!--                  v-for="(item,index) in statusType"-->
+<!--                  :key="index"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row :gutter="20" class="mb8">
           <el-col :span="12">
@@ -113,8 +112,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="关联设备" prop="equipment">
-              <el-select v-model="form.equipment" placeholder="请选择" style="width: 100%" multiple clearable>
+            <el-form-item label="关联设备" prop="relationEquipment">
+              <el-select v-model="form.relationEquipment" placeholder="请选择" style="width: 100%" multiple clearable>
                 <el-option
                   v-for="item in relationEquipmentData"
                   :key="item.value"
@@ -138,16 +137,16 @@
             </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"/>
-          <span>拐点坐标填写样例：经度1,纬度1;经度2,纬度2;经度3,纬度3;经度4,纬度4;............;经度n,纬度n   标点符号","和";"都是英文书写</span>
-        </el-form-item>
-        <el-form-item label="项目概述" prop="projectOverview" label-width="100px">
-          <el-input v-model="form.projectOverview" placeholder="请输入项目概述" type="textarea" :rows="2"/>
-        </el-form-item>
-        <el-form-item label="项目风力概述" prop="resourcesOverview" label-width="110px">
-          <el-input v-model="form.resourcesOverview" placeholder="请输入项目风力概述" type="textarea" :rows="2"/>
-        </el-form-item>
+<!--        <el-form-item label="项目拐点坐标" prop="coordinates" label-width="100px">-->
+<!--          <el-input v-model="form.coordinates" placeholder="请输入项目拐点坐标" type="textarea" :rows="2"/>-->
+<!--          <span>拐点坐标填写样例：经度1,纬度1;经度2,纬度2;经度3,纬度3;经度4,纬度4;............;经度n,纬度n   标点符号","和";"都是英文书写</span>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="项目概述" prop="projectOverview" label-width="100px">-->
+<!--          <el-input v-model="form.projectOverview" placeholder="请输入项目概述" type="textarea" :rows="2"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="项目风力概述" prop="resourcesOverview" label-width="110px">-->
+<!--          <el-input v-model="form.resourcesOverview" placeholder="请输入项目风力概述" type="textarea" :rows="2"/>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -257,7 +256,7 @@ export default {
       statusType: [{label: "风", value: "风"},
         {label: "光", value: "光"}],
       statusSort: [{label: "一类", value: "one"},
-        {label: "二类", value: "tow"},
+        {label: "二类", value: "two"},
         {label: "三类", value: "three"},
         {label: "其他", value: "four"}],
       relationEquipmentData: [],
@@ -286,26 +285,7 @@ export default {
         this.$message.error('获取省份异常' + err)
       })
     },
-    formatEquipment(data) {
-      if (data !== null) {
-        var a = data.split(",");
-        var b = "";
-        if (a.length !== 0) {
-          for (let i = 0; i < a.length; i++) {
-            for (let k = 0; k < this.relationEquipmentData.length; k++) {
-              if (this.relationEquipmentData[k].value === a[i]) {
-                b += this.relationEquipmentData[k].label
-                if (i !== a.length - 1) {
-                  b += ","
-                }
-              }
-            }
-          }
-          return b;
-        }
-      }
 
-    },
     /*条件查询*/
     selectList() {
       if (this.projectName !== null && this.projectList !== undefined && this.projectList !== '')
@@ -343,13 +323,10 @@ export default {
         projectName: null,
         projectNameEasy: null,
         projectState: null,
-        projectType: null,
         projectSort: null,
         longitude: null,
         latitude: null,
-        resourcesOverview: null,
-        projectOverview: null,
-        equipment: null
+        relationEquipment: null
       };
       this.resetForm("form");
     },
@@ -380,23 +357,19 @@ export default {
       this.reset();
       const id = row.id || this.ids
       var a = null
-      if (row.equipment !== null) {
-        a = row.equipment.split(",")
-        a = a.length === 1 && a[0] === "" ? null : row.equipment.split(",")
+      if (row.relationEquipment !== null) {
+        a = row.relationEquipment.split(",")
+        a = a.length === 1 && a[0] === "" ? null : row.relationEquipment.split(",")
       }
       this.form = {
         id: row.id,
         projectName: row.projectName,
         projectNameEasy: row.projectNameEasy,
         projectState: row.projectState,
-        projectType: row.projectType,
         projectSort: row.projectSort,
         longitude: row.longitude,
         latitude: row.latitude,
-        resourcesOverview: row.resourcesOverview,
-        projectOverview: row.projectOverview,
-        equipment: a,
-        coordinates:row.coordinates
+        relationEquipment: a
       }
       this.title = "修改&保存";
       this.open = true;
@@ -404,8 +377,8 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        if (this.form.equipment !== null) {
-          this.form.equipment = this.form.equipment.toString()
+        if (this.form.relationEquipment !== null) {
+          this.form.relationEquipment = this.form.relationEquipment.toString()
         }
         if (valid) {
           if (this.form.id != null) {
@@ -445,6 +418,20 @@ export default {
     formatSort(row) {
       return this.statusSort.find(w => w.value === row.projectSort).label
     },
+    formatEquipment(row) {
+      if(row.relationEquipment.length>0){
+        let equipment = row.relationEquipment.split(',')
+        let relationEquipment = ''
+        for(let item of equipment){
+          let temp = this.relationEquipmentData.find(w=>w.value === item).label
+          relationEquipment = relationEquipment + temp
+        }
+        return relationEquipment
+      }else{
+        return row.relationEquipment
+      }
+
+    },
     /*pageSize改变*/
     handleSizeChange(val) {
       this.page.pageSize = val