2022-11-6bug更改

src/views/common/home.vue

@@ -13,7 +13,11 @@
       }
     },
     created () {
-  
+      // 设置后台一跳转就是菜单首页
+      let menuList = JSON.parse(localStorage.getItem('menuList'))
+      console.log(menuList[0].list[0])
+      let url = menuList[0].list[0].url.replace(/^\//, '').replace('/', '-')
+      this.$router.replace({ name: url })
     }
   }
 </script>

src/views/common/login.vue

@@ -12,7 +12,7 @@
               <el-input v-model="dataForm.password" type="password" placeholder="请输入密码"><i slot="prefix" style="font-style:normal;font-size:14px;color:#333333;margin:2px 0 0 5px;display:inline-block;">密码</i></el-input>
             </el-form-item>
             <el-form-item>
-              <p class="rememberPwd"><el-checkbox v-model="dataForm.checked"></el-checkbox> 记住密码</p>
+              <p class="rememberPwd"><el-checkbox v-model="dataForm.checked" ></el-checkbox> 记住密码</p>
             </el-form-item>
             <el-form-item>
               <el-button class="login-btn-submit" type="primary" @click="dataFormSubmit()">登录</el-button>
@@ -35,7 +35,7 @@
           password: '',
           uuid: '',
           captcha: '',
-          checked: false
+          checked: true
         },
         dataRule: {
           userName: [

src/views/modules/application/news.vue

@@ -65,7 +65,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-button class="seach-btn" @click="getDataList()" type="primary" >搜索</el-button>
+        <el-button class="seach-btn" @click="getDataList2()" type="primary" >搜索</el-button>
       </el-form>
   <div class="add-btn">
       <el-button v-if="isAuth('application:news:save')" type="primary" @click="addOrUpdateHandle()"> + 添加文章</el-button>
@@ -76,6 +76,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%; "
       >
       <el-table-column
@@ -223,7 +224,9 @@ export default {
       columnList: [],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
 
@@ -246,6 +249,10 @@ export default {
         }
       })
     },
+    getDataList2 () {
+      this.pageIndex = 1
+      this.getDataList()
+    },
       // 获取数据列表
     getDataList () {
       console.log(this.releaseDate, 'this.releaseDate')
@@ -267,7 +274,9 @@ export default {
           'releaseTimeEnd': this.releaseDate === null ? '' : this.releaseDate[1],
           'updateTimeStart': this.updateDate === null ? '' : this.updateDate[0],
           'updateTimeEnd': this.updateDate === null ? '' : this.updateDate[1],
-          'auditor': this.dataForm.auditor
+          'auditor': this.dataForm.auditor,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -381,6 +390,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/info/announce.vue

@@ -63,6 +63,7 @@
       @selection-change="selectionChangeHandle"
       border
       style="width: 100%; "
+      @sort-change="changeTableSort"
       >
       <el-table-column
         prop="levels"
@@ -222,7 +223,9 @@ export default {
           }
         ],
         piclevelList,
-        releaseDate: []
+        releaseDate: [],
+        order: '',
+        sidx: ''
       }
     },
 
@@ -250,7 +253,9 @@ export default {
             'keyword': this.dataForm.keyword,
             'status': this.dataForm.status,
             'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
-            'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
+            'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
+            'sidx': this.sidx,
+            'order': this.order
           })
         }).then(({data}) => {
           if (data && data.code === 0) {
@@ -360,6 +365,18 @@ export default {
             }
           })
         }).catch(() => {})
+      },
+      // 排序方法
+      changeTableSort (column) {
+        console.log(column)
+        if (column.order === 'descending') {
+          this.order = 'desc'
+        } else if (column.order === 'ascending') {
+          this.order = 'asc'
+        }
+        console.log(column.prop)
+        this.sidx = column.prop
+        this.getDataList2()
       }
     }
 }

src/views/modules/info/indexcarouselmanage.vue

@@ -61,6 +61,7 @@
       @selection-change="selectionChangeHandle"
       border
       style="width: 100%; "
+      @sort-change="changeTableSort"
       >
       <el-table-column
         prop="levels"
