YangJian0701 2 rokov pred
rodič
commit
1ea2c551b3

+ 10 - 1
babel.config.js

@@ -1,5 +1,14 @@
+const proPlugins = [];// 开发环境 不做操作
+
+// 生产环境,去掉console
+if (process.env.NODE_ENV === 'production') {
+    proPlugins.push('transform-remove-console');
+}
 module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset'
-  ]
+  ],
+ plugins:[
+     ...proPlugins
+   ]
 }

+ 1 - 0
package.json

@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "axios": "^1.2.1",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "core-js": "^3.8.3",
     "downloadjs": "^1.4.7",
     "element-ui": "^2.15.12",

+ 69 - 0
src/assets/css/steps.scss

@@ -0,0 +1,69 @@
+.steps{
+		color: #000;
+		display: grid;
+		grid-template-columns: 1fr 1fr 1fr 1fr;
+		.public0{
+			.steps_start_lin{
+				display: flex;
+				align-items: center;
+				.steps_start_lin1{
+					width: 13px;
+					height: 13px;
+					border-radius: 50%;
+					background: #ccc;
+					color: #fff;
+					padding:4px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 12px;
+				}
+				.steps_start_lin2{
+					flex: 1;
+					height: 1px;
+					background: #ccc;
+				}
+			}
+			.steps_start_tit{
+				font-size: 12px;
+				color: #ccc;
+			}
+			.steps_start_txt{
+				font-size: 12px;
+				color: #ccc;
+				padding-right:50px;
+			}
+		}
+		.public1{
+			color: #409EFF;
+			.steps_start_lin{
+				display: flex;
+				align-items: center;
+				.steps_start_lin1{
+					width: 13px;
+					height: 13px;
+					border-radius: 50%;
+					background: #409EFF;
+					color: #fff;
+					padding: 4px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 12px;
+				}
+				.steps_start_lin2{
+					flex: 1;
+					height: 1px;
+					background: #409EFF;
+				}
+			}
+			.steps_start_tit{
+				font-size: 12px !important;
+				line-height: 20px;
+			}
+			.steps_start_txt{
+				font-size: 12px;
+				padding-right:50px;
+			}
+		}
+	}

+ 7 - 0
src/components/files.vue

