From c860f3c9813482d43f9eccd42af07d08dea56af8 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Fri, 29 Jul 2022 15:40:10 +0800
Subject: [PATCH] 暂存修改
---
src/views/farmplant/detection.vue | 21 ++-------------------
1 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/views/farmplant/detection.vue b/src/views/farmplant/detection.vue
index f4b138b..62328b6 100644
--- a/src/views/farmplant/detection.vue
+++ b/src/views/farmplant/detection.vue
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
- <template>
-=======
<template>
->>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
<div>
<el-dialog
title="检测报告"
@@ -47,13 +43,6 @@
</el-dialog>
</div>
</template>
-<<<<<<< HEAD
-
-
-=======
-
-
->>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
<script>
import { getDetail, getList, update, remove, save } from "@/api/farm/farmPaper";
import { mapGetters } from "vuex";
@@ -153,8 +142,8 @@
data: [],
};
},
- created() {
-
+ created() {
+
},
computed: {
...mapGetters(["permission", "userInfo"]),
@@ -312,12 +301,6 @@
},
};
</script>
-<<<<<<< HEAD
<style>
</style>
-=======
-
-<style>
-</style>
->>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
--
Gitblit v1.9.3