Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ls

src/views/trainingManage/editDetails.vue

@@ -28,7 +28,7 @@
           </el-table-column>
           <el-table-column :label="$t('trainingManage.stepDescription')">
             <template slot-scope="scope">
-              <span>{{ scope.row.description }}</span>
+              <el-input v-model="scope.row.description" placeholder="请输入步骤描述" size="mini" />
             </template>
           </el-table-column>
           <el-table-column :label="$t('trainingManage.triggerCondition')">
@@ -156,7 +156,19 @@ export default {
             return name;
         },
         getConditionName(row, key) {
-            const n = row[key] || '';
+            const obj = row[key] || {};
+            let n = '';
+            switch (obj.t) {
+            case 'V':
+                n = `值为${obj.v}`;
+                break;
+            case 'S':
+                n = `${obj.elementCode}设备的${obj.filedName}属性`;
+                break;
+            case 'E':
+                n = '';
+                break;
+            }
             return n;
         },
         addStep() {