.

src/api/ReportViewing.js

@@ -15,6 +15,38 @@ const VT = {
 	Map_Up: '/VerifyTemplate/Map_Up',
 	Map_Del: '/VerifyTemplate/Map_Del',
 	
+	Time_List: '/VerifyTemplate/Time_List',
+	Time_Add: '/VerifyTemplate/Time_Add',
+	Time_Up: '/VerifyTemplate/Time_Up',
+	Time_Del: '/VerifyTemplate/Time_Del',
+}
+export function Time_Del(data) {
+	return axios({
+		url: VT.Time_Del,
+		method: 'post',
+		data:data
+	})
+}
+export function Time_Up(data) {
+	return axios({
+		url: VT.Time_Up,
+		method: 'post',
+		data:data
+	})
+}
+export function Time_Add(data) {
+	return axios({
+		url: VT.Time_Add,
+		method: 'post',
+		data:data
+	})
+}
+export function Time_List(data) {
+	return axios({
+		url: VT.Time_List,
+		method: 'post',
+		data:data
+	})
 }
 export function Map_Del(data) {
 	return axios({

src/views/ReportViewing/index.vue

@@ -9,16 +9,16 @@
 		</div>
 		<div class="companyManagement1">
 			<div class="companyManagement1-R">
-				<el-input class="s1" v-model="page.name" placeholder="请输入SN" clearable></el-input>
-				<el-input class="s1" v-model="page.name" placeholder="请输入编号" clearable></el-input>
-				<el-date-picker class="s1" v-model="page.name" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
+				<el-input class="s1" size="mini" v-model="page.name" placeholder="请输入SN" clearable></el-input>
+				<el-input class="s1" size="mini" v-model="page.name" placeholder="请输入编号" clearable></el-input>
+				<el-date-picker class="s1" size="mini" v-model="page.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>
+				<el-button class="s1 sBtn" size="mini" type="primary" icon="el-icon-search"></el-button>
 			</div>
 			<div class="companyManagement1-L">
 				<el-dropdown class="s1" @command="commands">
-					<el-button type="primary" icon="el-icon-download">
+					<el-button type="primary" size="mini" icon="el-icon-download">
 						下载<i class="el-icon-arrow-down el-icon--right"></i>
 					</el-button>
 					<el-dropdown-menu slot="dropdown">

src/views/ValidationTemplate/index.vue

@@ -65,6 +65,11 @@
 				<el-button type="primary" icon="el-icon-plus" @click="NewinnerDrawer">添加标签</el-button>
 				<div style="margin-top: 10px;">
 					<el-table :data="tableData1" border size="mini">
+						<el-table-column label="T_id" width="300" :show-overflow-tooltip="true">
+							<template slot-scope="scope">
+								<span>{{ scope.row.T_id }}</span>
+							</template>
+						</el-table-column>
 						<el-table-column label="标签名称" width="300" :show-overflow-tooltip="true">
 							<template slot-scope="scope">
 								<span>{{ scope.row.T_name }}</span>
@@ -110,30 +115,30 @@
 					<div class="demo-drawers">
 						<el-button type="primary" icon="el-icon-plus" @click="TimeNew">添加流程</el-button>
 						<div style="padding-top: 20px;">
-							<el-table :data="tableData" border size="small">
+							<el-table :data="tableData2" border size="small">
 								<el-table-column label="排序">
 									<template slot-scope="scope">
-										<span>{{ scope.row.date }}</span>
+										<span>{{ scope.row.T_sort }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="步骤名称">
 									<template slot-scope="scope">
-										<span>{{ scope.row.date }}</span>
+										<span>{{ scope.row.T_step_name }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="对应标签">
 									<template slot-scope="scope">
-										<span>{{ scope.row.date }}</span>
+										<span>{{ scope.row.T_tag }}</span>
 									</template>
 								</el-table-column>
-								<el-table-column label="最少时间">
+								<el-table-column label="最少时间(s)">
 									<template slot-scope="scope">
-										<span>{{ scope.row.date }}</span>
+										<span>{{ scope.row.T_min_time }}</span>
 									</template>
 								</el-table-column>
-								<el-table-column label="最多时间">
+								<el-table-column label="最多时间(s)">
 									<template slot-scope="scope">
-										<span>{{ scope.row.date }}</span>
+										<span>{{ scope.row.T_max_time }}</span>
 									</template>
 								</el-table-column>
 								<el-table-column label="操作">
@@ -150,34 +155,34 @@
 							</el-table>
 						</div>
 						<div style="margin-top: 10px;">
-							<el-pagination @current-change="handleCurrentChange111" :current-page="page1.pagez"
-								:page-size="page1.page_size" layout="total, prev, pager, next, jumper" :total="total">
+							<el-pagination @current-change="handleCurrentChange12" :current-page="pages1.page"
+								:page-size="pages1.page_z" layout="total, prev, pager, next, jumper" :total="total2">
 							</el-pagination>
 						</div>
 						<el-drawer :title="titles1" :append-to-body="true" :visible.sync="innerDrawer3">
 							<!-- 时间流程按钮后的编辑 -->
 							<div style="padding: 20px;">
-								<el-form :model="form">
-									<el-form-item label="排序" label-width="70px">
-										<el-input v-model="form.name" autocomplete="off"></el-input>
+								<el-form :model="pages3" :rules="rules3" ref="ruleForm3">
+									<el-form-item label="排序" label-width="80px" prop="T_sort">
+										<el-input v-model="pages3.T_sort" oninput="value=value.replace(/[^\d]/g,'')" autocomplete="off"></el-input>
 									</el-form-item>
-									<el-form-item label="步骤名称" label-width="70px">
-										<el-input v-model="form.name" autocomplete="off"></el-input>
+									<el-form-item label="步骤名称" label-width="80px" prop="T_step_name">
+										<el-input v-model="pages3.T_step_name" autocomplete="off"></el-input>
 									</el-form-item>
-									<el-form-item label="对映标签" label-width="70px">
-										<el-input v-model="form.name" autocomplete="off"></el-input>
+									<el-form-item label="对映标签" label-width="80px" prop="T_tag">
+										<el-input v-model="pages3.T_tag" autocomplete="off"></el-input>
 									</el-form-item>
-									<el-form-item label="最小时间" label-width="70px">
-										<el-input v-model="form.name" autocomplete="off"></el-input>
+									<el-form-item label="最小时间" label-width="80px" prop="T_min_time">
+										<el-input v-model="pages3.T_min_time" oninput="value=value.replace(/[^\d]/g,'')" autocomplete="off"></el-input>
 									</el-form-item>
-									<el-form-item label="最大时间" label-width="70px">
-										<el-input v-model="form.name" autocomplete="off"></el-input>
+									<el-form-item label="最大时间" label-width="80px" prop="T_max_time">
+										<el-input v-model="pages3.T_max_time" oninput="value=value.replace(/[^\d]/g,'')" autocomplete="off"></el-input>
 									</el-form-item>
-									<el-form-item label="描述" label-width="70px">
-										<el-input type="textarea" v-model="form.name"></el-input>
+									<el-form-item label="描述" label-width="80px" prop="T_text">
+										<el-input type="textarea" v-model="pages3.T_text"></el-input>
 									</el-form-item>
-									<el-form-item label-width="70px">
-										<el-button type="primary" @click="innerDrawer3=false">
+									<el-form-item label-width="80px">
+										<el-button type="primary"   @click="submitForm3('ruleForm3')">
 											确 定
 										</el-button>
 										<el-button @click="innerDrawer3=false">取 消</el-button>
@@ -248,7 +253,7 @@
 	import {
 		TempGet,
 		TempAdd,
-		TempUp,TempDel,Map_List,Map_Add,Map_Up,Map_Del
+		TempUp,TempDel,Map_List,Map_Add,Map_Up,Map_Del,Time_List,Time_Add,Time_Up,Time_Del
 	} from '@/api/ReportViewing'
 	import flies from "@/components/files.vue"
 	export default {
@@ -328,6 +333,7 @@
 
 				total: 0,
 				total1: 0,
+				total2: 0,
 				pages: {
 					page: 1,
 					page_z: 10,
@@ -338,22 +344,148 @@
 					page_z: 10,
 					T_VerifyTemplate_id: ''
 				},
-				
-				
-				
-				page1: {
-					pagez: 1,
-					page_size: 10,
-					name: ''
+				pages1: {
+					page: 1,
+					page_z:10,
+					T_VerifyTemplateMap_id: ''
+				},
+				pages3: {
+					T_tag: '',
+					T_step_name: '',
+					T_min_time: '',
+					T_max_time: '',
+					T_text: '',
+					T_sort: '',
+				},
+				rules3: {
+					T_step_name: [{
+						required: true,
+						message: '请输入步骤名称',
+						trigger: 'blur'
+					}, ],
+					T_tag: [{
+						required: true,
+						message: '请输入对应标签',
+						trigger: 'blur'
+					}, ],
+					T_min_time: [{
+						required: true,
+						message: '请输入最小时间 单位s',
+						trigger: 'blur'
+					}],
+					T_max_time: [{
+						required: true,
+						message: '请输入最大时间 单位s',
+						trigger: 'blur'
+					}, ],
+					T_text: [{
+						required: true,
+						message: '请输入描述',
+						trigger: 'blur'
+					}],
+					T_sort: [{
+						required: true,
+						message: '请输入排序',
+						trigger: 'blur'
+					}, ],
 				},
 				tableData: [],
 				tableData1: [],
+				tableData2: [],
 			}
 		},
 		mounted() {
 			this.GetTempGetApi()
 		},
 		methods: {
+			TimeDelete(e) {
+				this.$confirm('此操作将永久删除操作, 是否继续?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning',
+					center: true
+				}).then(() => {
+					Time_Del({T_id: e.T_id}).then(res=>{
+						if(res.data.Code==200){
+							this.$message.success('删除成功!')
+							this.pages1.page = 1
+							this.GetTime_ListApi()
+						}
+					})
+				}).catch(() => {
+					this.$message({
+						type: 'info',
+						message: '已取消删除'
+					});
+				});
+			},
+			TimeEdit(e) {
+				if(this.$refs.ruleForm3!=undefined){
+					this.$refs.ruleForm3.clearValidate()
+				}
+				console.log('编辑',e)
+				this.innerDrawer3 = true
+				this.titles1 = '编辑时间流程'
+				this.TempNum = 2
+				this.pages3.T_id = e.T_id
+				this.pages3.T_tag = e.T_tag
+				this.pages3.T_step_name = e.T_step_name
+				this.pages3.T_min_time = e.T_min_time
+				this.pages3.T_max_time = e.T_max_time
+				this.pages3.T_text = e.T_text
+				this.pages3.T_sort = e.T_sort
+			},
+			TimeNew() {
+				if(this.$refs.ruleForm3!=undefined){
+					this.$refs.ruleForm3.clearValidate()
+				}
+				for (let key in this.pages3) {
+				    this.pages3[key] = ''
+				}
+				
+				this.innerDrawer3 = true
+				this.TempNum = 1
+				this.pages3.T_VerifyTemplateMap_id = this.pages1.T_VerifyTemplateMap_id
+				this.titles1 = '新增时间流程'
+			},
+			GetTime_ListApi(){
+				Time_List(this.pages1).then(res=>{
+					console.log('时间流程',res)
+					if(res.data.Code==200){
+						this.tableData2 = res.data.Data.List
+						this.total2 = res.data.Data.Num
+					}
+				})
+			},
+			submitForm3(formName) {
+				this.$refs[formName].validate((valid) => {
+			 	if (valid) {
+						console.log('新增',this.pages3)
+						if(this.TempNum==1){//1是新增
+							Time_Add(this.pages3).then(res=>{
+								if(res.data.Code===200){
+									this.$message.success('新增成功')
+									this.innerDrawer3 = false
+									this.pages1.page = 1
+									this.GetTime_ListApi()
+								}
+							})
+						}else{//2是编辑
+							Time_Up(this.pages3).then(res=>{
+								if(res.data.Code===200){
+									this.$message.success('编辑成功')
+									this.innerDrawer3 = false
+									this.pages1.page = 1
+									this.GetTime_ListApi()
+								}
+							})
+							console.log('编辑',this.form1)	
+						}
+					} else {
+						return false;
+					}
+				});
+			},
 			submitForm1(formName) {
 				this.$refs[formName].validate((valid) => {
 			 	if (valid) {
@@ -391,6 +523,10 @@
 				this.pages2.page = val
 				this.GetMaplistApi()
 			},
+			handleCurrentChange12(val) {
+				this.pages1.page = val
+				this.GetTime_ListApi()
+			},
 			handlelabel(val) {
 				this.Drawer = true
 				this.pages2.T_VerifyTemplate_id = val.T_VerifyTemplate_id
@@ -468,34 +604,8 @@
 				this.pages.page = 1
 				this.GetTempGetApi()
 			},
-			TimeEdit(e) {
-				console.log(e)
-				this.innerDrawer3 = true
-				this.titles1 = '编辑时间流程'
-			},
-			TimeNew() {
-				this.innerDrawer3 = true
-				this.titles1 = '新增时间流程'
-			},
-			TimeDelete(e) {
-				console.log(e)
-				this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning',
-					center: true
-				}).then(() => {
-					this.$message({
-						type: 'success',
-						message: '删除成功!'
-					});
-				}).catch(() => {
-					this.$message({
-						type: 'info',
-						message: '已取消删除'
-					});
-				});
-			},
+			
+			
 			NewinnerDrawer() {
 				if(this.$refs.ruleForm1!=undefined){
 					this.$refs.ruleForm1.clearValidate()
@@ -513,7 +623,7 @@
 				this.innerDrawer2 = true
 			},
 			commands(e,obj) {
-				console.log('嘻嘻嘻',e,obj)
+				console.log('嘻嘻嘻',e,obj.T_id)
 				var that = this
 				switch (e) {
 					case 'a':
@@ -533,6 +643,8 @@
 						break
 					case 'b':
 						this.innerDrawer1 = true
+						this.pages1.T_VerifyTemplateMap_id = obj.T_id
+						this.GetTime_ListApi()
 						break
 					default:
 						this.$confirm('此操作将永久删除该模板, 是否继续?', '提示', {

src/views/companyManagement/index.vue

@@ -135,6 +135,11 @@
 					</el-table>
 				</div>
 			</el-drawer>
+			<el-drawer title="查看报告" :append-to-body="true" :visible.sync="innerDrawer2" size="60%"><!-- 查看报告 -->
+				<div style="padding: 20px;">
+					<ReportViewing></ReportViewing>
+				</div>
+			</el-drawer>
 			<el-drawer :title="title" :append-to-body="true" :visible.sync="innerDrawer">
 				<div style="padding: 20px;">
 					<el-form :model="form">
@@ -183,8 +188,12 @@
 </template>
 
 <script>
+	import ReportViewing from "@/views/ReportViewing/index"
 	export default {
 		name: 'companyManagement',
+		components:{
+			ReportViewing
+		},
 		data() {
 			return {
 				value:true,
@@ -194,6 +203,7 @@
 				dialog: false,
 				innerDrawer: false,
 				innerDrawer1: false,//日志
+				innerDrawer2: false,//查看报告
 				Drawer: false, //任务管理
 				total: 30,
 				page: {
@@ -252,11 +262,7 @@
 						this.innerDrawer = true
 						break
 					case 'c':
-						this.$notify.error({
-							title: '错误提示',
-							message: '查看报告',
-							offset: 100
-						});
+						this.innerDrawer2 = true
 						break
 					default:
 					this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {

src/views/companyManagement/test.vue

@@ -0,0 +1,9 @@
+<template>
+	<div>测试2</div>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>