终极适配 分页bug

src/views/Platform/bugManage/bugCreate.vue

@@ -7,7 +7,7 @@
           <div class="line-between">
             <el-form-item label="类型" prop="bugType" label-width="124px">
               <el-select v-model="form.bugType" style="width:76%;" placeholder="类型">
-                <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.code" />
+                <el-option v-for="item in bugTypeStr" :key="item.code" :label="item.name" :value="item.code" />
               </el-select>
             </el-form-item>
             <el-form-item label="所处阶段" prop="stage" label-width="147px">
@@ -217,8 +217,8 @@ export default {
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
         platformType: [{ required: true, message: '平台类型不能为空', trigger: 'change' }],
         stage: [{ required: true, message: '所处阶段不能为空', trigger: 'change' }],
-        assigner: [{ required: true, message: 'bug责任人不能为空', trigger: 'blur' }],
-        currentHandler: [{ required: true, message: 'bug处理人不能为空', trigger: 'blur' }],
+        assigner: [{ required: true, message: 'bug责任人不能为空', trigger: 'change' }],
+        currentHandler: [{ required: true, message: 'bug处理人不能为空', trigger: 'change' }],
         bugDescribe: [{ required: true, message: 'bug描述不能为空', trigger: 'change' }],
         clientType: [{ required: true, message: '业务模块不能为空', trigger: 'change' }]
       },
@@ -239,6 +239,9 @@ export default {
     this.bugListSelect()
     this.forkDown()
   },