@@ -41,6 +41,12 @@
 				})
 			},
 			QiniuYun() {
+				const loading = this.$loading({
+					lock: true,
+					text: '正在上传文件,请稍后...',
+					spinner: 'el-icon-loading',
+					background: 'rgba(0, 0, 0, 0.7)'
+				});
 				var _this = this
 				var key = _this.file.name || null;
 				var config = {
@@ -82,6 +88,7 @@
 					// 接收上传完成后的信息
 					complete(com) {
 						console.log('七牛云返回',com)
+						loading.close()
 						_this.$emit('pdfvalue', com.key);
 					}
 				};

+ 148 - 0
src/components/steps.vue

@@ -0,0 +1,148 @@
+<template>
+	<div class="steps">
+		<div class="steps_start" :class="v1==1?'public1':'public0'">
+			<div class="steps_start_lin">
+				<div class="steps_start_lin1">
+					<i :class="v1==0?'el-icon-close':'el-icon-check'"></i>
+				</div>
+				<div class="steps_start_lin2"></div>
+			</div>
+			<div class="steps_start_tit">
+				实施方案
+			</div>
+			<div class="steps_start_txt">
+				2022-12-15 15:30:00
+			</div>
+		</div>
+		<div class="steps_process" :class="v2==1?'public1':'public0'">
+			<div class="steps_start_lin">
+				<div class="steps_start_lin1">
+					<i :class="v2==0?'el-icon-close':'el-icon-check'"></i>
+				</div>
+				<div class="steps_start_lin2">
+					
+				</div>
+			</div>
+			<div class="steps_start_tit">
+				数据采集
+			</div>
+			<div class="steps_start_txt">
+				2022-12-15 15:30:00
+			</div>
+		</div>
+		<div class="steps_process" :class="v2==1?'public1':'public0'">
+			<div class="steps_start_lin">
+				<div class="steps_start_lin1">
+					<i :class="v2==0?'el-icon-close':'el-icon-check'"></i>
+				</div>
+				<div class="steps_start_lin2">
+					
+				</div>
+			</div>
+			<div class="steps_start_tit">
+				报告编写
+			</div>
+			<div class="steps_start_txt">
+				2022-12-15 15:30:00
+			</div>
+		</div>
+		<div class="steps_end" :class="v3==1?'public1':'public0'">
+			<div class="steps_start_lin">
+				<div class="steps_start_lin1">
+					<i :class="v3==0?'el-icon-close':'el-icon-check'"></i>
+				</div>
+			</div>
+			<div class="steps_start_tit">
+				交付审核
+			</div>
+			<div class="steps_start_txt">
+				2022-12-15 15:30:00
+			</div>
+		</div>
+	</div>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				v1:1,
+				v2:1,
+				v3:0,
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.steps{
+		color: #000;
+		display: grid;
+		grid-template-columns: 1fr 1fr 1fr 1fr;
+		.public0{
+			.steps_start_lin{
+				display: flex;
+				align-items: center;
+				.steps_start_lin1{
+					width: 14px;
+					height: 14px;
+					border-radius: 50%;
+					background: #ccc;
+					color: #fff;
+					padding: 2px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 12px;
+				}
+				.steps_start_lin2{
+					flex: 1;
+					height: 2px;
+					background: #ccc;
+				}
+			}
+			.steps_start_tit{
+				font-size: 14px;
+				color: #ccc;
+				line-height: 30px;
+			}
+			.steps_start_txt{
+				font-size: 12px;
+				color: #ccc;
+				padding-right:50px;
+			}
+		}
+		.public1{
+			color: #409EFF;
+			.steps_start_lin{
+				display: flex;
+				align-items: center;
+				.steps_start_lin1{
+					width: 14px;
+					height: 14px;
+					border-radius: 50%;
+					background: #409EFF;
+					color: #fff;
+					padding: 2px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 12px;
+				}
+				.steps_start_lin2{
+					flex: 1;
+					height: 2px;
+					background: #409EFF;
+				}
+			}
+			.steps_start_tit{
+				font-size: 14px;
+				line-height: 30px;
+			}
+			.steps_start_txt{
+				font-size: 12px;
+				padding-right:50px;
+			}
+		}
+	}
+</style>

+ 0 - 5
src/views/ValidationTemplate/index.vue

@@ -65,11 +65,6 @@
 				<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>

+ 23 - 2
src/views/calibrationCertificate/index.vue

@@ -91,7 +91,7 @@
 									<el-button slot="reference" size="mini" @click="handleEdit1(scope.row)">编辑
 									</el-button>
 									<el-button slot="reference" size="mini" type="danger"
-										@click="handleDelete(scope.row)">删除
+										@click="handleDelete1(scope.row)">删除
 									</el-button>
 								</div>
 							</template>
@@ -208,7 +208,10 @@
 				}else if(this.pages3.T_pdf==""){
 					this.$message.error('请上传证书')
 				}else{
-					console.log('提交',this.pages3)
+					if(this.pages3.T_release_time.replace(/-/g, "")>this.pages3.T_failure_time.replace(/-/g, "")){
+						this.$message.error('发布时间大于失效时间,请重新选择')
+						return
+					}
 					if(this.CerNum==1){
 						this.SetCerti_pdfUp()
 					}else{
@@ -314,6 +317,24 @@
 					type: 'warning',
 					center: true
 				}).then(() => {
+					CertiDel({Id:val.Id}).then(res=>{
+						if(res.data.Code===200){
+							this.$message.success('删除成功')
+							this.pages.page = 1
+							this.GetCertiListApi()
+						}
+					})
+				}).catch(() => {
+					this.$message.info('取消删除');
+				});
+			},
+			handleDelete1(val) {
+				this.$confirm('此操作将删除该, 是否继续?', '提示', {
+					confirmButtonText: '立即删除',
+					cancelButtonText: '取消',
+					type: 'warning',
+					center: true
+				}).then(() => {
 					Certi_pdfDel({Id:val.Id}).then(res=>{
 						if(res.data.Code===200){
 							this.$message.success('删除成功')

+ 66 - 2
src/views/companyManagement/index.vue

@@ -76,12 +76,75 @@
 						</el-table-column>
 						<el-table-column label="流程" width="400">
 							<template slot-scope="scope">
-								<el-steps :active="scope.row | stepVal()" finish-status="success">
+								<!-- <el-steps :active="scope.row | stepVal()" finish-status="success">
 								  <el-step title="实施方案" :description="scope.row.T_scheme_name"></el-step>
 								  <el-step title="数据采集" :description="scope.row.T_collection_name"></el-step>
 								  <el-step title="报告编写" :description="scope.row.T_reporting_name"></el-step>
 								  <el-step title="交付审核" :description="scope.row.T_delivery_name"></el-step>
-								</el-steps>
+								</el-steps> -->
+								
+								
+								<div class="steps">
+									<div class="steps_start" :class="scope.row.T_scheme_state==0?'public0':'public1'">
+										<div class="steps_start_lin">
+											<div class="steps_start_lin1">
+												<i :class="scope.row.T_scheme_state==1?'el-icon-check':'el-icon-close'"></i>
+											</div>
+											<div class="steps_start_lin2"></div>
+										</div>
+										<div class="steps_start_tit">
+											实施方案
+										</div>
+										<div class="steps_start_txt">
+											{{scope.row.T_scheme_name}}
+										</div>
+									</div>
+									<div class="steps_process" :class="scope.row.T_collection_state==0?'public0':'public1'">
+										<div class="steps_start_lin">
+											<div class="steps_start_lin1">
+												<i :class="scope.row.T_collection_state==1?'el-icon-check':'el-icon-close'"></i>
+											</div>
+											<div class="steps_start_lin2">
+												
+											</div>
+										</div>
+										<div class="steps_start_tit">
+											数据采集
+										</div>
+										<div class="steps_start_txt">
+											{{scope.row.T_collection_name}}
+										</div>
+									</div>
+									<div class="steps_process" :class="scope.row.T_reporting_state==0?'public0':'public1'">
+										<div class="steps_start_lin">
+											<div class="steps_start_lin1">
+												<i :class="scope.row.T_reporting_state==1?'el-icon-check':'el-icon-close'"></i>
+											</div>
+											<div class="steps_start_lin2">
+												
+											</div>
+										</div>
+										<div class="steps_start_tit">
+											报告编写
+										</div>
+										<div class="steps_start_txt">
+											{{scope.row.T_reporting_name}}
+										</div>
+									</div>
+									<div class="steps_end" :class="scope.row.T_delivery_state==0?'public0':'public1'">
+										<div class="steps_start_lin">
+											<div class="steps_start_lin1">
+												<i :class="scope.row.T_delivery_state==1?'el-icon-check':'el-icon-close'"></i>
+											</div>
+										</div>
+										<div class="steps_start_tit">
+											交付审核
+										</div>
+										<div class="steps_start_txt">
+											{{scope.row.T_delivery_name}}
+										</div>
+									</div>
+								</div>
 							</template>
 						</el-table-column>
 						<el-table-column label="隐藏/公开" width="80">
@@ -723,6 +786,7 @@
 </script>
 
 <style lang="scss" scoped>
+	@import '../../assets/css/steps.scss';
 	// 在填充数据之前隐藏
 	[v-cloak] {
 		display: none;