wyh 1 년 전
부모
커밋
5405fd8769

+ 15 - 1
src/views/module_ems/tpmEquipment/modules/TpmEquipmentForm.vue

@@ -24,7 +24,21 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentcode">
+            <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentcode">
+              <span slot="label">
+                设备编号&nbsp;
+                <a-tooltip title="若未填写设备编号 则自动生成">
+                  <a-icon type="exclamation-circle" theme="filled" />
+                  <!-- <a-icon type="exclamation-circle" /> -->
+                  <!-- <a-icon type="question-circle-o" /> -->
+                </a-tooltip>
+              </span>
+              <!-- <a-tooltip placement="top">
+                <template slot="title">
+                  <span>若未填写设备编号 则自动生成</span>
+                </template>
+                <a-button>Top</a-button>
+              </a-tooltip> -->
               <a-input v-model="model.equipmentcode" placeholder="请输入设备编号"  ></a-input>
             </a-form-model-item>
           </a-col>

+ 5 - 5
src/views/module_ems/tpmTag/TpmTagList.vue

@@ -198,11 +198,11 @@
             align:"center",
             dataIndex: 'tagvalue'
           },
-          {
-            title:'最后一次报警时间',
-            align:"center",
-            dataIndex: 'lastalarmtime'
-          },
+          // {
+          //   title:'最后一次报警时间',
+          //   align:"center",
+          //   dataIndex: 'lastalarmtime'
+          // },
           {
             title: '操作',
             dataIndex: 'action',

+ 2 - 2
src/views/module_ems/tpmTag/modules/TpmTagForm.vue

@@ -69,11 +69,11 @@
               <a-input-number v-model="model.tagvalue" placeholder="请输入当前点位值" style="width: 100%" />
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <!-- <a-col :span="24">
             <a-form-model-item label="最后一次报警时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lastalarmtime">
               <j-date placeholder="请选择最后一次报警时间"  v-model="model.lastalarmtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
-          </a-col>
+          </a-col> -->
         </a-row>
       </a-form-model>
     </j-form-container>