joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient

Browse Source
This commit is contained in:
ival 2019-08-12 09:36:43 +08:00
commit 94e16353f3
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/i18n/langs/en/scriptRecord.js
View File

@ -14,4 +14,9 @@ export default {
roleAdd: "Add",
delete: "Delete",
behaviorOperate: "Behavior Operate",
conditionTitle: "Target condition",
deviceType: "Device Type",
deviceCondition: "Device Condition",
paramDeviceType: "Param DeviceType",
paramDeviceCode: "Param DeviceCode",
};

5
src/i18n/langs/zh/scriptRecord.js
View File

@ -14,4 +14,9 @@ export default {
roleAdd: "添加",
delete: "删除",
behaviorOperate: "行为操作",
conditionTitle: "目标条件",
deviceType: "设备类型",
deviceCondition: "设备条件",
paramDeviceType: "参数设备类型",
paramDeviceCode: "参数设备编号",
};

14
src/views/display/scriptRecord/deviceCondition.vue
View File

@ -1,13 +1,13 @@
<template>
<div>
<el-form label-width="80px">
<el-form label-width="140px">
<el-form-item :label="title">
<el-button type="primary" size="small" @click="addDeviceCondition" :disabled="isdisabled">添加</el-button>
</el-form-item>
</el-form>
<el-table
:data="ConditionVOList" border style="margin-top:10px;margin-left:10px;width:901px">
<el-table-column label="设备类型" width="150">
<el-table-column :label="$t('scriptRecord.deviceType')" width="150">
<template slot-scope="scope">
<div v-if="scope.row.isAdded">{{scope.row.deviceType}}</div>
<el-select v-else v-model="scope.row.deviceType" placeholder="请选择" @change="changeDeviceType($event,scope.row)">
@ -15,7 +15,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="设备编号" width="150">
<el-table-column :label="$t('scriptRecord.deviceCode')" width="150">
<template slot-scope="scope">
<div v-if="scope.row.isAdded">{{scope.row.code}}</div>
<el-select v-else v-model="scope.row.code" placeholder="请选择">
@ -23,7 +23,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="设备条件" width="150">
<el-table-column :label="$t('scriptRecord.deviceCondition')" width="150">
<template slot-scope="scope">
<div v-if="scope.row.isAdded">{{scope.row.condition}}</div>
<el-select v-else v-model="scope.row.condition" placeholder="请选择">
@ -31,7 +31,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="参数设备类型" width="150">
<el-table-column :label="$t('scriptRecord.paramDeviceType')" width="150">
<template slot-scope="scope">
<div v-if="scope.row.isAdded">{{scope.row.paramDeviceType}}</div>
<el-select v-else v-model="scope.row.paramDeviceType" placeholder="请选择" @change="changeParamDeviceType">
@ -39,7 +39,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="参数设备编号" width="150">
<el-table-column :label="$t('scriptRecord.paramDeviceCode')" width="150">
<template slot-scope="scope">
<div v-if="scope.row.isAdded">{{scope.row.paramCode}}</div>
<el-select v-else v-model="scope.row.paramCode" placeholder="请选择">
@ -47,7 +47,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" width="150">
<el-table-column :label="$t('scriptRecord.operation')" width="150">
<template slot-scope="scope">
<el-row v-if="scope.row.isAdded">
<el-button type="primary" size="mini" @click="deleteOperate(scope.$index)">删除</el-button>

2
src/views/display/scriptRecord/targetCondition.vue
View File

@ -40,7 +40,7 @@
data(){
return{
deviceConditionList:[],
conditionTitle:"目标条件",
conditionTitle:this.$t("scriptRecord.conditionTitle"),
isAdding:false,
// fieldS:"",
}