+  mounted() {
+    this.$refs.form.resetFields()
+  },
   methods: {
     createdDis() {
       this.dis = true

src/views/Platform/bugManage/bugQuery.vue

@@ -94,7 +94,7 @@
     <el-dialog :visible.sync="dialogInDevelopment" width="40%" @close="cancelInput()">
       <el-form ref="refeshDevelopmentDialog" :model="pauseData" :rules="serviceDataRules">
         <el-form-item label="开发RD" prop="pauseCurrentHandler" label-width="30%">
-          <el-select v-model="pauseData.pauseCurrentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+          <el-select v-model="pauseData.pauseCurrentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
             <el-option
               v-for="item in optionsCurrentHandlerRD"
               :key="item.id"
@@ -112,7 +112,7 @@
     <el-dialog :visible.sync="dialogWaitTest" width="40%" @close="cancelInput()">
       <el-form ref="refeshWaitTestDialog" :model="pauseData" :rules="serviceDataRules">
         <el-form-item label="验收QA" prop="pauseCurrentHandler" label-width="30%">
-          <el-select v-model="pauseData.pauseCurrentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;">
+          <el-select v-model="pauseData.pauseCurrentHandler" multiple filterable placeholder="公司邮箱前缀" style="width:76%;" @visible-change="realTimeChange">
             <el-option
               v-for="item in optionsCurrentHandlerQA"
               :key="item.id"
@@ -128,7 +128,7 @@
         </el-form-item>
         <el-form-item style="flex-grow:1" label="bug类型" prop="bugTypePause" label-width="30%">
           <el-select v-model="pauseData.bugTypePause" placeholder="bug类型" style="width:76%;">
-            <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.code" />
+            <el-option v-for="item in bugTypeStr" :key="item.code" :label="item.name" :value="item.code" />
           </el-select>
         </el-form-item>
         <el-form-item label="修复方式" prop="pauseReasonsAndSolutionForTheProblem" label-width="30%"><el-input v-model="pauseData.pauseReasonsAndSolutionForTheProblem" type="textarea" autocomplete="off" rows="3" style="width:76%;" /></el-form-item>
@@ -304,6 +304,10 @@ export default {
         this.formUpdateValue = {}
       }
     },
+    // 点击一次更新一次
+    realTimeChange(e) {
+      if (e === true) this.getMember()
+    },
     // 人员搜索
     getMember(role) {
       const objDataCurrentHandler = { bizId: this.form.bizId, email: '', role: role }

src/views/Platform/bugManage/bugUpdate.vue

@@ -7,7 +7,7 @@
           <div class="line-between">
             <el-form-item label="类型" prop="bugType" label-width="124px">
               <el-select v-model="form.bugType" style="width:76%;" placeholder="类型">
-                <el-option v-for="item in bugTypeStr" :key="item.name" :label="item.name" :value="item.code" />
+                <el-option v-for="item in bugTypeStr" :key="item.code" :label="item.name" :value="item.code" />
               </el-select>
             </el-form-item>
             <el-form-item label="所处阶段" prop="stage" label-width="147px">

src/views/Platform/defectManagement.vue

@@ -413,7 +413,7 @@ export default {
       userNames: localStorage.getItem('realname'),
       bizJson: localStorage.getItem('key'),
       pageSize: 20,
-      curIndex: 0,
+      curIndex: 1,
       total: 0,
       show2: '',
       form: {
@@ -445,6 +445,7 @@ export default {
     this.bugListSelect()
   },
   mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
     this.getQueryData()
   },
   methods: {
@@ -489,7 +490,7 @@ export default {
     dataQuery(e) {
       this.bizJson = localStorage.getItem('key')
       this.indexPage = e
-      this.curIndex = 0
+      this.curIndex = 1
       this.indexPage.bizId = this.bizJson
       this.indexPage.pageSize = this.pageSize
       this.indexPage.curIndex = this.curIndex
@@ -512,6 +513,13 @@ export default {
       this.indexPage.bizId = this.bizJson
       this.indexPage.pageSize = this.pageSize
       this.indexPage.curIndex = this.curIndex
+      if (this.timeShow) {
+        this.indexPage.gmtCreateBegin = this.timeInterval[0]
+        this.indexPage.gmtCreateEnd = this.timeInterval[1]
+      } else {
+        this.indexPage.gmtCreateBegin = ''
+        this.indexPage.gmtCreateEnd = ''
+      }
       bugList(this.indexPage).then(res => {
         this.tableData = res.data
         this.total = res.total
@@ -651,7 +659,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 700px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/projectManage/projectList/projectCreate.vue

@@ -3,7 +3,7 @@
     <div class="block">
       <el-form ref="form" :model="form" :rules="serviceDataRules">
         <div class="block-flex">
-          <el-form-item label="项目名称" prop="name" label-width="110px"><el-input v-model="form.name" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:90%;" /></el-form-item>
+          <el-form-item label="项目名称" prop="name" label-width="112px"><el-input v-model="form.name" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:89.6%;" /></el-form-item>
           <div class="line-between">
             <el-form-item label="业务线" prop="bizId" label-width="124px">
               <el-select v-model="form.bizId" style="width:76%;" placeholder="请选择" @change="clickChangePlatform(form.bizId)">
@@ -80,12 +80,12 @@
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item label="需求文档" label-width="110px"><el-input v-model="form.mrdUrl" placeholder="请填写" style="width:90%;" /></el-form-item>
-          <el-form-item label="描述" label-width="110px"><el-input v-model="form.description" type="textarea" placeholder="请填写" rows="3" style="width:90%;" /></el-form-item>
-          <el-form-item label="详细信息" label-width="110px">
-            <div id="wangeditor" class="force-height" style="margin-bottom:22px;width:90%;" />
+          <el-form-item label="需求文档" label-width="112px"><el-input v-model="form.mrdUrl" placeholder="请填写" style="width:89.6%;" /></el-form-item>
+          <el-form-item label="描述" label-width="112px"><el-input v-model="form.description" type="textarea" placeholder="请填写" rows="3" style="width:89.6%;" /></el-form-item>
+          <el-form-item label="详细信息" label-width="112px">
+            <div id="wangeditor" class="force-height" style="margin-bottom:22px;width:89.6%;" />
           </el-form-item>
-          <el-form-item label="备注" label-width="110px"><el-input v-model="form.remarks" type="textarea" placeholder="请填写" rows="3" style="width:90%;" /></el-form-item>
+          <el-form-item label="备注" label-width="112px"><el-input v-model="form.remarks" type="textarea" placeholder="请填写" rows="3" style="width:89.6%;" /></el-form-item>
           <el-form-item class="submit">
             <el-button type="danger" plain size="mini" @click="$router.go(-1)">取 消</el-button>
             <el-button class="move-button" size="mini" type="primary" @click="createFormData(form)">确 定</el-button>
@@ -132,9 +132,9 @@ export default {
         status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
         name: [{ required: true, message: '项目名称不能为空', trigger: 'change' }],
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
-        pm: [{ required: true, message: '产品人员不能为空', trigger: 'blur' }],
-        rd: [{ required: true, message: '开发人员不能为空', trigger: 'blur' }],
-        qa: [{ required: true, message: '测试人员不能为空', trigger: 'blur' }]
+        pm: [{ required: true, message: '产品人员不能为空', trigger: 'change' }],
+        rd: [{ required: true, message: '开发人员不能为空', trigger: 'change' }],
+        qa: [{ required: true, message: '测试人员不能为空', trigger: 'change' }]
         // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }]
       }
     }
@@ -148,6 +148,8 @@ export default {
     }
   },
   mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+    this.$refs.form.resetFields()
     if (!this.$route.query.id) {
       const editor = new E('#wangeditor')
       editor.customConfig.menus = ['bold', 'italic', 'underline', 'link', 'list', 'justify', 'table', 'foreColor']
@@ -298,7 +300,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 700px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/projectManage/projectList/projectListIndex.vue

@@ -61,6 +61,14 @@
                 <div>
                   <el-button size="mini" type="primary" plain @click="projectShowData(scope.row.id)">编辑</el-button>
                   <el-button size="mini" type="danger" plain @click="dialogBug(scope.row.id)">删除</el-button>
+                  <el-dropdown style="margin-left:10px" trigger="click">
+                    <el-button size="mini" type="primary">···</el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item icon="el-icon-coin" @click.native="createDailyReport(scope.row)">新建日报报告</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-coin" @click.native="createReport(scope.row)">新建准出报告</el-dropdown-item>
+                      <el-dropdown-item icon="el-icon-coin" @click.native="changeaddTaskData(scope.row)">新建任务</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
                   <el-dialog
                     :visible.sync="dialogVisible"
                     width="30%"
@@ -75,7 +83,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @current-change="handleCurrentChange" />
         </div>
       </div>
     </div>
@@ -97,6 +105,7 @@ export default {
       curIndex: 1,
       pageSize: 20,
       total: 0,
+      pauseJumpData: {},
       dialogVisible: false,
       statusOptionss: [],
       pauseId: '',
@@ -108,6 +117,9 @@ export default {
   created() {
     this.getList()
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+  },
   methods: {
     // id Bug
     dialogBug(e) {
@@ -141,6 +153,18 @@ export default {
       })
     },
     dataQuery(queryCode) {
+      this.Arra = []
+      this.curIndex = 1
+      queryCode.statusString !== '' ? this.Arra.push(queryCode.statusString) : ''
+      queryCode.status = this.Arra
+      queryCode.bizId = localStorage.getItem('key')
+      queryCode.pageSize = this.pageSize
+      queryCode.curIndex = this.curIndex
+      projectInit(queryCode).then(res => {
+        res.code === 200 ? this.list = res.data : this.errorFun(res.msg)
+      })
+    },
+    dataQueryInSearch(queryCode) {
       this.Arra = []
       queryCode.statusString !== '' ? this.Arra.push(queryCode.statusString) : ''
       queryCode.status = this.Arra
@@ -151,6 +175,22 @@ export default {
         res.code === 200 ? this.list = res.data : this.errorFun(res.msg)
       })
     },
+    // 新建日报报告
+    createDailyReport(scope) {
+      this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { projectId: scope }})
+    },
+    // 新建准出报告
+    createReport(scope) {
+      if (scope.platFormString !== '服务端') {
+        this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { projectId: scope }}) // 客户端
+      } else {
+        this.$router.push({ path: '/Platform/presentation/Acceptance', query: { projectId: scope }}) // 服务端
+      }
+    },
+    // 任务创建
+    changeaddTaskData(scope) {
+      this.$router.push({ name: '任务创建', query: { id: scope.id }})
+    },
     projectShow(e) {
       this.$router.push({ name: '项目查看', query: { id: e }})
     },
@@ -160,11 +200,9 @@ export default {
     createdCode() {
       this.$router.push({ name: '项目创建' })
     },
-    handleSizeChange(size) {
-      this.pageSize = size
-    },
     handleCurrentChange(curIndex) {
       this.curIndex = curIndex
+      this.dataQueryInSearch(this.queryCode)
     },
     successFun(successText) {
       this.$notify({ title: 'Success', message: `${successText} Successfully`, type: 'success', duration: 2000 })
@@ -182,7 +220,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 700px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/projectManage/projectList/projectPreview.vue

@@ -251,6 +251,9 @@ export default {
     this.bugListSelect()
     this.idDetail()
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+  },
   methods: {
     deleteTaskDataOut(e) {
       this.deleteTaskDialogVisible = true
@@ -386,7 +389,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 1000px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)
@@ -401,7 +404,7 @@ export default {
       width 100%
       margin 25px 0
       padding 10px 30px
-      height calc(100vh - 425px)
+      height calc(100vh - 482px)
     .block-end >>> th
       background-color #F0F2F4 !important
     .block-end >>> .el-tabs__nav-wrap::after

src/views/projectManage/taskList/taskCreate.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="serviceDataRules">
       <div class="block">
         <div class="block-flex">
-          <el-form-item label="任务名称" prop="name" label-width="110px"><el-input v-model="form.name" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:90%;" /></el-form-item>
+          <el-form-item label="任务名称" prop="name" label-width="112px"><el-input v-model="form.name" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:89.6%;" /></el-form-item>
           <div class="line-between">
             <el-form-item label="优先级" prop="priority" label-width="124px">
               <el-select v-model="form.priority" style="width:76%;" placeholder="请选择">
@@ -52,8 +52,8 @@
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item label="需求文档" label-width="110px"><el-input v-model="form.mrdUrl" placeholder="请填写" style="width:90%;" /></el-form-item>
-          <el-form-item label="技术文档" label-width="110px"><el-input v-model="form.devUrl" placeholder="请填写" style="width:90%;" /></el-form-item>
+          <el-form-item label="需求文档" label-width="112px"><el-input v-model="form.mrdUrl" placeholder="请填写" style="width:89.6%;" /></el-form-item>
+          <el-form-item label="技术文档" label-width="112px"><el-input v-model="form.devUrl" placeholder="请填写" style="width:89.6%;" /></el-form-item>
           <!-- <el-form-item class="submit">
             <el-button type="danger" plain size="mini" @click="$router.go(-1)">取 消</el-button>
             <el-button class="move-button" size="mini" type="primary" @click="createFormData(form)">保 存</el-button>
@@ -104,7 +104,7 @@
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item label="描述" label-width="110px"><el-input v-model="form.description" type="textarea" placeholder="bug描述" rows="3" style="width:90%;" /></el-form-item>
+          <el-form-item label="描述" label-width="112px"><el-input v-model="form.description" type="textarea" placeholder="bug描述" rows="3" style="width:89.6%;" /></el-form-item>
         </div>
       </div>
       <div class="block">
@@ -130,7 +130,7 @@
               <el-date-picker v-model="form.onlinePlanTime" align="left" size="medium" type="datetime" style="width:76%;" placeholder="选择日期" />
             </el-form-item>
           </div>
-          <el-form-item label="备注" label-width="142px"><el-input v-model="form.remark" type="textarea" placeholder="bug描述" rows="3" style="width:90%;" /></el-form-item>
+          <el-form-item label="备注" label-width="146px"><el-input v-model="form.remark" type="textarea" placeholder="bug描述" rows="3" style="width:90%;" /></el-form-item>
           <el-form-item class="submit">
             <el-button type="danger" plain size="mini" @click="$router.go(-1)">取 消</el-button>
             <el-button class="move-button" size="mini" type="primary" @click="createFormData(form)">确 定</el-button>
@@ -184,9 +184,9 @@ export default {
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
         // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
         clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }],
-        pm: [{ required: true, message: '产品人员不能为空', trigger: 'blur' }],
-        rd: [{ required: true, message: '开发人员不能为空', trigger: 'blur' }],
-        qa: [{ required: true, message: '测试人员不能为空', trigger: 'blur' }]
+        pm: [{ required: true, message: '产品人员不能为空', trigger: 'change' }],
+        rd: [{ required: true, message: '开发人员不能为空', trigger: 'change' }],
+        qa: [{ required: true, message: '测试人员不能为空', trigger: 'change' }]
       }
     }
   },
@@ -198,6 +198,10 @@ export default {
       this.forkdown()
     }
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+    this.$refs.form.resetFields()
+  },
   methods: {
     bugListSelect() {
       bugGetEnum().then(res => {
@@ -319,7 +323,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 700px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/projectManage/taskList/taskListIndex.vue

@@ -63,6 +63,15 @@
                     <div>
                       <el-button size="mini" type="primary" plain @click="projectShowData(scope.row.id)">编辑</el-button>
                       <el-button size="mini" type="danger" plain @click="dialogBug(scope.row.id)">删除</el-button>
+                      <el-dropdown style="margin-left:10px" trigger="click">
+                        <el-button size="mini" type="primary">···</el-button>
+                        <el-dropdown-menu slot="dropdown">
+                          <el-dropdown-item icon="el-icon-coin" @click.native="createReport(1, scope.row)">新建提测报告</el-dropdown-item>
+                          <el-dropdown-item icon="el-icon-coin" @click.native="createReport(2, scope.row)">新建日报报告</el-dropdown-item>
+                          <el-dropdown-item icon="el-icon-coin" @click.native="createReport(3, scope.row)">新建准出报告</el-dropdown-item>
+                          <el-dropdown-item icon="el-icon-coin" @click.native="createReport(4, scope.row)">新建bug</el-dropdown-item>
+                        </el-dropdown-menu>
+                      </el-dropdown>
                       <el-dialog
                         :visible.sync="dialogVisible"
                         width="30%"
@@ -77,7 +86,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+              <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @current-change="handleCurrentChange" />
             </div>
           </el-tab-pane>
           <el-tab-pane label="看板" name="second">
@@ -115,6 +124,9 @@ export default {
   created() {
     this.bugListSelectBeforeGet()
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+  },
   methods: {
     async bugListSelectBeforeGet() {
       await bugGetEnum().then(res => {
@@ -135,6 +147,15 @@ export default {
       })
     },
     dataQuery(queryCode) {
+      this.curIndex = 1
+      queryCode.bizId = localStorage.getItem('key')
+      queryCode.pageSize = this.pageSize
+      queryCode.curIndex = this.curIndex
+      taskListGet(queryCode).then(res => {
+        res.code === 200 ? this.tableData = res.data : this.errorFun(res.msg)
+      })
+    },
+    dataQueryInSearch(queryCode) {
       queryCode.bizId = localStorage.getItem('key')
       queryCode.pageSize = this.pageSize
       queryCode.curIndex = this.curIndex
@@ -145,6 +166,40 @@ export default {
     createdCode() {
       this.$router.push({ name: '任务创建' })
     },
+    // 创建日报 提测 准出 Bug报告跳转
+    createReport(e, ele) {
+      if (ele.typeString !== '服务端') {
+        switch (e) {
+          case 1:
+            this.$router.push({ path: '/Platform/presentation/PresentReport', query: { task: ele }}) // 客户端提测
+            break
+          case 2:
+            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele }}) // 客户端日报
+            break
+          case 3:
+            this.$router.push({ path: '/Platform/presentation/ClientAcceptance', query: { task: ele }}) // 客户端准出
+            break
+          case 4:
+            this.$router.push({ name: '新建Bug', query: { id: ele.id }}) // 缺陷报告
+            break
+        }
+      } else {
+        switch (e) {
+          case 1:
+            this.$router.push({ path: '/Platform/presentation/presentationReport', query: { task: ele }}) // 服务端提测
+            break
+          case 2:
+            this.$router.push({ path: '/Platform/presentation/DailyNewsAdded', query: { task: ele }}) // 服务端日报
+            break
+          case 3:
+            this.$router.push({ path: '/Platform/presentation/Acceptance', query: { task: ele }}) // 服务端准出
+            break
+          case 4:
+            this.$router.push({ name: '新建Bug', query: { id: ele.id }}) // 缺陷报告
+            break
+        }
+      }
+    },
     // id Bug
     dialogBug(e) {
       this.dialogVisible = true
@@ -163,11 +218,60 @@ export default {
       })
       this.dialogVisible = false
     },
-    handleSizeChange(size) {
-      this.pageSize = size
-    },
+    // // 看板移动更新
+    // checkMove(evt) {
+    //   this.pauseFromId = evt.draggedContext.element.id
+    // },
+    // targetRecording(e) {
+    //   this.pauseTarget = e
+    //   const formTask = { id: this.pauseFromId, status: this.pauseTarget }
+    //   const userData = { id: '', ename: this.userInformation, name: this.userNames }
+    //   const objData = { taskInfo: formTask, user: userData }
+    //   updateTaskList(objData).then(response => {
+    //     if (response.code === 200) {
+    //       this.kanBanDrag()
+    //       this.successFun('operating')
+    //     } else {
+    //       this.errorFun(response.msg)
+    //     }
+    //   })
+    // },
+    // // 看板获取
+    // kanBanDrag() {
+    //   this.loadingOnlineProcess = true
+    //   const initValue = { bizId: this.bizJson }
+    //   listMap(initValue).then((res) => {
+    //     this.labelDrag = res.data
+    //     this.loadingOnlineProcess = false
+    //   })
+    // },
+    // // 标签页研发质量
+    // handleClick() {
+    //   if (this.activeName === 'second') {
+    //     this.kanBanDrag()
+    //   } else if (this.activeName === 'first') {
+    //     this.bugListSelectBeforeGet()
+    //   } else {
+    //     this.errorFun('获取数据失败')
+    //   }
+    // },
+    // // 看板查询
+    // kanBanQuery(e) {
+    //   for (const key in e) {
+    //     if (!e[key]) {
+    //       delete e[key]
+    //     }
+    //   }
+    //   e.bizId = this.bizJson
+    //   this.loadingOnlineProcess = true
+    //   listMap(e).then((res) => {
+    //     this.labelDrag = res.data
+    //     this.loadingOnlineProcess = false
+    //   })
+    // },
     handleCurrentChange(curIndex) {
       this.curIndex = curIndex
+      this.dataQueryInSearch()
     },
     taskShow(e) {
       this.$router.push({ name: '任务查看', query: { id: e }})
@@ -191,6 +295,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/projectManage/taskList/taskPreview.vue

@@ -296,6 +296,9 @@ export default {
     this.bugListSelect()
     this.getList()
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+  },
   methods: {
     // id get
     getList() {
@@ -421,7 +424,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 1000px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/projectManage/taskList/taskUpdateCreate.vue

@@ -3,7 +3,7 @@
     <el-form ref="form" :model="form" :rules="serviceDataRules">
       <div class="block">
         <div class="block-flex">
-          <el-form-item label="任务名称" prop="name" label-width="110px"><el-input v-model="form.name" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:90%;" /></el-form-item>
+          <el-form-item label="任务名称" prop="name" label-width="112px"><el-input v-model="form.name" autocomplete="off" placeholder="普惠质量产品工具平台..." style="width:89.6%;" /></el-form-item>
           <div class="line-between">
             <el-form-item label="优先级" prop="priority" label-width="124px">
               <el-select v-model="form.priority" style="width:76%;" placeholder="请选择">
@@ -52,8 +52,8 @@
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item label="需求文档" label-width="110px"><el-input v-model="form.mrdUrl" placeholder="请填写" style="width:90%;" /></el-form-item>
-          <el-form-item label="技术文档" label-width="110px"><el-input v-model="form.devUrl" placeholder="请填写" style="width:90%;" /></el-form-item>
+          <el-form-item label="需求文档" label-width="112px"><el-input v-model="form.mrdUrl" placeholder="请填写" style="width:89.6%;" /></el-form-item>
+          <el-form-item label="技术文档" label-width="112px"><el-input v-model="form.devUrl" placeholder="请填写" style="width:89.6%;" /></el-form-item>
           <!-- <el-form-item class="submit">
             <el-button type="danger" plain size="mini" @click="$router.go(-1)">取 消</el-button>
             <el-button class="move-button" size="mini" type="primary" @click="createFormData(form)">保 存</el-button>
@@ -104,7 +104,7 @@
               </el-select>
             </el-form-item>
           </div>
-          <el-form-item label="描述" label-width="110px"><el-input v-model="form.description" type="textarea" placeholder="bug描述" rows="3" style="width:90%;" /></el-form-item>
+          <el-form-item label="描述" label-width="112px"><el-input v-model="form.description" type="textarea" placeholder="bug描述" rows="3" style="width:89.6%;" /></el-form-item>
         </div>
       </div>
       <div class="block">
@@ -130,7 +130,7 @@
               <el-date-picker v-model="form.onlinePlanTime" align="left" size="medium" type="datetime" style="width:76%;" placeholder="选择日期" />
             </el-form-item>
           </div>
-          <el-form-item label="备注" label-width="142px"><el-input v-model="form.remark" type="textarea" placeholder="bug描述" rows="3" style="width:90%;" /></el-form-item>
+          <el-form-item label="备注" label-width="146px"><el-input v-model="form.remark" type="textarea" placeholder="bug描述" rows="3" style="width:90%;" /></el-form-item>
           <el-form-item class="submit">
             <el-button type="danger" plain size="mini" @click="$router.go(-1)">取 消</el-button>
             <el-button class="move-button" size="mini" type="primary" @click="createFormData(form)">确 定</el-button>
@@ -184,9 +184,9 @@ export default {
         priority: [{ required: true, message: '优先级不能为空', trigger: 'change' }],
         // stage: [{ required: true, message: '进展不能为空', trigger: 'change' }],
         clientType: [{ required: true, message: '工程模块为空', trigger: 'change' }],
-        pm: [{ required: true, message: '产品人员不能为空', trigger: 'blur' }],
-        rd: [{ required: true, message: '开发人员不能为空', trigger: 'blur' }],
-        qa: [{ required: true, message: '测试人员不能为空', trigger: 'blur' }]
+        pm: [{ required: true, message: '产品人员不能为空', trigger: 'change' }],
+        rd: [{ required: true, message: '开发人员不能为空', trigger: 'change' }],
+        qa: [{ required: true, message: '测试人员不能为空', trigger: 'change' }]
       }
     }
   },
@@ -194,6 +194,10 @@ export default {
     this.bugListSelect()
     this.idDetail()
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+    this.$refs.form.resetFields()
+  },
   methods: {
     bugListSelect() {
       bugGetEnum().then(res => {
@@ -315,7 +319,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 700px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/virtualDevices/HMvehicle.vue

@@ -121,7 +121,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination background style="margin-top:30px;" align="center" :current-page="curIndex" :page-size="pageSize" layout="prev, pager, next" :total="total" @current-change="handleCurrentChange" />
         </div>
       </div>
     </div>
@@ -184,6 +184,9 @@ export default {
   created() {
     this._queryDeviceInfo()
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+  },
   methods: {
     _queryDeviceInfo() {
       const params = { page: this.curIndex, pageSize: this.pageSize }
@@ -194,6 +197,20 @@ export default {
       })
     },
     dataQuery(queryCode) {
+      queryCode.page = 1
+      this.curIndex = 1
+      queryCode.pageSize = this.pageSize
+      for (const key in queryCode) { // 接口不接受空值的处理
+        if (queryCode[key] === '') {
+          delete queryCode[key]
+        }
+      }
+      queryDeviceInfo(queryCode).then(res => {
+        res.code === 200 ? this.tableData = res.data.ebikeInfos : this.errorFun(res.msg)
+        this.total = res.data.total
+      })
+    },
+    dataIndexChoose(queryCode) {
       queryCode.page = this.curIndex
       queryCode.pageSize = this.pageSize
       for (const key in queryCode) { // 接口不接受空值的处理
@@ -202,7 +219,8 @@ export default {
         }
       }
       queryDeviceInfo(queryCode).then(res => {
-        res.code === 200 ? this.tableData = res.data : this.errorFun(res.msg)
+        res.code === 200 ? this.tableData = res.data.ebikeInfos : this.errorFun(res.msg)
+        this.total = res.data.total
       })
     },
     oneKeyCreate() {
@@ -218,11 +236,9 @@ export default {
     createdCode() {
       this.$router.push({ name: '新增电单车', params: { formData: this.form }, query: { id: this.form.id }})
     },
-    handleSizeChange(size) {
-      this.pageSize = size
-    },
     handleCurrentChange(curIndex) {
       this.curIndex = curIndex
+      this.dataIndexChoose(this.queryCode)
     },
     updateLock(ecuId, lockStatus, judge) {
       if (judge !== 1) {
@@ -296,7 +312,7 @@ export default {
     background-color #F2F3F6
     display flex
     justify-content center
-    min-width 1000px
+    min-width 1200px
     .block
       background-color rgba(255,255,255,1)
       box-shadow 0px 0px 11px 0px rgba(238,240,245,1)

src/views/virtualDevices/HMvehicleCreate.vue

@@ -90,6 +90,9 @@ export default {
       }
     }
   },
+  mounted() {
+    document.getElementsByClassName('app-main')[0].style.cssText = 'overflow:auto'
+  },
   methods: {
     // 提交表单并且返回刷新
     createFormData(form) {