特性

ems-ui/src/views/basecfg/device/model.vue

@@ -86,7 +86,7 @@
             type="text"
             icon="el-icon-info"
             @click="handleDetail(scope.row)"
-           >
+          >
             特性</el-button>
         </template>
       </el-table-column>
@@ -134,7 +134,7 @@
             <el-table v-loading="loading" :data="attrList">
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="序号" align="center" prop="id" />
-<!--              <el-table-column label="模型code" align="center" prop="modelCode" />-->
+                     <el-table-column label="模型code" align="center" prop="modelCode" />
               <el-table-column label="属性名称" align="center" prop="attrName" />
               <el-table-column label="属性标识" align="center" prop="attrKey" />
               <el-table-column label="属性值" align="center" prop="attrValue" />
@@ -154,10 +154,9 @@
             <!-- 添加或修改服务区用电属性对话框 -->
             <el-dialog :title="title" :visible.sync="attrOpen" width="500px" append-to-body>
               <el-form ref="attrForm" :model="attrForm" :rules="attrRules" label-width="150px">
-<!--                <el-form-item label="模型code" prop="modelCode">-->
-<!--                  <el-input v-model="attrForm.modelCode" placeholder="请输入模型code" />-->
-<!--                </el-form-item>-->
-
+                  <el-form-item label="模型code" prop="modelCode">
+                  <el-input v-model="attrForm.modelCode" placeholder="请输入模型code" />
+                  </el-form-item>
                 <el-form-item label="属性名称" prop="attrName">
                   <el-input v-model="attrForm.attrName" placeholder="请输入属性名称" />
                 </el-form-item>
@@ -188,11 +187,15 @@
             <el-table v-loading="loading" :data="eventList">
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="序号" align="center" prop="id" />
-<!--              <el-table-column label="模型code" align="center" prop="modelCode" />-->
-              <el-table-column label="事件名称" align="center" prop="eventName" />
-              <el-table-column label="事件类型" align="center" prop="eventType" />
-<!--              <el-table-column label="事件名称" align="center" prop="eventKey" />-->
-<!--              <el-table-column label="事件名称" align="center" prop="eventDesc" />-->
+                  <el-table-column label="模型code" align="center" prop="modelCode" />
+              <el-table-column label="事件名称" align="center" prop="eventKey" />
+              <el-table-column label="事件类型" align="center" prop="eventType">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.eventType === 1 ? '消息上报' : '异常告警' }}</span>
+                </template>
+              </el-table-column>
+              <!--              <el-table-column label="事件名称" align="center" prop="eventDesc" />-->
+              <!--              <el-table-column label="事件名称" align="center" prop="eventName" />-->
               <el-table-column label="事件代码" align="center" prop="eventCode" />
               <el-table-column label="外系统事件代码" align="center" prop="extEventCode" />
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -211,21 +214,21 @@
             <!-- 添加或修改事件对话框 -->
             <el-dialog :title="title" :visible.sync="eventOpen" width="500px" append-to-body>
               <el-form ref="eventForm" :model="eventForm" :rules="eventRules" label-width="80px">
-<!--                <el-form-item label="模型code" prop="modelCode">-->
-<!--                  <el-input v-model="eventForm.modelCode" placeholder="请输入模型code" />-->
-<!--                </el-form-item>-->
-<!--                <el-form-item label="事件名称" prop="eventKey">-->
-<!--                  <el-input v-model="eventForm.eventKey" placeholder="请输入事件名称" />-->
-<!--                </el-form-item>-->
-                <el-form-item label="事件名称" prop="eventName">
-                  <el-input v-model="eventForm.eventName" placeholder="请输入事件名称" />
-                </el-form-item>
+                                <el-form-item label="模型code" prop="modelCode">
+                                  <el-input v-model="eventForm.modelCode" placeholder="请输入模型code" />
+                                </el-form-item>
+                                <el-form-item label="事件名称" prop="eventKey">
+                                  <el-input v-model="eventForm.eventKey" placeholder="请输入事件名称" />
+                                </el-form-item>
                 <el-form-item label="事件类型" prop="eventType">
                   <el-input v-model="eventForm.eventType" placeholder="请输入事件类型" />
                 </el-form-item>
-<!--                <el-form-item label="事件名称" prop="eventDesc">-->
-<!--                  <el-input v-model="eventForm.eventDesc" type="textarea" placeholder="请输入内容" />-->
-<!--                </el-form-item>-->
+                <!--                <el-form-item label="事件名称" prop="eventName">-->
+                <!--                  <el-input v-model="eventForm.eventName" placeholder="请输入事件名称" />-->
+                <!--                </el-form-item>-->
+                <!--                <el-form-item label="事件名称" prop="eventDesc">-->
+                <!--                  <el-input v-model="eventForm.eventDesc" type="textarea" placeholder="请输入内容" />-->
+                <!--                </el-form-item>-->
                 <el-form-item label="事件代码" prop="eventCode">
                   <el-input v-model="eventForm.eventCode" placeholder="请输入事件代码" />
                 </el-form-item>
