Merge remote-tracking branch 'origin/master'

src/views/module_base/elecfeeAdd/ElecfeeAddList.vue

@@ -174,6 +174,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {

src/views/module_base/elecfeeBase/ElecfeeBaseList.vue

@@ -162,18 +162,21 @@ export default {
         {
           title: '变压器容量/合同最大需量(kVA)',
           align: 'center',
+          sorter: true,
           dataIndex: 'kva',
           width: 200,
         },
         {
           title: '基本电价(元/kw)',
           align: 'center',
+          sorter: true,
           dataIndex: 'price',
           width: 150,
         },
         {
           title: '开始时间',
           align: 'center',
+          sorter: true,
           dataIndex: 'begintime',
           // customRender: function (text) {
           //   return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
@@ -183,6 +186,7 @@ export default {
         {
           title: '结束时间',
           align: 'center',
+          sorter: true,
           dataIndex: 'endtime',
           // customRender: function (text) {
           //   return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
@@ -197,6 +201,7 @@ export default {
         {
           title:'录入日期',
           align:"center",
+          sorter: true,
           dataIndex: 'createTime',
         },
         {

src/views/module_base/elecfeeDegree/ElecfeeDegreeList.vue

@@ -147,12 +147,14 @@
           {
             title:'目录电价(元/kw)',
             align:"center",
+            sorter: true,
             dataIndex: 'price',
             width: 200,
           },
           {
             title:'开始时间',
             align:"center",
+            sorter: true,
             dataIndex: 'begintime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -162,6 +164,7 @@
           {
             title:'结束时间',
             align:"center",
+            sorter: true,
             dataIndex: 'endtime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -176,6 +179,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -198,7 +202,7 @@
           deleteBatch: "/elecfeeDegree/elecfeeDegree/deleteBatch",
           exportXlsUrl: "/elecfeeDegree/elecfeeDegree/exportXls",
           importExcelUrl: "elecfeeDegree/elecfeeDegree/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_base/elecfeeRatio/ElecfeeRatioList.vue

@@ -130,24 +130,28 @@
           {
             title:'功率因数',
             align:"center",
+            sorter: true,
             dataIndex: 'powerfactor',
             width: 150,
           },
           {
             title:'考核因数',
             align:"center",
+            sorter: true,
             dataIndex: 'assessfactor',
             width: 150,
           },
           {
             title:'力调系数',
             align:"center",
+            sorter: true,
             dataIndex: 'ratio',
             width: 150,
           },
           {
             title:'开始时间',
             align:"center",
+            sorter: true,
             dataIndex: 'begintime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -157,6 +161,7 @@
           {
             title:'结束时间',
             align:"center",
+            sorter: true,
             dataIndex: 'endtime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -171,6 +176,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -193,7 +199,7 @@
           deleteBatch: "/elecfeeRatio/elecfeeRatio/deleteBatch",
           exportXlsUrl: "/elecfeeRatio/elecfeeRatio/exportXls",
           importExcelUrl: "elecfeeRatio/elecfeeRatio/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_base/energyItem/EnergyItemList.vue

@@ -172,7 +172,7 @@
           deleteBatch: "/energyItem/energyItem/deleteBatch",
           exportXlsUrl: "/energyItem/energyItem/exportXls",
           importExcelUrl: "energyItem/energyItem/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_base/energyPlan/EnergyPlanList.vue

@@ -169,6 +169,7 @@
           {
             title:'计划日期',
             align:"center",
+            sorter: true,
             dataIndex: 'plandate',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -184,6 +185,7 @@
           {
             title:'计划值',
             align:"center",
+            sorter: true,
             dataIndex: 'planvalue',
             width: 150,
           },
@@ -195,6 +197,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -217,7 +220,7 @@
           deleteBatch: "/energyPlan/energyPlan/deleteBatch",
           exportXlsUrl: "/energyPlan/energyPlan/exportXls",
           importExcelUrl: "energyPlan/energyPlan/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_base/energyRate/EnergyRateList.vue

@@ -194,11 +194,13 @@
           {
             title: '费率有效期开始',
             align: 'center',
+            sorter: true,
             dataIndex: 'begintime',
           },
           {
             title: '费率有效期结束',
             align: 'center',
+            sorter: true,
             dataIndex: 'endtime',
           },
           {
@@ -252,7 +254,7 @@
             'color': "#1890ff",
             'cursor': "pointer",
           },
-          on: { 
+          on: {
             // 点击事件
             click: (event) => {
               this.$refs.equipmentDetail.detail(record);

src/views/module_base/energyType/EnergyTypeList.vue

@@ -166,6 +166,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {

src/views/module_tpm/equipment/EquipmentList.vue

@@ -367,7 +367,7 @@ import Template1 from '../../jeecg/JVxeDemo/layout-demo/Template1.vue'
         console.log(999,this.deviceOptions)
       },
       // 解决筛选后option不回显问题
-      filterOptions(input, option) {                    
+      filterOptions(input, option) {
         return this.deviceOptions
       },
       getDataList(){

src/views/module_tpm/tag/modulesPL/TagFormPL1.vue

@@ -344,7 +344,7 @@ export default {
         // handleInput(e='') {
         //     console.log(111,e,this.tagTypeOptions)
         //     var resultArr = [];
- 
+
         //     // 遍历数组中的每个对象
         //     for (let i = 0; i < this.tagTypeOptions.length; i++) {
         //         // 判断当前对象的name属性是否包含指定的关键字
@@ -475,7 +475,7 @@ export default {
                     }
                 })
             }
-            
+
             })
         },
     }