Commit fd7ceaa2 authored by 李志鸣's avatar 李志鸣

fea(化验室数据): 化验室数据模块功能修改

parent d8776366
This diff is collapsed.
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="scope.row.createTime" v-model="scope.row.createTime"
type="date" type="datetime"
size="small" size="small"
placeholder="请选择取样时间"> placeholder="请选择取样时间">
</el-date-picker> </el-date-picker>
...@@ -268,6 +268,7 @@ ...@@ -268,6 +268,7 @@
this.checkTemplate = [] this.checkTemplate = []
this.checkItem = [] this.checkItem = []
this.checkTemplate.push(_.cloneDeep(response.checkModel)) this.checkTemplate.push(_.cloneDeep(response.checkModel))
this.checkTemplate[0].createTime = new Date()
this.checkTemplate[0].createBy = _.cloneDeep(this.currentLoginName) this.checkTemplate[0].createBy = _.cloneDeep(this.currentLoginName)
this.checkModelId = _.cloneDeep(response.checkModel.id) this.checkModelId = _.cloneDeep(response.checkModel.id)
this.checkItem = _.cloneDeep(response.checkItem) this.checkItem = _.cloneDeep(response.checkItem)
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
label="取样时间" label="取样时间"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatTime(scope.row.createTime, 'YYYY-MM-DD') }} {{ formatTime(scope.row.createTime, 'YYYY-MM-DD HH:mm:ss') }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="scope.row.createTime" v-model="scope.row.createTime"
type="date" type="datetime"
size="small" size="small"
placeholder="请选择取样时间"> placeholder="请选择取样时间">
</el-date-picker> </el-date-picker>
...@@ -268,6 +268,7 @@ ...@@ -268,6 +268,7 @@
this.checkTemplate = [] this.checkTemplate = []
this.checkItem = [] this.checkItem = []
this.checkTemplate.push(_.cloneDeep(response.checkModel)) this.checkTemplate.push(_.cloneDeep(response.checkModel))
this.checkTemplate[0].createTime = new Date()
this.checkTemplate[0].createBy = _.cloneDeep(this.currentLoginName) this.checkTemplate[0].createBy = _.cloneDeep(this.currentLoginName)
this.checkModelId = _.cloneDeep(response.checkModel.id) this.checkModelId = _.cloneDeep(response.checkModel.id)
this.checkItem = _.cloneDeep(response.checkItem) this.checkItem = _.cloneDeep(response.checkItem)
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
label="取样时间" label="取样时间"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatTime(scope.row.createTime, 'YYYY-MM-DD') }} {{ formatTime(scope.row.createTime, 'YYYY-MM-DD HH:mm:ss') }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
<el-date-picker <el-date-picker
style="width: 100%" style="width: 100%"
v-model="scope.row.createTime" v-model="scope.row.createTime"
type="date" type="datetime"
size="small" size="small"
placeholder="请选择取样时间"> placeholder="请选择取样时间">
</el-date-picker> </el-date-picker>
...@@ -268,6 +268,7 @@ ...@@ -268,6 +268,7 @@
this.checkTemplate = [] this.checkTemplate = []
this.checkItem = [] this.checkItem = []
this.checkTemplate.push(_.cloneDeep(response.checkModel)) this.checkTemplate.push(_.cloneDeep(response.checkModel))
this.checkTemplate[0].createTime = new Date()
this.checkTemplate[0].createBy = _.cloneDeep(this.currentLoginName) this.checkTemplate[0].createBy = _.cloneDeep(this.currentLoginName)
this.checkModelId = _.cloneDeep(response.checkModel.id) this.checkModelId = _.cloneDeep(response.checkModel.id)
this.checkItem = _.cloneDeep(response.checkItem) this.checkItem = _.cloneDeep(response.checkItem)
......
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
label="取样时间" label="取样时间"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatTime(scope.row.createTime, 'YYYY-MM-DD') }} {{ formatTime(scope.row.createTime, 'YYYY-MM-DD HH:mm:ss') }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
data () { data () {
return { return {
// 图表Y轴数据 // 图表Y轴数据
chartsYdata:[], chartsYdata: [],
// 下限值 // 下限值
rangeLower: null, rangeLower: null,
// 上限值 // 上限值
......
...@@ -144,7 +144,7 @@ export default { ...@@ -144,7 +144,7 @@ export default {
argumentSelecteStatus: true, argumentSelecteStatus: true,
// 解析后台返回数据的每一条的时间都放到这个数组里 // 解析后台返回数据的每一条的时间都放到这个数组里
parsingTimeList: [], parsingTimeList: [],
temNum:1, temNum: 1
} }
}, },
mounted () { mounted () {
...@@ -154,7 +154,7 @@ export default { ...@@ -154,7 +154,7 @@ export default {
this.getNowYearMonth() this.getNowYearMonth()
let height = (document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight) let height = (document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight)
// console.log((document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight), '23232323232323232') // console.log((document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight), '23232323232323232')
document.getElementById('haveno').style.height = height - 100+ 'px' document.getElementById('haveno').style.height = height - 100 + 'px'
}, },
methods: { methods: {
// 获取图表默认数据 // 获取图表默认数据
...@@ -187,9 +187,9 @@ export default { ...@@ -187,9 +187,9 @@ export default {
this.chartsData = [] this.chartsData = []
this.argumentSelecteStatus = true this.argumentSelecteStatus = true
this.$message.success('刷新成功') this.$message.success('刷新成功')
if(this.chartsData.length === 0){ if (this.chartsData.length === 0) {
let height = (document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight) let height = (document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight)
document.getElementById('haveno').style.height = height - 100+ 'px' document.getElementById('haveno').style.height = height - 100 + 'px'
} }
}, },
// 获取当前月份 // 获取当前月份
...@@ -215,7 +215,7 @@ export default { ...@@ -215,7 +215,7 @@ export default {
}, },
// 搜索 // 搜索
doSearchMonClick () { doSearchMonClick () {
if ( !this.searchData.normalBathSolution) { if (!this.searchData.normalBathSolution) {
this.$message.warning('请选择槽液类型') this.$message.warning('请选择槽液类型')
return return
} }
...@@ -226,9 +226,9 @@ export default { ...@@ -226,9 +226,9 @@ export default {
} }
this.$fetch('daily-check-controller/getCheckItemRecord-get', params).then(res => { this.$fetch('daily-check-controller/getCheckItemRecord-get', params).then(res => {
this.chartsData = _.cloneDeep(res) this.chartsData = _.cloneDeep(res)
for(let item of this.chartsData) { for (let item of this.chartsData) {
item.id = this.temNum item.id = this.temNum
this.temNum+=1 this.temNum += 1
} }
for (let item of res) { for (let item of res) {
for (let items of item.itemRecords) { for (let items of item.itemRecords) {
...@@ -249,11 +249,11 @@ export default { ...@@ -249,11 +249,11 @@ export default {
this.searchData.normalArguments = [] this.searchData.normalArguments = []
this.chartsData = [] this.chartsData = []
this.argumentSelecteStatus = true this.argumentSelecteStatus = true
if(this.chartsData.length === 0){ if (this.chartsData.length === 0) {
let height = (document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight) let height = (document.getElementById('pagePack').offsetHeight) - (document.getElementById('content').offsetHeight)
document.getElementById('haveno').style.height = height - 100+ 'px' document.getElementById('haveno').style.height = height - 100 + 'px'
}
} }
},
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment