版本管理

src/api/versionsCalendar.js

@@ -32,10 +32,11 @@ export function createVersion(data) {
   })
 }
 // 根据端类型获取所有版本
-export function listByType(type) {
+export function listByType(data) {
   return request({
-    url: mockUrl + `/Version/listByType?type=` + type,
-    method: 'get'
+    url: mockUrl + `/Version/listByType`,
+    method: 'post',
+    data
   })
 }
 

src/views/projectManage/taskList/versionsCalendar.vue

@@ -14,30 +14,28 @@
 
       <el-main class="bgborder" style=" margin: 0 2%;min-height: 120.5vh;padding:0 !important">
         <div style="margin: 1.9%; font-weight: 600; white-space: nowrap;"><b style="color: #409EFF;margin: 0 0.5%; font-size: 20px; ">I</b>版本日历 <el-button type="primary" size="mini" icon="el-icon-plus" style="float: right;" @click="adds()">添加版本事件</el-button></div>
-        <div class="bgColorSz">
-          <full-calendar :events="events" lang="zh" class="test-fc" first-day="1" locale="fr" style="width:100%"> />
-            <div id="calendar" style="height: 800px;" />
-          </full-calendar></div>
-
+        <full-calendar :events="events" lang="zh" c5ass="test-fc" first-day="1" locale="fr" style="width:100%"> />
+          <div id="calendar" style="height: 800px;" />
+        </full-calendar>
       </el-main>
 
-      <el-dialog title="版本管理" :visible.sync="dialogFormVisible" width="1100px">
+      <el-dialog title="版本管理" :visible.sync="dialogFormVisible" width="1180px">
         <el-dialog :title="dialogStatus" width="35%" :visible.sync="dialogCraeteVisible" append-to-body>
-          <div style="margin-left:30px">
+          <div style="margin-left:28px">
             <el-form ref="addVersionForms" :rules="addVersionDataRules" :model="addVersionData">
               <el-form-item label="版本号" prop="version">
                 <el-input v-model="addVersionData.version" placeholder="请填写" style="margin-left:7px;width:70%;" />
               </el-form-item>
             </el-form>
           </div>
-          <div style="margin-top:10%;margin-left:60%">
+          <div style="margin-top:10%;margin-left:58%">
             <el-button type="info" plain size="mini" @click="dialogCraeteVisible=false">取消</el-button>
             <el-button type="primary" size="mini" @click="addVersion(addVersionData)">确定</el-button>
           </div>
           <div style="margin-top:6%" />
         </el-dialog>
 
-        <el-dialog :title="dialogStatus" width="40%" :visible.sync="dialogEventVisible" append-to-body>
+        <el-dialog :title="dialogStatus" width="48%" :visible.sync="dialogEventVisible" append-to-body>
           <div style="margin-left:30px">
             <el-form ref="addEventForms" :rules="addEventDataRules" :model="addEventData">
               <el-form-item label="事件名称" prop="name">
@@ -56,7 +54,7 @@
               </el-form-item>
             </el-form>
           </div>
-          <div style="margin-top:10%;margin-left:60%">
+          <div style="margin-top:10%;margin-left:66%">
             <el-button type="info" plain size="mini" @click="dialogEventVisible=false">取消</el-button>
             <el-button type="primary" size="mini" @click="addEvents(addEventData)">确定</el-button>
           </div>
@@ -86,16 +84,16 @@
         </el-dialog>
 
         <div style="display:flex;margin-top:3%">
-          <div style="margin-left:7%">
+          <div style="margin-left:5%">
             <template>
               <div slot="footer" class="dialog-footer">
-                <el-button type="primary" style="margin-left:69.5%" @click="handleVersionadd()">添加版本</el-button>
+                <el-button type="primary" style="margin-left:76%" @click="handleVersionadd()">添加版本</el-button>
               </div>
               <el-table :data="tableData" fit highlight-current-row style="width: 100%;margin-top:3%" border :header-cell-style="{background:'#F0F2F4',color:'#606266'}" @row-click="cellBack">
-                <el-table-column prop="version" label="版本号" width="160%" align="center"><template slot-scope="scope"><span>{{ scope.row.version }}</span></template></el-table-column>
+                <el-table-column prop="version" label="版本号" width="220%" align="center"><template slot-scope="scope"><span>{{ scope.row.version }}</span></template></el-table-column>
                 <el-table-column
                   label="操作"
-                  width="160%"
+                  width="200%"
                   align="center"
                 >
                   <template slot-scope="{row}">
@@ -103,6 +101,13 @@
                   </template>
                 </el-table-column>
               </el-table>
+              <el-pagination
+                background
+                :page-size="pageSize"
+                layout="prev, pager, next"
+                :total="total"
+                @current-change="handleCurrentChange"
+              />
             </template>
           </div>
           <div style="margin-top:15%;margin-left:8%">   <el-button type="primary" icon="el-icon-arrow-right" circle /></div>
@@ -118,12 +123,6 @@
                   </div>
                 </div>
               </div>
-              <!-- <el-table
-                :data="tableData"
-                border
-                max-height="250"
-                style="width: 100%;margin-top:3%;"
-              > -->
               <el-table :data="tableData1" fit highlight-current-row style="width: 100%;margin-top:3%" border :header-cell-style="{background:'#F0F2F4',color:'#606266'}">
                 <el-table-column
                   prop="name"
@@ -149,14 +148,16 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-row style="margin-top:20%;margin-left:83%">
-                <el-button @click="getVersionList(),dialogFormVisible=false">关闭</el-button>
-                <!-- <el-button type="primary">确定</el-button> -->
-              </el-row>
+
               <div style="margin-top:20%;margin-left:50%" />
+
             </template>
           </div>
         </div>
+        <el-row style="margin-top:1%;margin-left:90%">
+          <el-button @click="getVersionList(),dialogFormVisible=false">关闭</el-button>
+          <!-- <el-button type="primary">确定</el-button> -->
+        </el-row>
       </el-dialog>
     </el-container>
   </div>
@@ -186,8 +187,6 @@ export default {
       pauseVersionCallBack: '',
       userInformation: localStorage.getItem('username'),
       userName: localStorage.getItem('realname'),
-      curIndex: 1,
-      pageSize: 15,
       isCommand: '',
       options: [],
       value1: [],
@@ -203,7 +202,7 @@ export default {
       dialogDeleteVerVisible: false,
       dialogDeleteEveVisible: false,
       formLabelWidth: '100px',
-      currentPage: 0,
+
       eventData: [],
       dialogStatus: '',
       versionNum: '',
@@ -217,6 +216,7 @@ export default {
       addEveData: {},
       clientType: '',
       deleteVer: {},
+      red: 'red',
       items: [
         { type: '' },
         { type: 'success' },
@@ -229,6 +229,9 @@ export default {
       user: {},
       deleteEve: {},
       typeOpt: [],
+      pageSize: 5,
+      curIndex: 1,
+      total: 0,
       orginName: '代驾乘客端',
       orginType: 1,
       addVersionData: {
@@ -289,11 +292,11 @@ export default {
     },
     handleSizeChange(size) { //  分页
       this.pageSize = size
-      // this.get_list()
+      this.getVersionBytpye(this.isCommand === '' ? 1 : this.isCommand)
     },
     handleCurrentChange(curIndex) { //  分页
       this.curIndex = curIndex
-      // this.get_list()
+      this.getVersionBytpye(this.isCommand === '' ? 1 : this.isCommand)
     },
     formatDate(e) {
       return dayjs(e).format('YYYY-MM-DD')
@@ -331,7 +334,7 @@ export default {
         event.title = this.eventData[j].version + this.eventData[j].name
         event.start = this.formatDate(this.eventData[j].startTime)
         event.end = this.formatDate(this.eventData[j].endTime)
-        event.backgroundColor = 'red'
+        event.cssClass = this.red
         this.events.push(event)
       }
       console.log(this.events)
@@ -347,8 +350,14 @@ export default {
     },
     // 获取所有版本
     getVersionBytpye(ele) {
-      listByType(ele).then(response => {
-        this.tableData = response.data
+      var queryVersionRequest = {}
+      // queryVersionRequest.ids = [ele]
+      queryVersionRequest.pageSize = this.pageSize
+      queryVersionRequest.curIndex = this.curIndex
+      queryVersionRequest.type = ele
+      listByType(queryVersionRequest).then(response => {
+        this.tableData = response.data.list
+        this.total = response.data.total
         this.tableData.version = response.data.version
       })
     },