@@ -250,7 +251,9 @@ export default {
       listTitle: '',
       dialogTableVisible: false,
       lunboList: [],
-      typeLevel: ''
+      typeLevel: '',
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -275,7 +278,9 @@ export default {
           'levels': this.dataForm.levels,
           'classnum': this.dataForm.classnum,
           'startTime': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
-          'endTime': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
+          'endTime': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
 
         })
       }).then(({data}) => {
@@ -481,6 +486,22 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序方法
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      if (column.prop === 'starttimeIndex') {
+        this.sidx = 'starttime_index'
+      } else if (column.prop === 'updatetimeIndex') {
+        this.sidx = 'updatetime_index'
+      }
+
+      this.getDataList2()
     }
   }
 }

src/views/modules/info/news.vue

@@ -69,6 +69,7 @@
       @selection-change="selectionChangeHandle"
       border
       style="width: 100%; "
+      @sort-change="changeTableSort"
       >
       <el-table-column
         prop="levels"
@@ -213,7 +214,9 @@ export default {
       ],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
 
@@ -244,7 +247,9 @@ export default {
           'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
           'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
           'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
-          'auditor': this.dataForm.auditor
+          'auditor': this.dataForm.auditor,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -355,6 +360,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序方法
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/info/newsmovie.vue

@@ -80,6 +80,7 @@
       @selection-change="selectionChangeHandle"
       border
       style="width: 100%; "
+      @sort-change="changeTableSort"
       >
       <el-table-column
         prop="levels"
@@ -258,7 +259,9 @@ export default {
       piclevelList,
       clanguageList: ['中文'],
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -289,7 +292,9 @@ export default {
           'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
           'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
           'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
-          'auditor': this.dataForm.auditor
+          'auditor': this.dataForm.auditor,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -399,6 +404,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序方法
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/info/newtopic.vue

@@ -48,6 +48,7 @@
       @selection-change="selectionChangeHandle"
       border
       style="width: 100%; "
+      @sort-change="changeTableSort"
       >
       <el-table-column
         prop="levels"
@@ -181,7 +182,9 @@ export default {
         }
       ],
       piclevelList,
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -205,7 +208,9 @@ export default {
           'status': this.dataForm.status === null ? '' : this.dataForm.status,
           'levels': this.dataForm.levels,
           'inputDateStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
-          'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
+          'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -315,6 +320,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/info/picture.vue

@@ -65,6 +65,7 @@
         @selection-change="selectionChangeHandle"
         border
         style="width: 100%; "
+        @sort-change="changeTableSort"
         >
          
         <el-table-column prop="piclevel" header-align="center" align="center" label="级别"> </el-table-column>
@@ -171,7 +172,9 @@ export default {
           label: '不合格样本图片'
         }
       ],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   components: {
@@ -202,7 +205,9 @@ export default {
           'status': this.dataForm.status,
           'pictureType': this.dataForm.pictureType,
           'inputDateStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
-          'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
+          'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -307,6 +312,18 @@ export default {
           }
         })
       }).catch(e => e)
+    },
+    // 排序方法
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/logistics/logistics.vue

@@ -28,6 +28,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         prop="level"
@@ -145,7 +146,9 @@
          {
            typeName: '常见问题'
          }
-       ]
+       ],
+       order: '',
+       sidx: ''
      }
    },
    activated () {
@@ -170,7 +173,9 @@
            'limit': this.pageSize,
            'title': this.dataForm.title,
            'type': this.dataForm.type === null ? '' : this.dataForm.type,
-           'keyword': this.dataForm.keyword
+           'keyword': this.dataForm.keyword,
+           'sidx': this.sidx,
+           'order': this.order
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
@@ -295,6 +300,18 @@
            }
          })
        }).catch(() => {})
+     },
+     // 排序
+     changeTableSort (column) {
+       console.log(column)
+       if (column.order === 'descending') {
+         this.order = 'desc'
+       } else if (column.order === 'ascending') {
+         this.order = 'asc'
+       }
+       console.log(column.prop)
+       this.sidx = column.prop
+       this.getDataList2()
      }
  
    }

src/views/modules/party/center.vue

