.

package.json

@@ -12,7 +12,9 @@
     "core-js": "^3.8.3",
     "element-ui": "^2.15.12",
     "js-file-download": "^0.4.12",
+    "js-md5": "^0.7.3",
     "node-sass": "^8.0.0",
+    "qs": "^6.11.0",
     "sass-loader": "^13.2.0",
     "style-loader": "^3.3.1",
     "vue": "^2.6.14",

src/api/CompanyAccount.js

@@ -0,0 +1,26 @@
+// 登录接口
+import {
+	axios
+} from '../utils/http.js'
+
+const UserTask = {
+	TaskList: '/UserTask/List',//报告任务列表
+	ExtData: '/TaskData/List',//提取数据
+	
+}
+//报告任务列表
+export function ExtData(data) {
+	return axios({
+		url: UserTask.ExtData,
+		method: 'post',
+		data:data
+	})
+}
+//报告任务列表
+export function TaskList(data) {
+	return axios({
+		url: UserTask.TaskList,
+		method: 'post',
+		data:data
+	})
+}

src/api/login.js

@@ -4,14 +4,23 @@ import {
 } from '../utils/http.js'
 
 const loginApi = {
-	login: '/v3/Login_verification',
+	UserLogin: '/Login_verification',//用户登录
+	AdminLogin: '/Login_Admin_verification',//管理员登录
 }
 
