diff --git a/FlowerGully/src/assets/7.gif b/FlowerGully/src/assets/7.gif new file mode 100644 index 0000000000000000000000000000000000000000..67eb144e9e9bc3df42e6ac82f652345306a319df Binary files /dev/null and b/FlowerGully/src/assets/7.gif differ diff --git a/FlowerGully/src/views/BasicInformation/Variety.vue b/FlowerGully/src/views/BasicInformation/Variety.vue index 32ad6db299b5b7ed7a984e5850928f89f726b09a..c7c91ece59c090796d8c5dc6a3134c9bba62ab9b 100644 --- a/FlowerGully/src/views/BasicInformation/Variety.vue +++ b/FlowerGully/src/views/BasicInformation/Variety.vue @@ -71,6 +71,7 @@ 确 定 +>>>>>>> master @@ -215,4 +216,5 @@ export default { height: 178px; display: block; } - \ No newline at end of file + +>>>>>>> master diff --git a/FlowerGully/src/views/Equipment/VideoMonitoring.vue b/FlowerGully/src/views/Equipment/VideoMonitoring.vue index d445e676b4e2be6a3a67be5ab1793f94b780b63a..91153eb303392969f64e9bbff26ecd7d01edfc72 100644 --- a/FlowerGully/src/views/Equipment/VideoMonitoring.vue +++ b/FlowerGully/src/views/Equipment/VideoMonitoring.vue @@ -1,15 +1,203 @@ \ No newline at end of file diff --git a/FlowerGully/src/views/Sales/index.vue b/FlowerGully/src/views/Sales/index.vue index e9b2870d308df8423c68db0d02bb9baa9ba56c1a..ce60f99250af997afea7ca28d25f846e40826e3c 100644 --- a/FlowerGully/src/views/Sales/index.vue +++ b/FlowerGully/src/views/Sales/index.vue @@ -1,6 +1,418 @@ @@ -10,4 +422,116 @@ export default { } - \ No newline at end of file + \ No newline at end of file