Merge branch 'master' of http://152.136.206.27:3000/dongjh/ems_client

src/views/module_base/client/ClientList.vue

@@ -101,8 +101,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -115,7 +121,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>

src/views/module_base/elecfeeAdd/ElecfeeAddList.vue

@@ -80,8 +80,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -94,7 +100,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -145,12 +151,14 @@
           {
             title:'电价(元/kw)',
             align:"center",
+            sorter: true,
             dataIndex: 'price'
           },
           {
             title:'开始时间',
             align:"center",
             dataIndex: 'begintime',
+            sorter: true,
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
             // }
@@ -159,6 +167,7 @@
             title:'结束时间',
             align:"center",
             dataIndex: 'endtime',
+            sorter: true,
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
             // }
@@ -171,6 +180,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -193,7 +203,7 @@
           deleteBatch: "/elecfeeAdd/elecfeeAdd/deleteBatch",
           exportXlsUrl: "/elecfeeAdd/elecfeeAdd/exportXls",
           importExcelUrl: "elecfeeAdd/elecfeeAdd/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_base/elecfeeBase/ElecfeeBaseList.vue

@@ -94,8 +94,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -108,7 +114,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
       </a-table>
     </div>
@@ -162,18 +168,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 +192,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 +207,7 @@ export default {
         {
           title:'录入日期',
           align:"center",
+          sorter: true,
           dataIndex: 'createTime',
         },
         {

src/views/module_base/elecfeeDegree/ElecfeeDegreeList.vue

@@ -80,8 +80,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -94,7 +100,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -147,12 +153,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 +170,7 @@
           {
             title:'结束时间',
             align:"center",
+            sorter: true,
             dataIndex: 'endtime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -176,6 +185,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -198,7 +208,7 @@
           deleteBatch: "/elecfeeDegree/elecfeeDegree/deleteBatch",
           exportXlsUrl: "/elecfeeDegree/elecfeeDegree/exportXls",
           importExcelUrl: "elecfeeDegree/elecfeeDegree/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_base/elecfeeRatio/ElecfeeRatioList.vue

@@ -69,8 +69,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -83,7 +89,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -130,24 +136,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 +167,7 @@
           {
             title:'结束时间',
             align:"center",
+            sorter: true,
             dataIndex: 'endtime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -171,6 +182,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -193,7 +205,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

@@ -102,8 +102,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -116,7 +122,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -169,6 +175,7 @@
           {
             title:'计划日期',
             align:"center",
+            sorter: true,
             dataIndex: 'plandate',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -184,6 +191,7 @@
           {
             title:'计划值',
             align:"center",
+            sorter: true,
             dataIndex: 'planvalue',
             width: 150,
           },
@@ -195,6 +203,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -217,7 +226,7 @@
           deleteBatch: "/energyPlan/energyPlan/deleteBatch",
           exportXlsUrl: "/energyPlan/energyPlan/exportXls",
           importExcelUrl: "energyPlan/energyPlan/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_base/energyRate/EnergyRateList.vue

@@ -116,7 +116,14 @@
 
         <template slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
+          <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+          
+          <!-- <a-divider type="vertical"/>
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -126,7 +133,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
 
         </template>
 
@@ -194,11 +201,13 @@
           {
             title: '费率有效期开始',
             align: 'center',
+            sorter: true,
             dataIndex: 'begintime',
           },
           {
             title: '费率有效期结束',
             align: 'center',
+            sorter: true,
             dataIndex: 'endtime',
           },
           {
@@ -252,7 +261,7 @@
             'color': "#1890ff",
             'cursor': "pointer",
           },
-          on: { 
+          on: {
             // 点击事件
             click: (event) => {
               this.$refs.equipmentDetail.detail(record);

src/views/module_base/energyType/EnergyTypeList.vue

@@ -80,8 +80,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -94,7 +100,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -148,12 +154,14 @@
             title:'千克标准煤',
             align:"center",
             dataIndex: 'kgce',
+            sorter: true,
             width:180,
           },
           {
             title:'千克二氧化碳排放',
             align:"center",
             dataIndex: 'co2',
+            sorter: true,
             width:180,
           },
           {
@@ -164,6 +172,7 @@
           {
             title:'录入日期',
             align:"center",
+            sorter: true,
             dataIndex: 'createTime',
           },
           {
@@ -186,7 +195,7 @@
           deleteBatch: "/energyType/energyType/deleteBatch",
           exportXlsUrl: "/energyType/energyType/exportXls",
           importExcelUrl: "energyType/energyType/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/inspect/InspectList.vue

@@ -139,6 +139,7 @@
           {
             title:'工单编号',
             align:"center",
+            sorter: true,
             dataIndex: 'inspectcode'
           },
           {
@@ -191,7 +192,7 @@
           deleteBatch: "/cmmsInspect/cmmsInspect/deleteBatch",
           exportXlsUrl: "/cmmsInspect/cmmsInspect/exportXls",
           importExcelUrl: "cmmsInspect/cmmsInspect/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/inspectContent/InspectContentList.vue

@@ -119,8 +119,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -133,7 +139,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -175,6 +181,7 @@
           {
             title:'巡检项目编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {
@@ -190,7 +197,7 @@
           {
             title:'设备名称',
             align:"center",
-            dataIndex: 'equipmentname'
+            dataIndex: 'equipmentid_dictText'
           },
           {
             title:'状态',

src/views/module_cmms/inspectItem/InspectItemList.vue

@@ -112,8 +112,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -126,7 +132,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -167,6 +173,7 @@
           {
             title:'巡检标准编号',
             align:"center",
+            sorter: true,
             dataIndex: 'itemcode'
           },
           {
@@ -177,7 +184,7 @@
           {
             title:'设备类型',
             align:"center",
-            dataIndex: 'equipdefname'
+            dataIndex: 'equipdefid_dictText'
           },
           // {
           //   title:'条件(字典中定义)',
@@ -226,7 +233,7 @@
           deleteBatch: "/cmmsInspectItem/cmmsInspectItem/deleteBatch",
           exportXlsUrl: "/cmmsInspectItem/cmmsInspectItem/exportXls",
           importExcelUrl: "cmmsInspectItem/cmmsInspectItem/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/inspectLine/InspectLineList.vue

@@ -84,8 +84,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -98,7 +104,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -139,6 +145,7 @@
           {
             title:'巡检路线编号',
             align:"center",
+            sorter: true,
             dataIndex: 'linecode'
           },
           {
@@ -166,7 +173,7 @@
           deleteBatch: "/cmmsInspectLine/cmmsInspectLine/deleteBatch",
           exportXlsUrl: "/cmmsInspectLine/cmmsInspectLine/exportXls",
           importExcelUrl: "cmmsInspectLine/cmmsInspectLine/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/inspectPlan/InspectPlanList.vue

@@ -165,6 +165,7 @@
           {
             title:'巡检计划编号',
             align:"center",
+            sorter: true,
             dataIndex: 'plancode'
           },
           {
@@ -186,6 +187,7 @@
           {
             title:'任务数量',
             align:"center",
+            sorter: true,
             dataIndex: 'tasknum'
           },
           {
@@ -197,6 +199,7 @@
           {
             title:'开始时间',
             align:"center",
+            sorter: true,
             dataIndex: 'begintime',
             customRender:function (text) {
               return !text?"-":(text.length>10?text.substr(0,10):text)
@@ -231,6 +234,7 @@
           {
             title:'下次执行时间',
             align:"center",
+            sorter: true,
             dataIndex: 'nexttime',
             customRender:function (text) {
               return !text?"-":(text.length>10?text.substr(0,10):text)
@@ -239,6 +243,7 @@
           {
             title:'下次通知时间',
             align:"center",
+            sorter: true,
             dataIndex: 'noticetime',
             customRender:function (text) {
               return !text?"-":(text.length>10?text.substr(0,10):text)

src/views/module_cmms/inspectSpot/InspectSpotList.vue

@@ -84,8 +84,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -98,7 +104,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -139,6 +145,7 @@
           {
             title:'巡检点编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {
@@ -166,7 +173,7 @@
           deleteBatch: "/cmmsInspectSpot/cmmsInspectSpot/deleteBatch",
           exportXlsUrl: "/cmmsInspectSpot/cmmsInspectSpot/exportXls",
           importExcelUrl: "cmmsInspectSpot/cmmsInspectSpot/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/repairManage/RepairManageList.vue

@@ -209,12 +209,14 @@
           {
             title:'优先级',
             align:"center",
+            sorter: true,
             dataIndex: 'priority_dictText',
             scopedSlots: { customRender: 'priority' }
           },
           {
             title:'工单编号',
             align:"center",
+            sorter: true,
             dataIndex: 'repaircode',
             // customCell: (record, index)=>{ return this.customCellDetail(record, index, 'customerName')}
             customCell: this.customCellDetail
@@ -232,11 +234,13 @@
           {
             title:'设备编号',
             align:"center",
+            sorter: true,
             dataIndex: 'equipmentcode'
           },
           {
             title:'故障日期',
             align:"center",
+            sorter: true,
             dataIndex: 'faultdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -260,6 +264,7 @@
           {
             title:'维修时间',
             align:"center",
+            sorter: true,
             dataIndex: 'repairdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -302,6 +307,7 @@
           {
             title:'工单状态',
             align:"center",
+            sorter: true,
             dataIndex: 'repairstatus_dictText'
           },
           {
@@ -309,6 +315,7 @@
             align:"center",
             fixed:"right",
             width:80,
+            sorter: true,
             dataIndex: 'status_dictText',
             scopedSlots: { customRender: 'status' }
           },
@@ -383,7 +390,7 @@
         console.log(999,this.deviceOptions)
       },
       // 解决筛选后option不回显问题
-      filterOptions(input, option) {                    
+      filterOptions(input, option) {
         return this.deviceOptions
       },
       // 派单
@@ -431,7 +438,7 @@
             'color': "#1890ff",
             'cursor': "pointer",
           },
-          on: { 
+          on: {
             // 点击事件
             click: (event) => {
               this.$refs.drawerDetail.detail(record);

src/views/module_cmms/repairMy/RepairMyList.vue

@@ -136,7 +136,7 @@
           <a-tag v-if="record.status === '1' || record.status === '2'" color="blue">{{ text }}</a-tag>
           <a-tag v-if="record.status === '3' || record.status === '4'">{{ text }}</a-tag>
         </span>
-        
+
         <span slot="action" slot-scope="text, record">
           <a @click="handleFeedback(record)" :disabled="record.repairstatus === '1'">维修反馈</a>
           <!-- <a-divider type="vertical" /> -->
@@ -182,12 +182,14 @@
           {
             title:'优先级',
             align:"center",
+            sorter: true,
             dataIndex: 'priority_dictText',
             scopedSlots: { customRender: 'priority' }
           },
           {
             title:'工单编号',
             align:"center",
+            sorter: true,
             dataIndex: 'repaircode',
             // customCell: (record, index)=>{ return this.customCellDetail(record, index, 'customerName')}
             // customCell: this.customCellDetail
@@ -205,11 +207,13 @@
           {
             title:'设备编号',
             align:"center",
+            sorter: true,
             dataIndex: 'equipmentcode'
           },
           {
             title:'故障日期',
             align:"center",
+            sorter: true,
             dataIndex: 'faultdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -233,6 +237,7 @@
           {
             title:'维修时间',
             align:"center",
+            sorter: true,
             dataIndex: 'repairdate',
             customRender:function (text) {
               return !text?"":(text.length>10?text.substr(0,10):text)
@@ -297,7 +302,7 @@
         url: {
           list: "/cmmsRepair/cmmsRepair/listMy",
           // exportXlsUrl: "/cmmsRepairMy/cmmsRepairMy/exportXls",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -353,7 +358,7 @@
         console.log(999,this.deviceOptions)
       },
       // 解决筛选后option不回显问题
-      filterOptions(input, option) {                    
+      filterOptions(input, option) {
         return this.deviceOptions
       },
       handleFeedback(record){

src/views/module_cmms/spotcheck/SpotcheckList.vue

@@ -92,8 +92,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -106,7 +112,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -163,6 +169,7 @@
           {
             title:'点检内容编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {
@@ -193,6 +200,7 @@
           {
             title:'点检时间',
             align:"center",
+            sorter: true,
             dataIndex: 'spotcheckdate'
           },
           {

src/views/module_cmms/spotcheck/modules/SpotcheckForm.vue

@@ -379,16 +379,22 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            if (this.model.files.length != 0) {
-              const a  = this.model.files.split(',')
-              this.model.files = a.map((res) => {
-                return {
-                  url: res
-                }
-              })
-            }else{
+            console.log('怎么回事呀',!this.model.files)
+            if (!this.model.files == true) {
               this.model.files = []
+            } else {
+              if (this.model.files.length != 0) {
+                const a  = this.model.files.split(',')
+                this.model.files = a.map((res) => {
+                  return {
+                    url: res
+                  }
+                })
+              }else{
+                this.model.files = []
+              }
             }
+            // console.log('怎么回事呀',this.model)
             httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);

src/views/module_cmms/spotcheckContent/SpotcheckContentList.vue

@@ -89,8 +89,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -103,7 +109,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -157,6 +163,7 @@
           {
             title:'点检内容编号',
             align:"center",
+            sorter: true,
             dataIndex: 'contentcode'
           },
           {

src/views/module_cmms/spotcheckItem/SpotcheckItemList.vue

@@ -111,8 +111,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -125,7 +131,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -178,6 +184,7 @@
           {
             title:'点检项编号',
             align:"center",
+            sorter: true,
             dataIndex: 'itemcode'
           },
           {

src/views/module_cmms/submission/SubmissionList.vue

@@ -188,6 +188,7 @@
           {
             title:'送检编号',
             align:"center",
+            sorter: true,
             dataIndex: 'sjcode',
             scopedSlots: { customRender: 'sjcode' }
           },

src/views/module_cmms/upkeepItem/UpkeepItemList.vue

@@ -110,8 +110,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -124,7 +130,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -175,6 +181,7 @@
           {
             title:'保养项编号',
             align:"center",
+            sorter: true,
             dataIndex: 'itemcode'
           },
           {
@@ -202,7 +209,7 @@
           deleteBatch: "/cmmsUpkeepItem/cmmsUpkeepItem/deleteBatch",
           exportXlsUrl: "/cmmsUpkeepItem/cmmsUpkeepItem/exportXls",
           importExcelUrl: "cmmsUpkeepItem/cmmsUpkeepItem/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],

src/views/module_cmms/upkeepPlan/UpkeepPlanList.vue

@@ -132,8 +132,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -146,7 +152,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>
@@ -188,6 +194,7 @@
           {
             title:'计划编号',
             align:"center",
+            sorter: true,
             dataIndex: 'plancode'
           },
           {
@@ -198,7 +205,7 @@
           {
             title:'设备',
             align:"center",
-            dataIndex: 'equipmentName'
+            dataIndex: 'equipmentid_dictText'
           },
           // {
           //   title:'保养工作项目ID',
@@ -248,6 +255,7 @@
           {
             title:'开始时间',
             align:"center",
+            sorter: true,
             dataIndex: 'begintime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -256,6 +264,7 @@
           {
             title:'重复间隔',
             align:"center",
+            sorter: true,
             dataIndex: 'repeatnum'
           },
           {
@@ -266,6 +275,7 @@
           {
             title:'提前通知时长',
             align:"center",
+            sorter: true,
             dataIndex: 'noticenum'
           },
           {
@@ -283,6 +293,7 @@
           {
             title:'下次执行时间',
             align:"center",
+            sorter: true,
             dataIndex: 'nexttime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -291,6 +302,7 @@
           {
             title:'下次通知时间',
             align:"center",
+            sorter: true,
             dataIndex: 'noticetime',
             // customRender:function (text) {
             //   return !text?"":(text.length>10?text.substr(0,10):text)
@@ -378,7 +390,7 @@
         console.log(999,this.deviceOptions)
       },
       // 解决筛选后option不回显问题
-      filterOptions(input, option) {                    
+      filterOptions(input, option) {
         return this.deviceOptions
       },
       initDictConfig(){

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/messageNotification/messageNotification.vue

@@ -0,0 +1,197 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+
+          <a-col :span="6">
+            <a-form-item label="标题">
+              <a-input placeholder="请输入标题" v-model="queryParam.titile"></a-input>
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="6">
+            <a-form-item label="发布人">
+              <a-input placeholder="请输入发布人" v-model="queryParam.sender"></a-input>
+            </a-form-item>
+          </a-col> -->
+
+          <a-col :span="8" >
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+
+        </a-row>
+      </a-form>
+    </div>
+
+    <div class="table-operator">
+      <a-button type="primary" @click="readAll" icon="book">全部标注已读</a-button>
+    </div>
+
+    <a-table
+      ref="table"
+      size="default"
+      bordered
+      rowKey="id"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="ipagination"
+      :loading="loading"
+      @change="handleTableChange">
+      <span slot="action" slot-scope="text, record">
+        <a @click="showAnnouncement(record)">查看</a>
+      </span>
+    </a-table>
+    <show-announcement ref="ShowAnnouncement"></show-announcement>
+    <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
+  </a-card>
+</template>
+
+<script>
+  import { filterObj } from '@/utils/util'
+  import { getAction,putAction } from '@/api/manage'
+  import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
+  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+  import DynamicNotice from '@/components/tools/DynamicNotice'
+
+  export default {
+    name: "UserAnnouncementList",
+    mixins: [JeecgListMixin],
+    components: {
+      DynamicNotice,
+      ShowAnnouncement
+    },
+    data () {
+      return {
+        description: '系统通告表管理页面',
+        queryParam: {},
+        columns: [{
+          title: '标题',
+          align:"center",
+          dataIndex: 'titile'
+        },{
+          title: '消息类型',
+          align: "center",
+          dataIndex: 'msgCategory',
+          customRender: function (text) {
+            if (text == '1') {
+              return "通知公告";
+            } else if (text == "2") {
+              return "系统消息";
+            } else {
+              return text;
+            }
+          }
+        },{
+          // title: '发布人',
+          // align:"center",
+          // dataIndex: 'sender',
+          title: '发送给',
+          align:"center",
+          dataIndex: 'userId_dictText'
+        },{
+          title: '发布时间',
+          align:"center",
+          dataIndex: 'sendTime'
+        },
+        // {
+        //   title: '优先级',
+        //   align:"center",
+        //   dataIndex: 'priority',
+        //   customRender:function (text) {
+        //     if(text=='L'){
+        //       return "低";
+        //     }else if(text=="M"){
+        //       return "中";
+        //     }else if(text=="H"){
+        //       return "高";
+        //     } else {
+        //       return text;
+        //     }
+        //   }
+        // },
+        {
+          title: '阅读状态',
+          align:"center",
+          dataIndex: 'readFlag',
+          customRender:function (text) {
+            if(text=='0'){
+              return "未读";
+            }else if(text=="1"){
+              return "已读";
+            } else {
+              return text;
+            }
+          }
+        },{
+          title: '操作',
+          dataIndex: 'action',
+          align:"center",
+          scopedSlots: { customRender: 'action' },
+        }],
+		    url: {
+          list: "/sys/sysAnnouncementSend/getAllAnnouncementSend",
+          editCementSend:"sys/sysAnnouncementSend/editByAnntIdAndUserId",
+          readAllMsg:"sys/sysAnnouncementSend/readAll",
+        },
+        loading:false,
+        openPath:'',
+        formData:''
+      }
+    },
+    methods: {
+      handleDetail: function(record){
+        this.$refs.sysAnnouncementModal.detail(record);
+        this.$refs.sysAnnouncementModal.title="查看";
+      },
+      showAnnouncement(record){
+        putAction(this.url.editCementSend,{anntId:record.anntId}).then((res)=>{
+          if(res.success){
+            this.loadData();
+            this.syncHeadNotic(record.anntId)
+          }
+        });
+        if(record.openType==='component'){
+          this.openPath = record.openPage;
+          this.formData = {id:record.busId};
+          this.$refs.showDynamNotice.detail();
+        }else{
+          this.$refs.ShowAnnouncement.detail(record);
+        }
+      },
+      syncHeadNotic(anntId){
+        getAction("sys/annountCement/syncNotic",{anntId:anntId})
+      },
+      readAll(){
+        var that = this;
+        that.$confirm({
+          title:"确认操作",
+          content:"是否全部标注已读?",
+          onOk: function(){
+            putAction(that.url.readAllMsg).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.loadData();
+                that.syncHeadNotic();
+              }
+            });
+          }
+        });
+      },
+    }
+  }
+</script>
+<style scoped>
+  .ant-card-body .table-operator{
+    margin-bottom: 18px;
+  }
+  .anty-row-operator button{margin: 0 5px}
+  .ant-btn-danger{background-color: #ffffff}z
+
+  .ant-modal-cust-warp{height: 100%}
+  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
+  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
+</style>

src/views/module_tpm/tag/TagList.vue

@@ -93,8 +93,14 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
+          <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
+
+          <!-- <a-divider type="vertical" />
           <a-dropdown>
             <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
             <a-menu slot="overlay">
@@ -107,7 +113,7 @@
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
-          </a-dropdown>
+          </a-dropdown> -->
         </span>
 
       </a-table>

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 {
                     }
                 })
             }
-            
+
             })
         },
     }