@@ -250,8 +253,8 @@
             <el-table v-loading="loading" :data="abilityList">
               <el-table-column type="selection" width="55" align="center" />
               <el-table-column label="序号" align="center" prop="id" />
-<!--              <el-table-column label="模型code" align="center" prop="modelCode" />-->
-<!--              <el-table-column label="能力键" align="center" prop="abilityKey" />-->
+                            <el-table-column label="模型code" align="center" prop="modelCode" />
+                            <el-table-column label="能力键" align="center" prop="abilityKey" />
               <el-table-column label="能力名称" align="center" prop="abilityName" />
               <el-table-column label="能力参数" align="center" prop="abilityParam" />
               <el-table-column label="能力描述" align="center" prop="abilityDesc" />
@@ -268,12 +271,12 @@
             <!-- 添加或修改能力对话框 -->
             <el-dialog :title="title" :visible.sync="abilityOpen" width="500px" append-to-body>
               <el-form ref="abilityForm" :model="abilityForm" :rules="abilityRules" label-width="80px">
-<!--                <el-form-item label="模型code" prop="modelCode">-->
-<!--                  <el-input v-model="abilityForm.modelCode" placeholder="请输入模型code" />-->
-<!--                </el-form-item>-->
-<!--                <el-form-item label="能力键" prop="abilityKey">-->
-<!--                  <el-input v-model="abilityForm.abilityKey" placeholder="请输入能力键" />-->
-<!--                </el-form-item>-->
+                                <el-form-item label="模型code" prop="modelCode">
+                                  <el-input v-model="abilityForm.modelCode" placeholder="请输入模型code" />
+                                </el-form-item>
+                                <el-form-item label="能力键" prop="abilityKey">
+                                  <el-input v-model="abilityForm.abilityKey" placeholder="请输入能力键" />
+                                </el-form-item>
                 <el-form-item label="能力名称" prop="abilityName">
                   <el-input v-model="abilityForm.abilityName" placeholder="请输入能力名称" />
                 </el-form-item>
@@ -358,9 +361,9 @@ export default {
       abilityForm: {},
       //  表单校验
       rules: {
-        modelCode: [
-          { required: true, message: "模型code不能为空", trigger: "blur" }
-        ],
+        // modelCode: [
+        //   { required: true, message: "模型code不能为空", trigger: "blur" }
+        // ],
         modelName: [
           { required: true, message: "模型名称不能为空", trigger: "blur" }
         ],
@@ -369,12 +372,12 @@ export default {
         ]
       },
       eventRules: {
-        modelCode: [
-          {required: true, message: "模型code不能为空", trigger: "blur"}
-        ],
-        eventKey: [
-          {required: true, message: "事件名称不能为空", trigger: "blur"}
-        ],
+        // modelCode: [
+        //   {required: true, message: "模型code不能为空", trigger: "blur"}
+        // ],
+        // eventKey: [
+        //   {required: true, message: "事件名称不能为空", trigger: "blur"}
+        // ],
         eventType: [
           {required: true, message: "事件类型不能为空", trigger: "change"}
         ],
@@ -383,9 +386,9 @@ export default {
         ],
       },
       attrRules: {
-        modelCode: [
-          {required: true, message: "模型code不能为空", trigger: "blur"}
-        ],
+        // modelCode: [
+        //   {required: true, message: "模型code不能为空", trigger: "blur"}
+        // ],
         attrKey: [
           {required: true, message: "属性标识不能为空", trigger: "blur"}
         ],

ems-ui/src/views/basecfg/emsfacs/index.vue

@@ -186,6 +186,7 @@
           </el-card>
         </div>
       </el-dialog>
+
 <!--    <el-drawer :title="curRow.facsName" size="80%" :visible.sync="showDrawer" direction="rtl">-->
 <!--      <div class="drawer-content">-->
 <!--        <el-tabs v-model="subKey">-->
@@ -235,6 +236,9 @@
                 <template slot-scope="scope">
                   <span>{{ scope.row.eventType === 1 ? '消息上报' : '异常告警' }}</span>
                 </template>
+<!--                <template slot-scope="scope">-->
+<!--                  <span>{{ scope.row.eventType === 1 ? '消息上报' : '异常告警' }}</span>-->
+<!--                </template>-->
 <!--              </el-table-column>-->
 <!--              <el-table-column label="事件代码" align="center" prop="eventCode" />-->
 <!--              <el-table-column label="外部事件代码" align="center" prop="extEventCode" />-->
@@ -527,7 +531,6 @@ export default {
         this.abilityData=response.data.abilityList
 
       })
-
     },
 
     /** 删除按钮操作 */