@@ -68,6 +68,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         prop="levels"
@@ -210,7 +211,9 @@ export default {
       ],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -239,7 +242,9 @@ export default {
           'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
           'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
           'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
-          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
+          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -350,6 +355,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/party/hotFlow.vue

@@ -65,6 +65,7 @@
       :data="dataList"
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         prop="levels"
@@ -207,7 +208,9 @@ export default {
       ],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -236,7 +239,9 @@ export default {
           'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
           'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
           'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
-          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
+          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -346,6 +351,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/party/rules.vue

@@ -68,6 +68,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         prop="levels"
@@ -210,7 +211,9 @@ export default {
       ],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -239,7 +242,9 @@ export default {
           'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
           'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
           'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
-          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
+          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -349,6 +354,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/party/topicnews.vue

@@ -66,6 +66,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         prop="levels"
@@ -208,7 +209,9 @@ export default {
       ],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -237,7 +240,9 @@ export default {
           'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
           'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
           'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
-          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
+          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -347,6 +352,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/planbranch/annual.vue

@@ -27,6 +27,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         type="selection"
@@ -51,6 +52,7 @@
         prop="updatetime"
         header-align="center"
         align="center"
+        sortable
         label="修改时间">
       </el-table-column>
       <el-table-column
@@ -131,7 +133,9 @@
            state: 1,
            stateName: '已上传'
          }
-       ]
+       ],
+       order: '',
+       sidx: ''
      }
    },
    activated () {
@@ -153,7 +157,9 @@
            'limit': this.pageSize + '',
            'classnum': 0, // 0 年度  1 第一季度  2第二季度  3第三季度  4第四季度
            'checkflag': this.dataForm.state == null ? '' : this.dataForm.state + '',  // -1为“未上报”。 0为“未上传” 1为“已上传”
-           'name': this.dataForm.name
+           'name': this.dataForm.name,
+           'sidx': this.sidx,
+           'order': this.order
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
@@ -230,6 +236,18 @@
            }
          })
        }).catch(() => {})
+     },
+       // 排序
+     changeTableSort (column) {
+       console.log(column)
+       if (column.order === 'descending') {
+         this.order = 'desc'
+       } else if (column.order === 'ascending') {
+         this.order = 'asc'
+       }
+       console.log(column.prop)
+       this.sidx = column.prop
+       this.getDataList2()
      }
  
    }

src/views/modules/planbranch/fistplan.vue

@@ -27,6 +27,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         type="selection"
@@ -51,6 +52,7 @@
         prop="updatetime"
         header-align="center"
         align="center"
+        sortable
         label="修改时间">
       </el-table-column>
       <el-table-column
@@ -131,7 +133,9 @@
            state: 1,
            stateName: '已上传'
          }
-       ]
+       ],
+       order: '',
+       sidx: ''
      }
    },
    activated () {
@@ -153,7 +157,9 @@
            'limit': this.pageSize + '',
            'classnum': 1, // 0 年度  1 第一季度  2第二季度  3第三季度  4第四季度
            'checkflag': this.dataForm.state == null ? '' : this.dataForm.state + '',  // -1为“未上报”。 0为“未上传” 1为“已上传”
-           'name': this.dataForm.name
+           'name': this.dataForm.name,
+           'sidx': this.sidx,
+           'order': this.order
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
@@ -230,6 +236,18 @@
            }
          })
        }).catch(() => {})
+     },
+       // 排序
+     changeTableSort (column) {
+       console.log(column)
+       if (column.order === 'descending') {
+         this.order = 'desc'
+       } else if (column.order === 'ascending') {
+         this.order = 'asc'
+       }
+       console.log(column.prop)
+       this.sidx = column.prop
+       this.getDataList2()
      }
  
    }

src/views/modules/planbranch/fourplan.vue

@@ -27,6 +27,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         type="selection"
@@ -51,6 +52,7 @@
         prop="updatetime"
         header-align="center"
         align="center"
+        sortable
         label="修改时间">
       </el-table-column>
       <el-table-column
@@ -131,7 +133,9 @@
            state: 1,
            stateName: '已上传'
          }
-       ]
+       ],
+       order: '',
+       sidx: ''
      }
    },
    activated () {
@@ -153,7 +157,9 @@
            'limit': this.pageSize + '',
            'classnum': 4, // 0 年度  1 第一季度  2第二季度  3第三季度  4第四季度
            'checkflag': this.dataForm.state == null ? '' : this.dataForm.state + '',  // -1为“未上报”。 0为“未上传” 1为“已上传”
-           'name': this.dataForm.name
+           'name': this.dataForm.name,
+           'sidx': this.sidx,
+           'order': this.order
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
@@ -230,6 +236,18 @@
            }
          })
        }).catch(() => {})
