Merge branch 'develop' of https://gitlab.com/970104719/tijing into develop

src/views/education/component/relateDialog.vue

@@ -49,7 +49,7 @@
                     <el-input type="text" v-model="argKeyWord" placeholder="关键字" ></el-input>
                   </div>
 
-                  <div class="search-btn" @click="getData" >查询</div>
+                  <div class="search-btn" @click="getData(1, 'reset')" >查询</div>
 
                 </div>
                 <!-- 第二部分 table部分 -->
@@ -176,27 +176,34 @@ export default {
         //       return v.toString(16);
         //   });
         // },
-         getData () {
+         getData (num, type) {
           var $this = this
+          if (type === 'reset') {
+            this.$refs.page.num = 1
+            this.$refs.page.pageIndex = 1
+          }
           this.$axios({
             method:"post",
             url:`/api/FormulaManage/FormulaManage_GstVariableList?argKeyWord=${this.argKeyWord}&argDevice=${this.argDevice}&argGroup=${this.argGroup}&argDataType=${this.argDataType}&argPageSize=${this.$refs.page.pageSize}&argPageIndex=${this.$refs.page.pageIndex}`,
           }).then((res)=>{
-              this.AllTableData = res.data.data.DataList.map(item => ({
+              let { ParameterList, DataList } = res.data.data
+              $this.AllTableData = DataList.map(item => ({
                 ...item,
-                UpdateTime: item.UpdateTime ? this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
+                UpdateTime: item.UpdateTime ? $this.$moment(item.UpdateTime).format('YYYY-MM-DD HH:mm:ss') : ' '
               }))
               // 克隆一份tableData数据
-              this.cloneData= JSON.parse(JSON.stringify(this.AllTableData))
-              if(this.AllTableData.length > this.$refs.page.pageSize){
-                this.innerTableData = this.AllTableData.slice(0, this.$refs.page.pageSize)
+              $this.cloneData= JSON.parse(JSON.stringify($this.AllTableData))
+              if($this.AllTableData.length > $this.$refs.page.pageSize){
+                $this.innerTableData = $this.AllTableData.slice(0, $this.$refs.page.pageSize)
               }else{
-                this.innerTableData = this.AllTableData
+                $this.innerTableData = $this.AllTableData
+              }
+              $this.totalCount = ParameterList.TotalCount
+              $this.totalPage = ParameterList.TotalPage
+              if (num === undefined) {
+                $this.$refs.page.first()
+                $this.pageFun(1)
               }
-              this.totalCount = this.AllTableData.length
-              this.$refs.page.first()
-              this.totalPage = Math.ceil(this.AllTableData.length / this.$refs.page.pageSize)
-              this.pageFun(1)
           }).catch(function(err){
             console.log('err',err)
           })
@@ -206,11 +213,7 @@ export default {
         },
         // 分页方法
         pageFun(num){
-            if(num == 1){
-              this.innerTableData = this.cloneData.slice(0, this.$refs.page.pageSize)
-            }else{
-              this.innerTableData = this.cloneData.slice((num-1)*this.$refs.page.pageSize,this.$refs.page.pageSize*num)
-            }
+            this.getData(num)
         },
         close(){
           this.argDevice = '不限'