-//登陆
-export function login(data) {
+//用户登录
+export function UserLogin(data) {
 	return axios({
-		url: loginApi.login,
+		url: loginApi.UserLogin,
 		method: 'post',
 		data:data
 	})
 }
+//管理员登录
+export function AdminLogin(data) {
+	return axios({
+		url: loginApi.AdminLogin,
+		method: 'post',
+		data:data
+	})
+}

src/main.js

@@ -3,9 +3,11 @@ import App from './App.vue'
 import router from './router/index.js';
 import store from "./store";
 import ElementUI from 'element-ui';
+
 import 'element-ui/lib/theme-chalk/index.css';
 import VueElementUISkeleton from 'vue-elementui-skeleton';
-
+import md5 from'js-md5';
+Vue.prototype.$md5 = md5;
 Vue.use(VueElementUISkeleton, {
     directiveName: 'skeleton',
     rows: 10,

src/router/index.js

@@ -90,12 +90,28 @@ const router = new VueRouter({
 
 //登录拦截//未登录返回到登录界面
 router.beforeEach((to, from, next) => {
+	if(store.state.userInfo.token){
+		next();
+	}else{
+		//如果是登录页面路径，就直接next()
+		if (to.path === '/') {
+			next();
+		} else {
+			next('/');
+		}
+	}
 	if(to.name=='login'){//退出登录之后清零
 		store.state.tabList = [{
 			title:'工作首页',
 			path:'/home',
 			name:'home'
 		}],
+		store.commit('setuserInfo',{
+			username:store.state.userInfo.username,
+			password:store.state.userInfo.password,
+			token: '',
+			value:'2'
+		})
 		store.state.includeTabs = []
 		console.log('login了')
 	}
@@ -106,7 +122,6 @@ router.beforeEach((to, from, next) => {
 			name:to.name
 		})
 	}
-	next()
 })
 
 export default router;

src/store/index.js

@@ -8,10 +8,16 @@ export default new Vuex.Store({
 	plugins: [
 		createPersistedState({
 			key: 'stort',
-			paths: ['tabList','includeTabs'] //, 'Tags'
+			paths: ['userInfo','tabList','includeTabs'] //, 'Tags'
 		})
 	],
 	state: {
+		userInfo: {
+			username: '',
+			password: '',
+			token: '',
+			value:''
+		},
 		tabList: [{
 			title:'工作首页',
 			path:'/home',
@@ -20,6 +26,9 @@ export default new Vuex.Store({
 		includeTabs:[]
 	},
 	mutations: {
+		setuserInfo(state, data) {//登录存储
+			state.userInfo = data
+		},
 		addTab: (state, tab) => {
 			var tabVal = state.tabList.some(item => item.path === tab.path)
 			if(tabVal===false){

src/utils/base.js

@@ -1,7 +1,7 @@
 let baseURL = ''
 //是否在控制台显示请求日志，本地环境启用，打包环境禁用
 let showHttpLog = false 
-baseURL = 'http://47.111.15.17:6200'
+baseURL = 'http://47.111.15.17:6300'
 module.exports = {
 	baseURL:baseURL,
 	showHttpLog:showHttpLog

src/utils/http.js

@@ -1,6 +1,9 @@
 import axios from 'axios'
 import { baseURL } from './base.js'
 import router from '../router/index.js'
+import store from '@/store'
+import qs from 'qs'
+import elementui from 'element-ui'
 // 创建 axios 实例
 const service = axios.create({
 	baseURL: baseURL,
@@ -14,7 +17,6 @@ const service = axios.create({
 
 // 请求拦截器
 service.interceptors.request.use((config) => {
-	// showLoading()
 	config.data.User_tokey = store.state.userInfo.token
 	config.data = qs.stringify(config.data)
 	// config.headers['Authorization'] = '1' // 让每个请求携带自定义token  //设置请求头
@@ -27,7 +29,6 @@ service.interceptors.request.use((config) => {
 
 // 响应拦截器
 service.interceptors.response.use((response) => {
-	// hideLoading(1)
 	showStatus(response.data)
 	return response
 }, (error) => {
@@ -41,6 +42,37 @@ service.interceptors.response.use((response) => {
 })
 
 const showStatus = (status) => {//状态码
+	switch (status.Code) {
+		case 200:
+			break
+		case 201:
+			elementui.Message.error('登录过期，请重新登陆')
+			store.commit('setuserInfo', {
+				username: store.state.userInfo.bzd_username,
+				password: store.state.userInfo.bzd_password,
+				token: ''
+			})
+			setTimeout(function() {
+				router.replace({
+					name: 'login',
+				})
+			}, 1000)
+			break	
+		case 202:
+			elementui.Message.error(status.Msg + '[' + status.Code + ']')
+			break
+		case 500:
+			elementui.Message.error('服务器错误[' + status.Code + ']')
+			break
+		case 501:
+			elementui.Message.error('服务未实现[' + status.Code + ']')
+			break
+		case 502:
+			elementui.Message.error('网络错误[' + status.Code + ']')
+			break
+		default:
+		elementui.Message.error(status.Msg + '[' + status.Code + ']')
+	}
 	console.log('状态码',status)
 }
 

src/views/CompanyAccount/index.vue

@@ -3,7 +3,7 @@
 		<div class="CompanyAccount-mai">
 			<div class="CompanyAccount1">
 				<div class="CompanyAccount1-R">
-					<el-input v-model="page.name" placeholder="请输入账户" @keyup.enter.native="search" clearable></el-input>
+					<el-input v-model="pages.T_name" placeholder="请输入账户" @keyup.enter.native="search" clearable></el-input>
 					<el-button class="s1 sBtn" type="primary" icon="el-icon-search">搜索</el-button>
 				</div>
 			</div>
@@ -11,25 +11,71 @@
 				<el-table :data="tableData" border size="small">
 					<el-table-column label="账号">
 						<template slot-scope="scope">
-							<span>{{ scope.row.date }}</span>
+							<span>{{ scope.row.T_name }}</span>
 						</template>
 					</el-table-column>
 					<el-table-column label="操作">
 						<template slot-scope="scope">
-							<el-button size="mini" @click="handleEdit1(scope.row)">验证方案</el-button>
-							<el-button size="mini" @click="handleEdit2(scope.row)">验证报告</el-button>
-							<el-button size="mini" @click="handleEdit3(scope.row)">校准证书</el-button>
+							<el-button size="mini" :disabled="scope.row.T_pdf1===''?true:false" @click="handleEdit1(scope.row)">验证方案</el-button>
+							<el-button size="mini" :disabled="scope.row.T_pdf2===''?true:false" @click="handleEdit2(scope.row)">验证报告</el-button>
+							<el-button size="mini" :disabled="scope.row.T_pdf3===''?true:false" @click="handleEdit3(scope.row)">校准证书</el-button>
 							<el-button size="mini" @click="handleEdit4(scope.row)">验证数据</el-button>
 						</template>
 					</el-table-column>
 				</el-table>
 			</div>
 			<div class="CompanyAccount3">
-				<el-pagination @current-change="handleCurrentChange" :current-page="page.pagez" :page-size="page.page_size"
+				<el-pagination @current-change="handleCurrentChange" :current-page="pages.page" :page-size="pages.page_z"
 					layout="total, prev, pager, next, jumper" :total="total">
 				</el-pagination>
 			</div>
 		</div>
+		<el-drawer title="验证设备数据" :visible.sync="Drawer" direction="rtl" ref="drawer" size="90%">
+			<div class="demo-drawers">
+				<div class="demoDra1">
+					<div class="demoDra1-R">
+						<el-input class="s1" v-model="pages.name" placeholder="请输入SN" clearable></el-input>
+						<el-input class="s1" v-model="pages.name" placeholder="请输入编号" clearable></el-input>
+						<el-date-picker class="s1" v-model="pages.name" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
+							range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="searchTimeData">
+						</el-date-picker>
+						<el-button class="s1 sBtn" type="primary" icon="el-icon-search"></el-button>
+					</div>
+					<div class="demoDra1-L s1">
+						<el-button type="primary" icon="el-icon-download" @click="Dowload">下载</el-button>
+					</div>
+				</div>
+				<div class="demoDra2">
+					<el-table :data="tableData" border size="small">
+						<el-table-column label="ID">
+							<template slot-scope="scope">
+								<span>{{ scope.row.date }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="设备编号">
+							<template slot-scope="scope">
+								{{ scope.row.name }}
+							</template>
+						</el-table-column>
+						<el-table-column label="SN">
+							<template slot-scope="scope">
+								<span>{{ scope.row.date }}</span>
+							</template>
+						</el-table-column>
+						<el-table-column label="温度℃">
+							<template slot-scope="scope">
+								{{ scope.row.name }}
+							</template>
+						</el-table-column>
+					</el-table>
+				</div>
+				<div class="demoDra3">
+					<el-pagination @current-change="handleCurrentChange" :current-page="pages.page" :page-size="pages.page_z"
+						layout="total, prev, pager, next, jumper" :total="total">
+					</el-pagination>
+				</div>
+			</div>
+		</el-drawer>
 		<pdf ref="pdf"></pdf>
 		<el-empty description="暂无其他内容"></el-empty>
 	</div>
@@ -39,7 +85,9 @@
 	import pdf from "./pdf.vue"
 	import Axios from 'axios'
 	import fileDownload from 'js-file-download'
-	
+	import {
+		TaskList,ExtData
+	} from '@/api/CompanyAccount'
 	export default {
 		name:'CompanyAccount',
 		components: { //组件
@@ -47,30 +95,41 @@
 		},
 		data() {
 			return{
+				Drawer:false,
 				src: '',
 				dia: null,
 				total: 30,
-				page: {
-					pagez: 1,
-					page_size: 10,
-					name: ''
+				pages: {
+					page: 1,
+					page_z: 10,
+					T_name: ''
+				},
+				pages1:{
+					T_task_id:'',
+					// T_sn:'',
+					// T_id:'',
+					// Time_start:'',
+					// Time_end:'',
+					// page: 1,
+					// page_z: 10,
 				},
-				tableData: [{
-					date: '2021-冷库',
-					name: '数据采集工程师',
-					time: '2022-12-21 12:00:00'
-				}, {
-					date: '2021-冷库',
-					name: '冷链负责人',
-					time: '2022-12-21 12:00:00'
-				}, {
-					date: '2021-冷库',
-					name: '冷链负责人',
-					time: '2022-12-21 12:00:00'
-				}],
+				tableData: [],
+				tableData1: [],
 			}
 		},
+		mounted() {
+			this.GetTkListApi()
+		},
 		methods: {
+			GetTkListApi(){
+				TaskList(this.pages).then(res=>{
+					console.log('劣币送',res)
+					if(res.data.Code===200){
+						this.tableData = res.data.Data.List
+						this.total = res.data.Data.Num
+					}
+				})
+			},
 			handleEdit1(e){
 				this.$refs.pdf.SetPdf()
 			},
@@ -81,6 +140,24 @@
 				this.$refs.pdf.SetPdf()
 			},
 			handleEdit4(e){
+				console.log('搜索',e)
+				this.pages1.T_task_id = 'ixEfo5zk2Oeb'
+				// this.pages1.T_id = e.Id	
+				// this.pages1.T_sn = e.T_sn
+				this.GetExtDataApi()
+			},
+			GetExtDataApi(){
+				console.log('搜索',this.pages1)
+				ExtData(this.pages1).then(res=>{
+					console.log('劣币送',res)
+					this.Drawer = true
+					if(res.data.Code===200){
+						this.tableData1 = res.data.Data.List
+						this.total = res.data.Data.Num
+					}
+				})
+			},
+			Dowload(){//下载数据
 				fileDownload('res.data', '111.docx');
 				// Axios({
 				// 	method: 'get',
@@ -91,18 +168,25 @@
 				// 	fileDownload(res.data, '111.docx');
 				// });
 			},
+			searchTimeData(e) {
+				console.log('时间选择', e)
+			},
 			search() { //回车搜索
-				console.log('搜索', this.page.name);
+				console.log('搜索', this.pages.T_name);
 			},
 			handleCurrentChange(val) {
-				this.page.pagez = val
-				console.log('当前页', this.page);
+				 this.pages.page = val
+				console.log('当前页', this.pages);
 			},
 		},
 	}
 </script>
 
 <style lang="scss" scoped>
+	.el-input {
+		margin-right: 10px;
+		width: 200px;
+	}
 	.CompanyAccount{
 		height: 100%;
 		overflow: hidden;
@@ -128,5 +212,38 @@
 				margin-top: 40px;
 			}
 		}
+		.demo-drawers{
+			padding:0 20px;
+			.demoDra1 {
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				.demoDra1-L {
+					.s1{
+						margin-bottom: 10px;
+						margin-right: 10px;
+					}
+				}
+				.demoDra1-R {
+					display: flex;
+					flex-wrap: wrap;
+					align-items: center;
+					.s1{
+						margin-bottom: 10px;
+						margin-right: 10px;
+					}
+					
+				}
+			}
+			
+			.demoDra2 {
+				margin-top: 10px;
+			}
+			
+			.demoDra3 {
+				margin-top: 40px;
+			}
+		}
 	}
+	
 </style>

src/views/ReportViewing/index.vue

@@ -15,8 +15,10 @@
 					range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="searchTimeData">
 				</el-date-picker>
 				<el-button class="s1 sBtn" type="primary" icon="el-icon-search"></el-button>
+			</div>
+			<div class="companyManagement1-L">
 				<el-dropdown class="s1" @command="commands">
-					<el-button type="warning" icon="el-icon-download">
+					<el-button type="primary" icon="el-icon-download">
 						下载<i class="el-icon-arrow-down el-icon--right"></i>
 					</el-button>
 					<el-dropdown-menu slot="dropdown">
@@ -145,8 +147,8 @@
 	.ReportViewing {
 		.companyManagement1 {
 			display: flex;
+			flex-wrap: wrap;
 			justify-content: space-between;
-			align-items: center;
 			.companyManagement1-L {}
 			.companyManagement1-R {
 				display: flex;

src/views/calibrationCertificate/index.vue

@@ -62,15 +62,7 @@
 				</el-form>
 			</div>
 		</el-drawer>
-		<el-drawer title="查看PDF" :append-to-body="true" :visible.sync="innerDrawer3" size="70%">
-			<!-- 时间流程按钮后的编辑 -->
-			<div style="padding: 20px;display: grid;
-		grid-template-columns: 1fr 1fr;
-		grid-gap: 10px;">
-				<pdf v-for="item in 3" :key="item" :page="item"  ref="pdf" src="https://bzdcoldverifyoss.baozhida.cn/UpImage/166798048063268c71-e558-406d-81d4-5d30d2c3d974.pdf"> 
-				</pdf>
-			</div>
-		</el-drawer>
+		<pdf ref="pdf"></pdf>
 		<el-drawer title="管理证书" :append-to-body="true" :visible.sync="innerDrawer4" size="90%">
 			<!-- 时间流程按钮后的编辑 -->
 			<div class="demo-drawers">
@@ -98,16 +90,17 @@
 									<el-button size="mini" @click="handlePdf(scope.row)">查看PDF</el-button>
 									<el-button slot="reference" size="mini" @click="handleEdit1(scope.row)">编辑
 									</el-button>
-									<el-button slot="reference" size="mini" type="danger" @click="handleDelete(scope.row)">删除
+									<el-button slot="reference" size="mini" type="danger"
+										@click="handleDelete(scope.row)">删除
 									</el-button>
 								</div>
 							</template>
 						</el-table-column>
 					</el-table>
-				</div>	
+				</div>
 				<div style="margin-top: 10px;">
-					<el-pagination @current-change="handleCurrentChange" :current-page="page.pagez" :page-size="page.page_size"
-						layout="total, prev, pager, next, jumper" :total="total">
+					<el-pagination @current-change="handleCurrentChange" :current-page="page.pagez"
+						:page-size="page.page_size" layout="total, prev, pager, next, jumper" :total="total">
 					</el-pagination>
 				</div>
 			</div>
@@ -115,28 +108,19 @@
 				<div style="padding: 20px;">
 					<el-form :model="form">
 						<el-form-item label="发布时间" label-width="70px">
-							<el-date-picker
-							      v-model="form.name"
-							      type="datetime"
-							      placeholder="选择日期时间">
-							    </el-date-picker>
+							<el-date-picker v-model="form.name" type="datetime" placeholder="选择日期时间">
+							</el-date-picker>
 						</el-form-item>
 						<el-form-item label="失效时间" label-width="70px">
-							<el-date-picker
-							      v-model="form.name"
-							      type="datetime"
-							      placeholder="选择日期时间">
-							    </el-date-picker>
+							<el-date-picker v-model="form.name" type="datetime" placeholder="选择日期时间">
+							</el-date-picker>
 						</el-form-item>
 						<el-form-item label="上传文件" label-width="70px">
-							<el-upload
-							  class="upload-demo"
-							  drag
-							  action="https://jsonplaceholder.typicode.com/posts/"
-							  multiple>
-							  <i class="el-icon-upload"></i>
-							  <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-							  <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+							<el-upload class="upload-demo" drag action="https://jsonplaceholder.typicode.com/posts/"
+								multiple>
+								<i class="el-icon-upload"></i>
+								<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+								<div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
 							</el-upload>
 						</el-form-item>
 						<el-form-item label-width="70px">
@@ -153,19 +137,18 @@
 </template>
 
 <script>
-	import pdf from "vue-pdf";
+	import pdf from "./pdf.vue"
 	export default {
 		name: 'calibrationCertificate',
-		components: { //组件
+		components: {
 			pdf
 		},
 		data() {
 			return {
 				total: 30,
 				innerDrawer2: false,
-				innerDrawer3: false,
 				innerDrawer4: false,
-				innerDrawer41: false,//添加证书
+				innerDrawer41: false, //添加证书
 				page: {
 					pagez: 1,
 					page_size: 10,
@@ -195,17 +178,17 @@
 			}
 		},
 		methods: {
-			handleEdit1(){
+			handleEdit1() {
 				this.innerDrawer41 = true
 			},
-			TimeNew(){
+			TimeNew() {
 				this.innerDrawer41 = true
 			},
-			handlePdf(e){
-				console.log('查看pdf',e)
-				this.innerDrawer3 = true
+			handlePdf(e) {
+				console.log('查看pdf', e)
+				this.$refs.pdf.SetPdf()
 			},
-			handleEdit(e){
+			handleEdit(e) {
 				this.innerDrawer4 = true
 			},
 			NewinnerDrawer() {

src/views/calibrationCertificate/pdf.vue

@@ -0,0 +1,49 @@
+<template>
+	<div>
+		<el-dialog :visible.sync="dialogVisible4" width="80%" height="100%">
+			<iframe :src="serPdf" frameborder="0" style="width: 100%; height: 80vh"></iframe>
+		</el-dialog>
+		<!-- 
+		<div style="display: grid;grid-template-columns: 1fr 1fr 1fr; grid-gap: 10px;">
+			
+			<pdf v-for="item in 3" :key="item" :page="item"  ref="pdf" src="">
+			</pdf>
+		</div> -->
+		
+	</div>
+</template>
+
+<script>
+	import pdf from "vue-pdf";
+	export default {
+		name:'CompanyAccount',
+		components: { //组件
+			pdf
+		},
+		data() {
+			return{
+				dialogVisible4:false,
+				serPdf:''
+			}
+		},
+		methods:{
+			SetPdf(){
+				this.dialogVisible4 = true
+				this.serPdf = 'https://bzdcoldverifyoss.baozhida.cn/UpImage/166798048063268c71-e558-406d-81d4-5d30d2c3d974.pdf'
+				console.log('234')
+			}
+		}
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.el-dialog__wrapper{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		/deep/.el-dialog {
+			margin: 0 !important;
+		}
+	}
+</style>

src/views/login/login.vue

@@ -19,13 +19,13 @@
 							</div>
 							<div class="loginPir-c-R2">
 								<div style="margin-bottom: 15px;">
-									<el-input v-model="Info.userName" placeholder="请输入内容"></el-input>
+									<el-input v-model="Info.bzd_username" placeholder="请输入内容"></el-input>
 								</div>
 								<div style="margin-bottom: 15px;">
-									<el-input placeholder="请输入密码" v-model="Info.password" show-password></el-input>
+									<el-input placeholder="请输入密码" v-model="Info.bzd_password" show-password></el-input>
 								</div>
 								<div style="margin-bottom: 15px;">
-									<el-select v-model="value" placeholder="请选择" style="width: 100%;">
+									<el-select v-model="Info.value" placeholder="请选择" style="width: 100%;">
 										<el-option v-for="item in options" :key="item.value" :label="item.label"
 											:value="item.value">
 										</el-option>
@@ -45,26 +45,75 @@
 </template>
 
 <script>
+	import {
+		UserLogin,AdminLogin
+	} from '@/api/login.js'
 	export default {
 		data(){
 			return{
 				Info: {
-					userName: '',
-					password: '',
+					bzd_username: '',
+					bzd_password: '',
+					value:'2'
 				},
 				options: [{
-					value: '选项1',
-					label: '管理员'
+					value: '1',
+					label: '管理员登录'
 				}, {
-					value: '选项2',
-					label: '用户'
+					value: '2',
+					label: '用户登录'
 				}],
-				value:''
 			}
 		},
 		methods:{
 			login(){
-				this.$router.replace('/home')
+				if(this.Info.bzd_username===''){
+					this.$message.error('请输入登录账号')
+					return
+				}else if(this.Info.bzd_username===''){
+					this.$message.error('请输入登录密码')
+					return
+				}else{
+					if(this.Info.value==1){
+						this.GetadminLgApi()
+					}else{
+						this.GetuserLgApi()
+					}
+				}
+			},
+			GetuserLgApi(){//用户登录
+				var obj = {
+					bzd_username : this.Info.bzd_username,
+					bzd_password : this.$md5(this.Info.bzd_password)
+				}
+				UserLogin(obj).then(res=>{
+					if(res.data.Code==200){
+						this.$store.commit('setuserInfo', {
+							username: this.Info.bzd_username,
+							password: this.Info.bzd_password,
+							value:this.Info.value,
+							token: res.data.Data
+						})
+						this.$router.replace('/home')
+					}
+				})
+			},
+			GetadminLgApi(){//管理员登录
+				var obj = {
+					bzd_username : this.Info.bzd_username,
+					bzd_password : this.$md5(this.Info.bzd_password)
+				}
+				AdminLogin(obj).then(res=>{
+					if(res.data.Code==200){
+						this.$store.commit('setuserInfo', {
+							username: this.Info.bzd_username,
+							password: this.Info.bzd_password,
+							value:this.Info.value,
+							token: res.data.Data
+						})
+						this.$router.replace('/home')
+					}
+				})
 			}
 		}
 	}