竞赛平台代码调整

This commit is contained in:
joylink_cuiweidong 2020-10-14 09:47:19 +08:00
parent a5025eda1c
commit ce505f915b
3 changed files with 20 additions and 4 deletions

View File

@ -477,6 +477,7 @@ export default {
}); });
}, },
startTraining() { startTraining() {
this.getEmptyOperationalStatistics();
let userRole = 'AUDIENCE'; let userRole = 'AUDIENCE';
if (this.$route.query.prdType) { if (this.$route.query.prdType) {
if (this.$route.query.prdType == '02') { if (this.$route.query.prdType == '02') {

View File

@ -8,18 +8,17 @@
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<div v-for="(item,index) in resultData.itemVOS" :key="index" style="margin-top:10px;"> <div v-for="(item,index) in resultData.itemVOS" :key="index" style="margin-top:10px;">
<span style="margin-left: 20px;">{{ item.description+':' }}</span> <span class="itemDescription">{{ item.description+':' }}</span>
<el-time-picker <el-time-picker
v-if="item.type=='Time'" v-if="item.type=='Time'"
v-model="dataList[index]" v-model="dataList[index]"
value-format="HH:mm" value-format="HH:mm"
format="HH:mm" format="HH:mm"
size="small" size="small"
style="width:200px;display:inline-block;" class="itemFormItem"
:placeholder="item.description"
@change="((val)=>{changeData(val,index)}) " @change="((val)=>{changeData(val,index)}) "
/> />
<el-input v-if="item.type=='Non_Time'" v-model="dataList[index]" type="text" :style="{width: '125px'}" size="small" :maxlength="100" @change="((val)=>{changeNoTimeData(val,index)}) " /> <el-input v-if="item.type=='Non_Time'" v-model="dataList[index]" type="text" class="itemFormItem" size="small" :maxlength="100" @change="((val)=>{changeNoTimeData(val,index)}) " />
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -95,3 +94,17 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped>
.itemDescription{
margin-left: 20px;
width:180px;
display: inline-block;
text-align: right;
vertical-align: middle;
}
.itemFormItem{
width:200px;
display:inline-block;
vertical-align: middle;
}
</style>

View File

@ -246,6 +246,8 @@ function covertOperation(deviceType, operationParamMap, operationType) {
if (device.parentCode && device.type == '02') { if (device.parentCode && device.type == '02') {
const parentSection = store.getters['map/getDeviceByCode'](device.parentCode); const parentSection = store.getters['map/getDeviceByCode'](device.parentCode);
deviceName += '【' + operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name + '】'; deviceName += '【' + operateEnum[deviceType].type + ' ' + parentSection.name + '-' + device.name + '】';
} else {
deviceName += '【' + operateEnum[deviceType].type + device.name + '】';
} }
} else { } else {
let deviceNameIn = ''; let deviceNameIn = '';