2023-05-12-02-bug

ant-design-vue-jeecg/src/views/sensor/SensorList.vue

@@ -132,6 +132,7 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import SensorModal from './modules/SensorModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import { filterObj } from '@/utils/util';
 
   export default {
     name: 'SensorList',
@@ -211,6 +212,20 @@
     methods: {
       initDictConfig(){
       },
+
+      getQueryParams(arg) {
+        // 重写查询条件
+        let sqp = {}
+        if (this.superQueryParams) {
+          sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+          sqp['superQueryMatchType'] = this.superQueryMatchType
+        }
+        var param = Object.assign(sqp, this.queryParam, {}, this.filters)
+        param.field = this.getQueryField()
+        param.pageNo = this.ipagination.current
+        param.pageSize = this.ipagination.pageSize
+        return filterObj(param)
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'sensorCode',text:'传感器编号',dictCode:''})

ant-design-vue-jeecg/src/views/sensor/modules/SensorForm.vue

@@ -10,7 +10,14 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="车间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workshopId">
-              <j-search-select-tag v-model="model.workshopId" dict="sys_depart,depart_name,id"  disabled/>
+              <j-tree-select v-model="model.workshopId"
+                             dict="sys_depart,depart_name,id"
+                             pidField="parent_id"
+                             placeholder="请选择车间"
+                             condition='{"org_category":"2"}'
+                             hasChildField="1"
+              >
+              </j-tree-select>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -20,15 +27,16 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="工位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="station">
-              <j-popup
-                v-model="model.station"
-                field="station"
-                org-fields="id,station_name,depart_id"
-                dest-fields="stationId,station,workshopId"
-                code="findgw"
-                :multi="true"
-                @input="popupCallback"
-                />
+              <!--<j-popup-->
+                <!--v-model="model.station"-->
+                <!--field="station"-->
+                <!--org-fields="id,station_name,depart_id"-->
+                <!--dest-fields="stationId,station,workshopId"-->
+                <!--code="findgw"-->
+                <!--:multi="true"-->
+                <!--@input="popupCallback"-->
+                <!--/>-->
+              <j-search-select-tag v-model="model.stationId" dict="station,station_name,id"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

ant-design-vue-jeecg/src/views/team/StationList.vue

@@ -135,6 +135,7 @@ import {mixinDevice} from '@/utils/mixin'
 import StationModal from './modules/StationModal'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import {deleteAction, getAction} from "@api/manage";
+import { filterObj } from '@/utils/util';
 
 export default {
   name: "StationList",
@@ -236,6 +237,21 @@ export default {
     }
   },
   methods: {
+    //
+    getQueryParams(arg) {
+
+      // 重写查询条件
+      let sqp = {}
+      if (this.superQueryParams) {
+        sqp['superQueryParams'] = encodeURI(this.superQueryParams)
+        sqp['superQueryMatchType'] = this.superQueryMatchType
+      }
+      var param = Object.assign(sqp, this.queryParam, {}, this.filters)
+      param.field = this.getQueryField()
+      param.pageNo = this.ipagination.current
+      param.pageSize = this.ipagination.pageSize
+      return filterObj(param)
+    },
     //工位设备管理
     jumpPage1(record) {
       this.$router.push({

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/sensor/controller/SensorController.java

@@ -70,6 +70,7 @@ public class SensorController extends JeecgController<Sensor, ISensorService> {
 								   HttpServletRequest req) {
 		QueryWrapper<Sensor> queryWrapper = QueryGenerator.initQueryWrapper(sensor, req.getParameterMap());
 		Page<Sensor> page = new Page<Sensor>(pageNo, pageSize);
+		queryWrapper.orderByAsc("create_time");
 		IPage<Sensor> pageList = sensorService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/team/controller/StationController.java

@@ -73,6 +73,7 @@ public class StationController extends JeecgController<Station, IStationService>
                                    HttpServletRequest req) {
         QueryWrapper<Station> queryWrapper = QueryGenerator.initQueryWrapper(station, req.getParameterMap());
         Page<Station> page = new Page<Station>(pageNo, pageSize);
+        queryWrapper.orderByAsc("station_num");
         IPage<Station> pageList = stationService.page(page, queryWrapper);
         if (!ObjectUtils.isEmpty(pageList.getRecords())) {
             List<Station> records = pageList.getRecords();