保养项、巡检管理、巡检计划的小bug修改

src/views/module_cmms/inspectLine/InspectLineList.vue

@@ -196,7 +196,7 @@
         fieldList.push({type:'string',value:'linecode',text:'巡检路线编号',dictCode:''})
         fieldList.push({type:'string',value:'linename',text:'巡检路线名称',dictCode:''})
         this.superFieldList = fieldList
-      }
+      },
     }
   }
 </script>

src/views/module_cmms/inspectLine/modules/InspectLineForm.vue

@@ -1,6 +1,6 @@
 <template>
   <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
+    <j-form-container>
       <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <div class="cmms-dialog-item-title">巡检路线基本信息</div>
         <a-row>
@@ -21,7 +21,7 @@
             </a-form-model-item>
           </a-col>
         </a-row>
-        <div class="cmms-dialog-item-title u-flex-jab">
+        <div v-if="!disabled" class="cmms-dialog-item-title u-flex-jab">
           <div>巡检点设置</div>
           <div @click="addInspectSpot"><a-icon type="plus"/>巡检点</div>
         </div>

src/views/module_cmms/inspectLine/modules/InspectLineModal.vue

@@ -4,6 +4,7 @@
     :visible.sync="visible"
     contentFull
     @ok="handleOk"
+    :bottons="!disableSubmit"
     @cancel="handleCancel">
     <inspect-line-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></inspect-line-form>
   </u-modal>
@@ -17,6 +18,14 @@
     components: {
       InspectLineForm
     },
+    props: {
+      //表单禁用
+      disableSubmit: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
     data () {
       return {
         title:'',

src/views/module_cmms/inspectPlan/InspectPlanList.vue

@@ -201,9 +201,9 @@
             align:"center",
             sorter: true,
             dataIndex: 'begintime',
-            customRender:function (text) {
-              return !text?"-":(text.length>10?text.substr(0,10):text)
-            }
+            // customRender:function (text) {
+            //   return !text?"-":(text.length>10?text.substr(0,10):text)
+            // }
           },
           {
             title:'重复周期',
@@ -236,29 +236,29 @@
             align:"center",
             sorter: true,
             dataIndex: 'nexttime',
-            customRender:function (text) {
-              return !text?"-":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'下次通知时间',
-            align:"center",
-            sorter: true,
-            dataIndex: 'noticetime',
-            customRender:function (text) {
-              return !text?"-":(text.length>10?text.substr(0,10):text)
-            }
-          },
-          {
-            title:'是否已通知',
-            align:"center",
-            dataIndex: 'ifnotice'
-          },
-          {
-            title:'备注',
-            align:"center",
-            dataIndex: 'remark'
+            // customRender:function (text) {
+            //   return !text?"-":(text.length>10?text.substr(0,10):text)
+            // }
           },
+          // {
+          //   title:'下次通知时间',
+          //   align:"center",
+          //   sorter: true,
+          //   dataIndex: 'noticetime',
+          //   customRender:function (text) {
+          //     return !text?"-":(text.length>10?text.substr(0,10):text)
+          //   }
+          // },
+          // {
+          //   title:'是否已通知',
+          //   align:"center",
+          //   dataIndex: 'ifnotice'
+          // },
+          // {
+          //   title:'备注',
+          //   align:"center",
+          //   dataIndex: 'remark'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

src/views/module_cmms/spotcheckItem/SpotcheckItemList.vue

@@ -229,7 +229,7 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){

src/views/module_cmms/upkeepItem/UpkeepItemList.vue

@@ -176,7 +176,7 @@
           {
             title:'设备类型',
             align:"center",
-            dataIndex: 'equiptypeName'
+            dataIndex: 'equipdefid_dictText'
           },
           {
             title:'保养项编号',
@@ -216,7 +216,7 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){
@@ -230,7 +230,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'itemcode',text:'保养编号',dictCode:''})
         fieldList.push({type:'string',value:'itemname',text:'名称',dictCode:''})
-        fieldList.push({type:'string',value:'equipdefid',text:'设备类型ID（设备树，可单选可多选，多选设备类型用逗号连接）',dictCode:''})
+        fieldList.push({type:'sel_search',value:'equipmenttreeid',text:'设备类型ID',dictTable:"tpm_equipment_tree", dictText:'name', dictCode:'id'})
         fieldList.push({type:'string',value:'itemcontent',text:'保养标准',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
         this.superFieldList = fieldList

src/views/module_tpm/healthDiagnosis/index.vue

@@ -151,6 +151,7 @@
               </span>
             </a-table>
           </div>
+          <message-alarm-modal ref="modalForm" @ok="modalFormOk"></message-alarm-modal>
         </a-card>
       </a-col>
     </a-row>
@@ -163,14 +164,22 @@
 </template>
 
 <script>
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import * as echarts from 'echarts'
 // import { listAlarmdata } from "@/api/alarm/alarmdata.js";
 import { httpAction, getAction, postAction } from '@/api/manage'
 import { emsdata } from '../../module_ems/energyAnalyse/emsdata'
 import { pvdata } from '../../module_ems/photovoltaic/pvdata'
+  import MessageAlarmModal from '../messageAlarm/modules/MessageAlarmModal'
 
 export default {
   name: 'Index',
+  mixins:[JeecgListMixin, mixinDevice],
+  components: {
+    MessageAlarmModal
+  },
   data() {
     return {
       loading: true,
@@ -220,21 +229,21 @@ export default {
           align: 'center',
           dataIndex: 'alarmlevel_dictText',
         },
-        {
-          title: '当前值',
-          align: 'center',
-          dataIndex: 'nowvalue',
-        },
-        {
-          title: '阈值最小值',
-          align: 'center',
-          dataIndex: 'vmin',
-        },
-        {
-          title: '阈值最大值',
-          align: 'center',
-          dataIndex: 'vmax',
-        },
+        // {
+        //   title: '当前值',
+        //   align: 'center',
+        //   dataIndex: 'nowvalue',
+        // },
+        // {
+        //   title: '阈值最小值',
+        //   align: 'center',
+        //   dataIndex: 'vmin',
+        // },
+        // {
+        //   title: '阈值最大值',
+        //   align: 'center',
+        //   dataIndex: 'vmax',
+        // },
         {
           title: '处理状态',
           align: 'center',
@@ -261,12 +270,15 @@ export default {
       alarmList: [],
       deviceOptions: [],
       deviceOptionsAll: [],
+      queryParam: {
+        status: "0",
+      }
     }
   },
   created() {},
   mounted() {
     // this.getAlarmList()
-    this.getTest()
+    this.getTest();
     this.getDeviceOption();
   },
   methods: {