202304101633

src/components/dialogModel.vue

@@ -0,0 +1,21 @@
+<template>
+	<div class="y-dialog__wrapper">123456</div>
+</template>
+
+<script>
+</script>
+
+<style>
+	.y-dialog__wrapper {
+	    position: fixed;
+	    top: 0;
+	    right: 0;
+	    bottom: 0;
+	    left: 0;
+	    margin: 0;
+		width: 100%;
+		height: 100%;
+		background: rgba(#000, 1);
+		z-index: 99999 !important;
+	}
+</style>

src/views/ValidationTemplate/index.vue

@@ -129,18 +129,19 @@
 											<el-option label="数量" value="2"></el-option>
 											<el-option label="设备多选" value="3"></el-option>
 											<el-option label="设备单选" value="4"></el-option>
-											<el-option label="分割线" value="7"></el-option>
+											<el-option label="分割线" value="5"></el-option>
+											<el-option label="当期时间" value="7"></el-option>
 											<el-option label="当期时间（开始与结束时间）" value="9"></el-option>
 											<el-option label="图片" value="10"></el-option>
 											<el-option label="CAD" value="11"></el-option>
-											<el-option label="截止时间" value="12"></el-option>
 										</el-select>
 									</el-form-item>
 									<el-form-item label="来源" label-width="80px" prop="T_source">
 										<el-select v-model="form.T_source" placeholder="请选择来源">
 											<el-option label="方案" value="1"></el-option>
-											<el-option label="报告" value="2"></el-option>
+											<el-option label="报告(包含数据编辑)" value="2"></el-option>
 											<el-option label="数据编辑" value="3"></el-option>
+											<el-option label="所有(方案,报告)" value="0"></el-option>
 										</el-select>
 									</el-form-item>
 									<el-form-item label="标签名称" label-width="80px" prop="T_name">
@@ -149,13 +150,17 @@
 									<el-form-item label="排序" label-width="80px">
 										<el-input v-model="form.T_sort" autocomplete="off"></el-input>
 									</el-form-item>
-									<el-form-item label="描述" label-width="80px">
+									<el-form-item label="描述" label-width="80px" v-if="form.T_label!=10 && form.T_label!=11">
+										<el-input type="textarea" v-model="form.T_text"></el-input>
+									</el-form-item>
+									<el-form-item label="描述" label-width="80px" v-if="form.T_label==10 || form.T_label==11">
 										<files @pdfvalue="fliValue" :accepts="'image/*'"></files>
 										<div style="margin-top: 5px;line-height: 0 ;">
 											<div style="height: 20px;color: #409EFF;">
 												<div v-if="form.T_text!=''" style="display: flex;align-items: center;">
 													<i class="el-icon-circle-check"></i>
-													<div style="font-size: 12px;padding-left: 1px;">文件已上传</div>
+													<div style="font-size: 12px;padding-left: 1px;">文件已上传，</div>
+													<div style="font-size: 12px;cursor: pointer;text-decoration: underline;" @click="showImg">查看图片</div>
 												</div>
 											</div>
 										</div>
@@ -202,6 +207,11 @@
 				</el-drawer>	
 			</div>
 		</el-drawer>
+		<el-dialog title="图片查看" :visible.sync="dialogVisible">
+		  <div>
+			  <img :src="imgUrl" alt="" srcset="">
+		  </div>
+		</el-dialog>
 	</div>
 </template>
 
@@ -229,6 +239,8 @@
 		components:{files},
 		data() {
 			return {
+				imgUrl:'',
+				dialogVisible:false,
 				draTit:'',
 				Drawer1:false,
 				innerDrawer2:false,
@@ -300,6 +312,10 @@
 			this.getTempApi()
 		},
 		methods: {
+			showImg(){
+				this.dialogVisible = true
+				this.imgUrl = this.form.T_text
+			},
 			//标签上次成功
 			classsucFun(res){
 				console.log('上传成功1',res)