new Changes

This commit is contained in:
saeid
2019-08-21 13:38:41 +04:30
parent e8bf0c8772
commit d5eb3d7f9f
10 changed files with 68803 additions and 44 deletions
+119 -26
View File
@@ -33,10 +33,13 @@
</v-btn>
</v-flex>
</v-layout>
<v-layout row wrap class="px-5 my-3" v-if="!$route.params.testResult && form.length" >
<v-layout row wrap class="px-5 my-3" v-if="!$route.params.testResult && form.length">
<v-divider></v-divider>
</v-layout>
<v-layout align-center justify-center wrap class="px-5 my-3" v-if="form.length">
<v-flex xs12 sm12 md12>
<h3>{{testTypeNameSelected}}</h3>
</v-flex>
<v-flex xs12 sm4 md4>
<v-text-field
name="autoclave"
@@ -47,10 +50,30 @@
></v-text-field>
</v-flex>
<v-flex xs12 sm4 md4>
<v-text-field v-model="formData.cycle_number" label="Cycle Number" color="black" class="pa-2"></v-text-field>
<v-menu
lazy
:close-on-content-click="true"
transition="v-scale-transition"
offset-y
v-model="menu"
>
<v-text-field
prepend-icon="far fa-clock"
required
slot="activator"
label="Date"
v-model="formData.date"
></v-text-field>
<v-date-picker
color="pink"
no-title
v-model="formData.date"
:date-format="date => new Date(date).toDateString()"
></v-date-picker>
</v-menu>
</v-flex>
<v-flex xs12 sm4 md4>
<v-switch v-model="result" :label="'Result: ' + formData.result"></v-switch>
<v-switch color="green" v-model="result" :label="'Result: ' + formData.result"></v-switch>
</v-flex>
<v-flex xs12 sm12 md12>
<div>
@@ -73,15 +96,32 @@
:label="item.name"
color="black"
></v-text-field>
<v-text-field
v-if="item.type == 'Temperature'"
type="number"
v-model="formData[item.name+'_'+item.id]"
:label="item.name"
min="0"
max="200"
color="black"
></v-text-field>
<v-container fluid v-if="item.type == 'Temperature'">
<p>{{ item.name }}</p>
<v-flex xs12>
<v-slider
step="0.1"
prepend-icon="fas fa-temperature-high"
v-model="formData[item.name+'_'+item.id]"
min="0"
max="200"
thumb-label="always"
></v-slider>
</v-flex>
</v-container>
<v-container fluid v-if="item.type == 'Pressure'">
<p>{{ item.name }}</p>
<v-flex xs12>
<v-slider
prepend-icon="fa fa-tachometer"
step="0.001"
v-model="formData[item.name+'_'+item.id]"
min="-1"
max="3"
thumb-label="always"
></v-slider>
</v-flex>
</v-container>
<v-select
multiple
v-if="item.type == 'Select'"
@@ -115,6 +155,7 @@
</v-container>
<v-container fluid v-if="item.type == 'Switch'">
<v-switch
color="green"
v-model="formData[item.name+'_'+item.id]"
:label="item.name + ': ' + formData[item.name+'_'+item.id].toString()"
></v-switch>
@@ -132,7 +173,12 @@
</v-container>
<v-container fluid v-if="item.type == 'Time'">
<v-flex xs12>
<v-time-picker v-model="formData[item.name+'_'+item.id]"></v-time-picker>
<v-text-field
v-model="formData[item.name+'_'+item.id]"
:label="item.name"
class="WM-Font-30"
mask="##:##"
></v-text-field>
</v-flex>
</v-container>
<template v-if="item.type == 'Form'">
@@ -152,15 +198,31 @@
:label="children.name"
color="black"
></v-text-field>
<v-text-field
v-if="children.type == 'Temperature'"
v-model="formData[children.name+'_'+children.id]"
:label="children.name"
type="number"
min="0"
max="200"
color="black"
></v-text-field>
<v-container fluid v-if="children.type == 'Temperature'">
<p>{{ children.name }}</p>
<v-flex xs12>
<v-slider
prepend-icon="fas fa-temperature-high"
step="0.1"
v-model="formData[children.name+'_'+children.id]"
min="0"
max="200"
thumb-label="always"
></v-slider>
</v-flex>
</v-container>
<v-container step="0.001" fluid v-if="children.type == 'Pressure'">
<p>{{ children.name }}</p>
<v-flex xs12>
<v-slider
v-model="formData[children.name+'_'+children.id]"
min="-1"
max="3"
prepend-icon="fa fa-tachometer"
thumb-label="always"
></v-slider>
</v-flex>
</v-container>
<v-select
multiple
v-if="children.type == 'Select'"
@@ -194,6 +256,7 @@
</v-container>
<v-container fluid v-if="children.type == 'Switch'">
<v-switch
color="green"
v-model="formData[children.name+'_'+children.id]"
:label="children.name + ': ' + formData[children.name+'_'+children.id].toString()"
></v-switch>
@@ -211,7 +274,12 @@
</v-container>
<v-container fluid v-if="children.type == 'Time'">
<v-flex xs12>
<v-time-picker v-model="formData[children.name+'_'+children.id]"></v-time-picker>
<v-text-field
v-model="formData[children.name+'_'+children.id]"
:label="children.name"
class="WM-Font-30"
mask="##:##"
></v-text-field>
</v-flex>
</v-container>
</v-flex>
@@ -245,6 +313,7 @@ import { urls } from "@/config/urls";
export default {
data: () => ({
testTypeNames: [],
testTypeNameSelected: "",
searchInput: "",
form: [],
filter: {
@@ -255,13 +324,13 @@ export default {
result: false,
formData: {
device_id: "",
device_label: "AutoClaveID or WasherID",
device_label: "ID",
result: "Reject",
cycle_number: "",
img: null,
test_type_id: ""
},
images: []
images: [],
menu: ""
}),
created() {
if (this.$route.params.testResult) {
@@ -278,6 +347,7 @@ export default {
async selectTestType() {
const result = await ApiService.post(urls.getInputs, this.filter);
if (result && result.status == 200) {
this.testTypeNameSelected = result.data.data.testType.name;
this.form = result.data.data.inputs;
this.formData.test_type_id = result.data.data.testType.id;
this.formData.device_label =
@@ -418,3 +488,26 @@ export default {
}
};
</script>
<style >
.WM-Font-30 input {
font-size: 30px !important;
}
.v-input--switch__track:not(.green--text) {
color: red !important;
}
.v-input--switch__thumb:not(.green--text) {
background-color: red !important;
}
.v-btn--floating {
padding: 0 !important;
}
.theme--light.v-btn.v-btn--flat {
color: rgba(0, 0, 0, 0.87) !important;
}
.v-btn--floating,
.v-btn--icon:before {
border-radius: 50% !important;
}
</style>