+     },
+       // 排序
+     changeTableSort (column) {
+       console.log(column)
+       if (column.order === 'descending') {
+         this.order = 'desc'
+       } else if (column.order === 'ascending') {
+         this.order = 'asc'
+       }
+       console.log(column.prop)
+       this.sidx = column.prop
+       this.getDataList2()
      }
  
    }

src/views/modules/planbranch/secondplan.vue

@@ -27,6 +27,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         type="selection"
@@ -51,6 +52,7 @@
         prop="updatetime"
         header-align="center"
         align="center"
+        sortable
         label="修改时间">
       </el-table-column>
       <el-table-column
@@ -131,7 +133,9 @@
            state: 1,
            stateName: '已上传'
          }
-       ]
+       ],
+       order: '',
+       sidx: ''
      }
    },
    activated () {
@@ -153,7 +157,9 @@
            'limit': this.pageSize + '',
            'classnum': 2, // 0 年度  1 第一季度  2第二季度  3第三季度  4第四季度
            'checkflag': this.dataForm.state == null ? '' : this.dataForm.state + '',  // -1为“未上报”。 0为“未上传” 1为“已上传”
-           'name': this.dataForm.name
+           'name': this.dataForm.name,
+           'sidx': this.sidx,
+           'order': this.order
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
@@ -230,6 +236,18 @@
            }
          })
        }).catch(() => {})
+     },
+       // 排序
+     changeTableSort (column) {
+       console.log(column)
+       if (column.order === 'descending') {
+         this.order = 'desc'
+       } else if (column.order === 'ascending') {
+         this.order = 'asc'
+       }
+       console.log(column.prop)
+       this.sidx = column.prop
+       this.getDataList2()
      }
  
    }

src/views/modules/planbranch/thirdplan.vue

@@ -27,6 +27,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         type="selection"
@@ -51,6 +52,7 @@
         prop="updatetime"
         header-align="center"
         align="center"
+        sortable
         label="修改时间">
       </el-table-column>
       <el-table-column
@@ -131,7 +133,9 @@
            state: 1,
            stateName: '已上传'
          }
-       ]
+       ],
+       order: '',
+       sidx: ''
      }
    },
    activated () {
@@ -153,7 +157,9 @@
            'limit': this.pageSize + '',
            'classnum': 3, // 0 年度  1 第一季度  2第二季度  3第三季度  4第四季度
            'checkflag': this.dataForm.state == null ? '' : this.dataForm.state + '',  // -1为“未上报”。 0为“未上传” 1为“已上传”
-           'name': this.dataForm.name
+           'name': this.dataForm.name,
+           'sidx': this.sidx,
+           'order': this.order
          })
        }).then(({data}) => {
          if (data && data.code === 0) {
@@ -230,6 +236,18 @@
            }
          })
        }).catch(() => {})
+     },
+       // 排序
+     changeTableSort (column) {
+       console.log(column)
+       if (column.order === 'descending') {
+         this.order = 'desc'
+       } else if (column.order === 'ascending') {
+         this.order = 'asc'
+       }
+       console.log(column.prop)
+       this.sidx = column.prop
+       this.getDataList2()
      }
  
    }

src/views/modules/plate/glossary.vue

@@ -24,7 +24,7 @@
         ></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary"  @click="getDataList()">查询</el-button>
+        <el-button type="primary"  @click="getDataList2()">查询</el-button>
       </el-form-item>
     </el-form>
     <div class="add-btn">
@@ -42,6 +42,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%"
+      @sort-change="changeTableSort"
     >
     
       <el-table-column
@@ -83,6 +84,7 @@
         prop="updatedate"
         header-align="center"
         align="center"
+        sortable
         label="创建时间"
       >
       </el-table-column>
