Skip to content

T
tianjin
Commit d9c40ec4 authored by 徐来柯's avatar 徐来柯
Browse files
Options

Merge branch 'develop' of https://gitlab.com/970104719/tijing into develop

parents d6683988 cd3d0f61
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 53 deletions
src/components/leftNav/LeftNav1.vue
View file @ d9c40ec4
......@@ -2,8 +2,8 @@
* @Description: 左侧导航栏
* @Date: 2019-11-23 11:50:53
* @Author: 随风
* @LastEditors: 随风
* @LastEditTime: 2019-12-01 19:01:37
* @LastEditors: Tao
* @LastEditTime: 2021-02-02 15:31:22
-->
<template>
<div
......
src/views/cpk/cpk.vue
View file @ d9c40ec4
......@@ -3,7 +3,7 @@
* @since: 2019-11-08 15:00:48
* @Author: jawnwa22
* @LastEditors: Tao
* @LastEditTime: 2021-01-29 19:46:17
* @LastEditTime: 2021-02-02 15:23:01
-->
<template>
<div class="tapwater" v-loading="this.$store.state.isShow"
......@@ -68,7 +68,7 @@
stripe
ref="multipleTable"
border
:header-cell-style="{background:($store.state.color=='grey')?'#D9DBDE':'#5a6c98',color:($store.state.color=='grey')?'#000':'#fff','border-left':'1px solid #cccccc',height:'50px',padding:'0'}"
:header-cell-style="[{background:(($store.state.color=='grey')?'#D9DBDE':'#5a6c98')},{color:(($store.state.color=='grey')?'#000':'#fff')}, {'border-left':'1px solid #cccccc',height:'50px',padding:'0'}]"
@row-click="handleRowChange1"
@cell-mouse-leave="leave"
@cell-dblclick="twoclick"
......@@ -243,7 +243,7 @@ export default {
//表格导入
var that = this;
const files = e.target.files;
console.log(files);
if (files.length <= 0) {
//如果没有文件名
return false;
......@@ -253,40 +253,17 @@ export default {
}
const fileReader = new FileReader();
fileReader.onload = ev => {
try {
const data = ev.target.result;
const workbook = XLSX.read(data, {
type: 'binary'
});
console.log(workbook)
const wsname = workbook.SheetNames[0]; //取第一张表
const ws = XLSX.utils.sheet_to_json(
workbook.Sheets[wsname]
); //生成json表格内容
let timearr = []
console.log(ws)
ws.forEach((item)=>{
timearr.push(item.记录时间)
})
console.log("sj",timearr)
// this.$axios({
// method:'POST',
// url:'/api/QualityManage/verificationtime',
// data:timearr
// }).then(res=>{
// console.log(res)
// if(res.data.code!==0){
// this.tipchange1 = true;
// this.pdyd3 = true;
// this.w = res.data.msg;
// }else{
console.log(workbook);
let b = 0;
for (b in workbook.Strings) {
if (!workbook.Strings[0].t == '序号') {
......@@ -313,9 +290,6 @@ export default {
// ws[a].array = null;
// }
}
let a1 = parseInt(this.data.PrSampleNumber);
console.log("this",this.data)
if (ws.length % this.data.PrSampleNumber !== 0) {
......@@ -323,8 +297,7 @@ export default {
this.pdyd3 = true;
this.ccc = true;
this.w = `导入的样本总数不是样本容量的整数倍，请修改样本表重新导入`;
}else {
} else {
let a3 = 0;
for(a3 = 0;a3<ws.length;a3++){
let a4 = a3+1;
......@@ -437,11 +410,7 @@ export default {
that.outputs.push(sheetData);
}
this.$refs.upload.value = '';
// }
// })
} catch (e) {
console.log(e)
return false;
}
};
......@@ -618,7 +587,6 @@ export default {
url:'/api/QualityManage/samplefromlist',
data:this.wanttable,
}).then(res1 =>{
console.log("网页",res1)
if (res1.data.code == 0) {
let aa = JSON.stringify(res1.data.data);
let bb = JSON.stringify(this.data);
......@@ -655,7 +623,6 @@ export default {
url:'/api/QualityManage/samplefromlist',
data:this.wanttable,
}).then(res1 =>{
console.log("网页",res1)
if (res1.data.code == 0) {
let aa = JSON.stringify(res1.data.data);
let bb = JSON.stringify(this.data);
......@@ -961,9 +928,7 @@ export default {
event.currentTarget.style.cursor = 'move';
},
exportTable() {
var s = JSON.stringify(this.tabledata1)
require.ensure([], () => {
const {
export_json_to_excel
} = require('../../vendor/Export2Excel');
......@@ -1750,7 +1715,6 @@ export default {
}
this.json2excel(this.excelDatas, '质量管理', true, 'xlsx');
this.tabledata1 = JSON.parse(s)
});
},
json2excel(tableJson, filenames, autowidth, bookTypes) {
......@@ -1820,7 +1784,7 @@ export default {
this.$store.state.a.endtime = this.value2;
this.$store.state.a.num = this.Number1;
this.$store.state.one = 2;
if (res.data.code !== 0) {
if (res.data.code == 1) {
this.tipchange1 = true;
this.pdyd3 = true;
this.w = '这段时间无样本数据';
......@@ -2048,7 +2012,6 @@ export default {
}
}else{
if(this.$store.state.a.data){
if(this.$store.state.a.data.length !== 0){
this.value1 = this.$store.state.a.starttime;
this.value2 = this.$store.state.a.endtime;
......@@ -2121,8 +2084,6 @@ export default {
}
}
}
},
};
</script>
......
src/views/customer/conponent/RWTextBox13.vue
View file @ d9c40ec4
......@@ -3,7 +3,7 @@
* @Date: 2019-11-18 15:23:41
* @Author: Tao
* @LastEditors: Tao
* @LastEditTime: 2020-08-03 15:38:53
* @LastEditTime: 2021-02-01 18:04:04
-->
<template>
<div>
......@@ -300,7 +300,7 @@ export default {
keupFun(item){
var value
var arr = []
console.log('item',item)
if(item.TagName != ''){
this.jurisdictionShow(item).then(val => {
......@@ -409,6 +409,7 @@ export default {
url: '/api/Base/PostIOServiceTest',
data:arr
}).then(res => {
console.log('下发13==>',res)
// console.log('res',res)
}).catch(function(error) {
// console.log(error);
......@@ -682,7 +683,7 @@ export default {
url:"/api/Base/PostRediusTest?varNameString=" + name,
data:arr
}).then((res)=>{
console.log('13读写框==>',res)
this.ElementNameHas = ['1']
if(res.data.data.length){
......
src/views/customer/customer.vue
View file @ d9c40ec4
......@@ -262,7 +262,7 @@ export default {
this.nameC = name
console.log('读取方法',name)
// 本地服务器读取方法
// // 本地服务器读取方法
this.$axios({
method: 'get',
url: `/ViewJson/${name}.json`,
......
src/views/quality/quality.vue
View file @ d9c40ec4
......@@ -3,7 +3,7 @@
* @Date: 2019-11-23 11:54:01
* @Author: 随风
* @LastEditors: Tao
* @LastEditTime: 2020-08-28 11:02:59
* @LastEditTime: 2021-02-02 15:28:26
-->
<template>
<div class="alarm-container" >
......
src/views/table/table.vue
View file @ d9c40ec4
......@@ -3,7 +3,7 @@
* @since: 2019-11-08 15:00:48
* @Author: jawnwa22
* @LastEditors: Tao
* @LastEditTime: 2020-08-28 11:06:00
* @LastEditTime: 2021-02-02 15:29:35
-->
<template>
<div class="tapwater" >
......
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