@@ -156,7 +158,9 @@ export default {
       totalPage: 0,
       dataListLoading: false,
       dataListSelections: [],
-      addOrUpdateVisible: false
+      addOrUpdateVisible: false,
+      order: '',
+      sidx: ''
     }
   },
   components: {
@@ -166,6 +170,10 @@ export default {
     this.getDataList()
   },
   methods: {
+    getDataList2 () {
+      this.pageIndex = 1
+      this.getDataList()
+    },
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
@@ -176,7 +184,9 @@ export default {
           page: this.pageIndex,
           limit: this.pageSize,
           titleCn: this.dataForm.titleCn,
-          keyword: this.dataForm.key
+          keyword: this.dataForm.key,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
@@ -246,6 +256,18 @@ export default {
           }
         })
       })
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList()
     }
   }
 }

src/views/modules/plate/knowledgeinfo.vue

@@ -66,6 +66,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       <el-table-column
         prop="levels"
@@ -191,7 +192,9 @@ export default {
       {
         name: '失败',
         value: -1
-      }]
+      }],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -220,7 +223,9 @@ export default {
           'releaseTimeStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
           'releaseTimeEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
           'parentCategoryId': this.dataForm.class1id,
-          'categoryId': this.dataForm.class2id
+          'categoryId': this.dataForm.class2id,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -361,6 +366,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
 
   }

src/views/modules/plate/product.vue

@@ -24,7 +24,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary"  @click="getDataList()">查询</el-button>
+        <el-button type="primary"  @click="getDataList2()">查询</el-button>
       </el-form-item>
     </el-form>
     <div class="add-btn">
@@ -42,6 +42,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       style="width: 100%"
+      @sort-change="changeTableSort"
     >
       <el-table-column
         prop="levels"
@@ -70,6 +71,7 @@
         prop="adddate"
         header-align="center"
         align="center"
+        sortable
         label="添加时间"
       >
       </el-table-column>
@@ -173,7 +175,9 @@ export default {
       totalPage: 0,
       dataListLoading: false,
       dataListSelections: [],
-      addOrUpdateVisible: false
+      addOrUpdateVisible: false,
+      order: '',
+      sidx: ''
     }
   },
   components: {
@@ -213,6 +217,10 @@ export default {
         }
       })
     },
+    getDataList2 () {
+      this.pageIndex = 1
+      this.getDataList()
+    },
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
@@ -223,7 +231,9 @@ export default {
           page: this.pageIndex,
           limit: this.pageSize,
           keyword: this.dataForm.key,
-          categoryid: this.dataForm.categoryid
+          categoryid: this.dataForm.categoryid,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
@@ -334,6 +344,18 @@ export default {
           })
         })
         .catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/policy/policy.vue

@@ -52,7 +52,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-button class="seach-btn" @click="getDataList()" type="primary">搜索</el-button>
+        <el-button class="seach-btn" @click="getDataList2()" type="primary">搜索</el-button>
       </el-form>
   <div class="add-btn">
       <el-button v-if="isAuth('manage:policy:save')" type="primary" @click="addOrUpdateHandle()"> + 添加</el-button>
@@ -63,6 +63,7 @@
       v-loading="dataListLoading"
       @selection-change="selectionChangeHandle"
       border
+      @sort-change="changeTableSort"
       style="width: 100%;">
       >
       <el-table-column
@@ -209,7 +210,9 @@ export default {
         {
           typeName: '相关标准'
         }
-      ]
+      ],
+      order: '',
+      sidx: ''
     }
   },
   activated () {
@@ -219,6 +222,10 @@ export default {
 
   },
   methods: {
+    getDataList2 () {
+      this.pageIndex = 1
+      this.getDataList()
+    },
       // 获取数据列表
     getDataList () {
       this.dataListLoading = true
@@ -235,7 +242,9 @@ export default {
           'keyword': this.dataForm.keyword,
           'status': this.dataForm.status,
           'updateTimeStart': this.updateDate && this.updateDate[0] ? this.updateDate[0] + ' 00:00:00' : '',
-          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : ''
+          'updateTimeEnd': this.updateDate && this.updateDate[1] ? this.updateDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -345,6 +354,18 @@ export default {
           }
         })
       }).catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
 
   }

src/views/modules/retail/picture.vue

@@ -65,6 +65,7 @@
         @selection-change="selectionChangeHandle"
         border
         style="width: 100%; "
+        @sort-change="changeTableSort"
         >
          
         <el-table-column prop="piclevel" header-align="center" align="center" label="级别"> </el-table-column>
@@ -171,7 +172,9 @@ export default {
           label: '不合格样本图片'
         }
       ],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
   components: {
@@ -202,7 +205,9 @@ export default {
           'status': this.dataForm.status,
           'pictureType': this.dataForm.pictureType,
           'inputDateStart': this.releaseDate && this.releaseDate[0] ? this.releaseDate[0] + ' 00:00:00' : '',
-          'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : ''
+          'inputDateEnd': this.releaseDate && this.releaseDate[1] ? this.releaseDate[1] + ' 23:59:59' : '',
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({data}) => {
         if (data && data.code === 0) {
@@ -307,6 +312,18 @@ export default {
           }
         })
       }).catch(e => e)
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataListSub()
     }
   }
 }

src/views/modules/standard/cases.vue

@@ -79,7 +79,7 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-button class="seach-btn" @click="getDataList()" type="primary"
+      <el-button class="seach-btn" @click="getDataList2()" type="primary"
         >搜索</el-button
       >
     </el-form>
@@ -99,6 +99,7 @@
         @selection-change="selectionChangeHandle"
         border
         style="width: 100%"
+        @sort-change="changeTableSort"
       >
         <el-table-column
           prop="levels"
@@ -337,7 +338,9 @@ export default {
       ],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
 
@@ -345,6 +348,10 @@ export default {
     this.getDataList()
   },
   methods: {
+    getDataList2 () {
+      this.pageIndex = 1
+      this.getDataList()
+    },
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
@@ -364,7 +371,9 @@ export default {
           releaseTimeEnd: this.releaseDate === null ? '' : this.releaseDate[1],
           updateTimeStart: this.updateDate === null ? '' : this.updateDate[0],
           updateTimeEnd: this.updateDate === null ? '' : this.updateDate[1],
-          auditor: this.dataForm.auditor
+          auditor: this.dataForm.auditor,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
@@ -489,6 +498,18 @@ export default {
           })
         })
         .catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

src/views/modules/standard/partners.vue

@@ -95,7 +95,7 @@
         >
         </el-date-picker>
       </el-form-item>
-      <el-button class="seach-btn" @click="getDataList()" type="primary"
+      <el-button class="seach-btn" @click="getDataList2()" type="primary"
         >搜索</el-button
       >
     </el-form>
@@ -115,6 +115,7 @@
         @selection-change="selectionChangeHandle"
         border
         style="width: 100%"
+        @sort-change="changeTableSort"
       >
         <el-table-column
           prop="levels"
@@ -383,7 +384,9 @@ export default {
       ],
       piclevelList,
       updateDate: [],
-      releaseDate: []
+      releaseDate: [],
+      order: '',
+      sidx: ''
     }
   },
 
@@ -391,6 +394,10 @@ export default {
     this.getDataList()
   },
   methods: {
+    getDataList2 () {
+      this.pageIndex = 1
+      this.getDataList()
+    },
     // 获取数据列表
     getDataList () {
       this.dataListLoading = true
@@ -411,7 +418,9 @@ export default {
           releaseTimeEnd: this.releaseDate === null ? '' : this.releaseDate[1],
           updateTimeStart: this.updateDate === null ? '' : this.updateDate[0],
           updateTimeEnd: this.updateDate === null ? '' : this.updateDate[1],
-          auditor: this.dataForm.auditor
+          auditor: this.dataForm.auditor,
+          'sidx': this.sidx,
+          'order': this.order
         })
       }).then(({ data }) => {
         if (data && data.code === 0) {
@@ -537,6 +546,18 @@ export default {
           })
         })
         .catch(() => {})
+    },
+    // 排序
+    changeTableSort (column) {
+      console.log(column)
+      if (column.order === 'descending') {
+        this.order = 'desc'
+      } else if (column.order === 'ascending') {
+        this.order = 'asc'
+      }
+      console.log(column.prop)
+      this.sidx = column.prop
+      this.getDataList2()
     }
   }
 }

static/plugins/ueditor-1.4.3.3/themes/default/css/ueditor.css

@@ -1567,7 +1567,7 @@ div.edui-box {
     margin-right: 1px;
     font-size: 12px;
     line-height: 14px;
-    height: 14px;
+    height: 20px;
     border: 1px solid #333;
     padding: 3px 5px;
     cursor: pointer;