| .eslintrc.js | ●●●●● patch | view | raw | blame | history | |
| public/traceablityInfo.html | ●●●●● patch | view | raw | blame | history | |
| public/traceablityInfos.html | ●●●●● patch | view | raw | blame | history | |
| src/views/farm/farmReport.vue | patch | view | raw | blame | history | |
| src/views/farmplant/detection.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/farmplant/farmplant.vue | ●●●●● patch | view | raw | blame | history | |
| src/views/stock/stockmanage.vue | ●●●●● patch | view | raw | blame | history |
.eslintrc.js
@@ -9,7 +9,8 @@ ], rules: { 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off', "no-unused-vars": "off" }, parserOptions: { parser: 'babel-eslint' public/traceablityInfo.html
@@ -8,7 +8,11 @@ .top-log { position: relative; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .top-log .btn-grounp { position: absolute; left: 0; @@ -20,14 +24,22 @@ justify-content: space-around; background: transparent; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content { display: flex; flex-direction: column; align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .logo { position: relative; margin-top: 56px; @@ -36,7 +48,11 @@ border-radius: 50%; overflow: hidden; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .logo .btn { position: absolute; bottom: 0; @@ -48,14 +64,22 @@ font-size: 24px; color: #fff; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .title { margin-top: 30px; font-size: 48px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .type { display: flex; margin-top: 10px; @@ -67,14 +91,22 @@ border-radius: 8px; overflow: hidden; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .type .sub { flex: 1; display: flex; align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .type .icon { width: 36px; display: flex; @@ -82,7 +114,11 @@ justify-content: center; background: #6AC077; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .date { display: flex; align-items: center; @@ -95,38 +131,62 @@ font-size: 34px; color: #5ABF78; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box { margin-top: 60px; padding: 0 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title { display: flex; align-items: center; height: 50px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .l { width: 5px; height: 36px; background: #5ABF78; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .title { margin-left: 20px; font-size: 36px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .border { flex: 1; margin: 13px; border-top: 1px dashed #D4DBE8; border-bottom: 1px dashed #D4DBE8; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .status { display: flex; align-items: center; @@ -134,17 +194,29 @@ font-size: 24px; color: #5ABF78; } <<<<<<< HEAD .model-box .model-title .statu.no { color: #EC9144; } ======= .model-box .model-title .statu.no { color: #EC9144; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .status view { display: flex; align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content { display: flex; flex-direction: column; @@ -152,54 +224,90 @@ background: #fff; border-radius: 30px; } <<<<<<< HEAD .model-box.qw .model-content .box:first-child { border: 2px solid #EEEEEE; } ======= .model-box.qw .model-content .box:first-child { border: 2px solid #EEEEEE; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box { flex: 1; display: flex; padding: 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r { margin-left: 26px; flex: 1; font-size: 24px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .title { font-size: 32px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .line-box { margin-top: 16px; display: flex; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .line-box .sub { width: 120px; color: #333333; line-height: 36px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .line-box .content { flex: 1; color: #666666; line-height: 36px; } /* 容器 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content { margin-top: 30px; background: #fff; border-radius: 30px; } /* 头部 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content .content-header { display: flex; align-items: center; @@ -208,33 +316,57 @@ font-size: 30px; color: #5ABF78; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-header { color: #A255B5; border-bottom: 2px solid #ECECEC; } /* 中间 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.dk .content-body { height: 450px; background: greenyellow; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jksp .content-body { height: 385px; background: #A255B5; } <<<<<<< HEAD .model-box.cd .model-content.jk .content-body { border-bottom: 1px solid transparent; } ======= .model-box.cd .model-content.jk .content-body { border-bottom: 1px solid transparent; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box { margin: 26px 22px; border-radius: 28px; border: 2px solid #E3E3E3; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-title { padding: 0 22px; margin-top: 10px; @@ -246,7 +378,11 @@ font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-date { display: flex; align-items: center; @@ -255,7 +391,11 @@ height: 2px; background: #ECECEC; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-date .site-date-text { padding: 0 18px; height: 36px; @@ -264,14 +404,22 @@ font-size: 24px; color: #929292; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content { padding: 24px 22px; display: flex; flex-wrap: wrap; justify-content: space-between; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view { display: flex; align-items: center; @@ -283,45 +431,77 @@ border-radius: 8px; box-sizing: border-box; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(1), .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(2) { margin-top: 0; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view .type { font-size: 28px; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view .unit { margin-top: 4px; font-size: 24px; color: #84898F; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view .r { font-size: 38px; color: #5ABF78; } /* 底部 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content .content-footer { display: flex; align-items: center; height: 120px; font-size: 24px; } <<<<<<< HEAD .model-box.cd .model-content.dk .content-footer { padding: 0 26px; } ======= .model-box.cd .model-content.dk .content-footer { padding: 0 26px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.dk .content-footer .l { width: 480px; color: #666666; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.dk .content-footer .r { flex: 1; display: flex; @@ -329,11 +509,19 @@ justify-content: center; color: #5ABF78; } <<<<<<< HEAD .model-box.cd .model-content.jksp .content-footer { padding: 0 30px; } ======= .model-box.cd .model-content.jksp .content-footer { padding: 0 30px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jksp .content-footer .equi-btn { display: flex; align-items: center; @@ -347,28 +535,48 @@ font-size: 24px; color: #697580; } <<<<<<< HEAD .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child { margin-left: 0; } ======= .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child { margin-left: 0; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jksp .content-footer .equi-btn.on { background: linear-gradient(90deg, #5ABB82 0%, #7BDA8F 100%); border: none; color: #fff; } /* 种植环节 */ <<<<<<< HEAD .model-box.zz .model-content { margin-top: 30px; } ======= .model-box.zz .model-content { margin-top: 30px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg { display: flex; align-items: center; height: 126px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r { margin-left: 30px; padding: 10px 26px; @@ -379,17 +587,29 @@ color: #999999; border-radius: 16px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r text { font-weight: bold; color: #EC9144; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r .r-b-msg { margin-top: 10px; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r .point-to { position: absolute; top: 0; @@ -404,12 +624,20 @@ border-bottom: 14px solid transparent; z-index: -1; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box { display: flex; align-items: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l { margin-left: 40px; display: flex; @@ -417,56 +645,92 @@ align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .point { width: 20px; height: 20px; background: #5ABF78; border-radius: 50%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .line { width: 2px; height: 150px; background: #DEE3E7; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .line.one { width: 2px; height: 100px; background: #DEE3E7; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .line.two { width: 2px; height: 100px; background: #DEE3E7; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r { margin-left: 64px; flex: 1; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item { margin-top: 30px; padding: 32px 30px 42px; background: #FFFFFF; border-radius: 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .type { font-size: 32px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .date-pel { margin-top: 10px; display: flex; justify-content: space-between; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .date-pel .date { padding: 2px 20px; font-size: 24px; @@ -474,20 +738,32 @@ background: linear-gradient(89deg, #60BA84 0%, #73DB90 100%); border-radius: 10px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .date-pel .pel { font-size: 28px; color: #666666; } /* 生产企业 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content { margin-top: 30px; /* padding-bottom: 30px; */ background: #fff; border-radius: 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-header { display: flex; align-items: center; @@ -497,26 +773,46 @@ font-weight: bold; color: #000000; } <<<<<<< HEAD .model-box.sc .model-content .content-body { height: 390px; } ======= .model-box.sc .model-content .content-body { height: 390px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-body .swiper { height: 100%; width: 100%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-body .swiper-image { height: 100%; width: 100%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-body .slide-image { height: 100%; width: 100%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .text-intro { margin: 0 25px; padding: 20px 0 34px; @@ -525,26 +821,42 @@ color: #818592; border-bottom: 2px solid #EAEEF4; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer { margin-top: 24px; display: flex; align-items: flex-start; justify-content: space-around; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer>view { display: flex; flex-direction: column; align-items: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer>view .type { margin-top: 6px; font-size: 24px; color: #697580; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer>view .msg { margin-top: 2px; padding: 2px 6px; @@ -553,14 +865,22 @@ font-size: 20px; color: #697580; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp { margin-top: 84px; display: flex; height: 148px; background: #FFFFFF; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .l { margin-right: 76px; width: 194px; @@ -569,19 +889,31 @@ align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .l .plan { font-size: 34px; font-weight: bold; color: #D55B26; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .l .text { margin-top: 2px; font-size: 20px; color: #A5AEB5; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .r { flex: 1; display: flex; @@ -700,8 +1032,13 @@ } else { str1 = str1 + `<div class="box"></div>` } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 var str2 = ` </div> </div> @@ -1035,5 +1372,10 @@ }); </script> </body> <<<<<<< HEAD </html> ======= </html> >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 public/traceablityInfos.html
@@ -8,7 +8,11 @@ .top-log { position: relative; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .top-log .btn-grounp { position: absolute; left: 0; @@ -20,14 +24,22 @@ justify-content: space-around; background: transparent; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content { display: flex; flex-direction: column; align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .logo { position: relative; margin-top: 56px; @@ -36,7 +48,11 @@ border-radius: 50%; overflow: hidden; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .logo .btn { position: absolute; bottom: 0; @@ -48,14 +64,22 @@ font-size: 24px; color: #fff; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .title { margin-top: 30px; font-size: 48px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .type { display: flex; margin-top: 10px; @@ -67,14 +91,22 @@ border-radius: 8px; overflow: hidden; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .type .sub { flex: 1; display: flex; align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .type .icon { width: 36px; display: flex; @@ -82,7 +114,11 @@ justify-content: center; background: #6AC077; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .main-content .date { display: flex; align-items: center; @@ -95,38 +131,62 @@ font-size: 34px; color: #5ABF78; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box { margin-top: 60px; padding: 0 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title { display: flex; align-items: center; height: 50px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .l { width: 5px; height: 36px; background: #5ABF78; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .title { margin-left: 20px; font-size: 36px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .border { flex: 1; margin: 13px; border-top: 1px dashed #D4DBE8; border-bottom: 1px dashed #D4DBE8; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .status { display: flex; align-items: center; @@ -134,17 +194,29 @@ font-size: 24px; color: #5ABF78; } <<<<<<< HEAD .model-box .model-title .statu.no { color: #EC9144; } ======= .model-box .model-title .statu.no { color: #EC9144; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box .model-title .status view { display: flex; align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content { display: flex; flex-direction: column; @@ -153,54 +225,90 @@ background: #fff; border-radius: 30px; } <<<<<<< HEAD .model-box.qw .model-content .box:first-child { border: 2px solid #EEEEEE; } ======= .model-box.qw .model-content .box:first-child { border: 2px solid #EEEEEE; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box { flex: 1; display: flex; padding: 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r { margin-left: 26px; flex: 1; font-size: 24px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .title { font-size: 32px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .line-box { margin-top: 16px; display: flex; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .line-box .sub { width: 120px; color: #333333; line-height: 36px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.qw .model-content .box>.r .line-box .content { flex: 1; color: #666666; line-height: 36px; } /* 容器 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content { margin-top: 30px; background: #fff; border-radius: 30px; } /* 头部 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content .content-header { display: flex; align-items: center; @@ -209,33 +317,57 @@ font-size: 30px; color: #5ABF78; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-header { color: #A255B5; border-bottom: 2px solid #ECECEC; } /* 中间 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.dk .content-body { height: 450px; background: greenyellow; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jksp .content-body { height: 385px; background: #A255B5; } <<<<<<< HEAD .model-box.cd .model-content.jk .content-body { border-bottom: 1px solid transparent; } ======= .model-box.cd .model-content.jk .content-body { border-bottom: 1px solid transparent; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box { margin: 26px 22px; border-radius: 28px; border: 2px solid #E3E3E3; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-title { padding: 0 22px; margin-top: 10px; @@ -247,7 +379,11 @@ font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-date { display: flex; align-items: center; @@ -256,7 +392,11 @@ height: 2px; background: #ECECEC; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-date .site-date-text { padding: 0 18px; height: 36px; @@ -265,14 +405,22 @@ font-size: 24px; color: #929292; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content { padding: 24px 22px; display: flex; flex-wrap: wrap; justify-content: space-between; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view { display: flex; align-items: center; @@ -284,45 +432,77 @@ border-radius: 8px; box-sizing: border-box; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(1), .model-box.cd .model-content.jk .content-body .site-box .site-content>view:nth-child(2) { margin-top: 0; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view .type { font-size: 28px; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view .unit { margin-top: 4px; font-size: 24px; color: #84898F; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jk .content-body .site-box .site-content>view .r { font-size: 38px; color: #5ABF78; } /* 底部 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content .content-footer { display: flex; align-items: center; height: 120px; font-size: 24px; } <<<<<<< HEAD .model-box.cd .model-content.dk .content-footer { padding: 0 26px; } ======= .model-box.cd .model-content.dk .content-footer { padding: 0 26px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.dk .content-footer .l { width: 480px; color: #666666; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.dk .content-footer .r { flex: 1; display: flex; @@ -330,11 +510,19 @@ justify-content: center; color: #5ABF78; } <<<<<<< HEAD .model-box.cd .model-content.jksp .content-footer { padding: 0 30px; } ======= .model-box.cd .model-content.jksp .content-footer { padding: 0 30px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jksp .content-footer .equi-btn { display: flex; align-items: center; @@ -348,28 +536,48 @@ font-size: 24px; color: #697580; } <<<<<<< HEAD .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child { margin-left: 0; } ======= .model-box.cd .model-content.jksp .content-footer .equi-btn:first-child { margin-left: 0; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.cd .model-content.jksp .content-footer .equi-btn.on { background: linear-gradient(90deg, #5ABB82 0%, #7BDA8F 100%); border: none; color: #fff; } /* 种植环节 */ <<<<<<< HEAD .model-box.zz .model-content { margin-top: 30px; } ======= .model-box.zz .model-content { margin-top: 30px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg { display: flex; align-items: center; height: 126px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r { margin-left: 30px; padding: 10px 26px; @@ -380,17 +588,29 @@ color: #999999; border-radius: 16px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r text { font-weight: bold; color: #EC9144; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r .r-b-msg { margin-top: 10px; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .msg .r .point-to { position: absolute; top: 0; @@ -405,12 +625,20 @@ border-bottom: 14px solid transparent; z-index: -1; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box { display: flex; align-items: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l { margin-left: 40px; display: flex; @@ -418,56 +646,92 @@ align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .point { width: 20px; height: 20px; background: #5ABF78; border-radius: 50%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .line { width: 2px; height: 150px; background: #DEE3E7; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .line.one { width: 2px; height: 100px; background: #DEE3E7; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .l .line.two { width: 2px; height: 100px; background: #DEE3E7; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r { margin-left: 64px; flex: 1; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item { margin-top: 30px; padding: 32px 30px 42px; background: #FFFFFF; border-radius: 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .type { font-size: 32px; font-weight: bold; color: #333333; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .date-pel { margin-top: 10px; display: flex; justify-content: space-between; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .date-pel .date { padding: 2px 20px; font-size: 24px; @@ -475,20 +739,32 @@ background: linear-gradient(89deg, #60BA84 0%, #73DB90 100%); border-radius: 10px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.zz .model-content .record-box .r .record-item .date-pel .pel { font-size: 28px; color: #666666; } /* 生产企业 */ <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content { margin-top: 30px; /* padding-bottom: 30px; */ background: #fff; border-radius: 30px; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-header { display: flex; align-items: center; @@ -498,26 +774,46 @@ font-weight: bold; color: #000000; } <<<<<<< HEAD .model-box.sc .model-content .content-body { height: 390px; } ======= .model-box.sc .model-content .content-body { height: 390px; } >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-body .swiper { height: 100%; width: 100%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-body .swiper-image { height: 100%; width: 100%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-body .slide-image { height: 100%; width: 100%; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .text-intro { margin: 0 25px; padding: 20px 0 34px; @@ -526,26 +822,42 @@ color: #818592; border-bottom: 2px solid #EAEEF4; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer { margin-top: 24px; display: flex; align-items: flex-start; justify-content: space-around; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer>view { display: flex; flex-direction: column; align-items: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer>view .type { margin-top: 6px; font-size: 24px; color: #697580; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .model-box.sc .model-content .content-footer>view .msg { margin-top: 2px; padding: 2px 6px; @@ -554,14 +866,22 @@ font-size: 20px; color: #697580; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp { margin-top: 84px; display: flex; height: 148px; background: #FFFFFF; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .l { margin-right: 76px; width: 194px; @@ -570,19 +890,31 @@ align-items: center; justify-content: center; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .l .plan { font-size: 34px; font-weight: bold; color: #D55B26; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .l .text { margin-top: 2px; font-size: 20px; color: #A5AEB5; } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 .btn-grounp .r { flex: 1; display: flex; @@ -610,10 +942,17 @@ return null; }; var code = getData("code"); <<<<<<< HEAD // var code = "22070000002"; ======= // var code = "22070000002"; >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 axios.get('https://dev.jxpskj.com:8023/api/traceability/getTraceabilityDetailInfo?code=' + code).then(function(res) { // axios.get('http://192.168.0.114:89/traceability/getTraceabilityDetailInfo?code==22060000002').then(function(res) { @@ -701,8 +1040,13 @@ } else { str1 = str1 + `<div class="box"></div>` } <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 var str2 = ` </div> </div> @@ -1036,5 +1380,10 @@ }); </script> </body> <<<<<<< HEAD </html> ======= </html> >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 src/views/farm/farmReport.vue
src/views/farmplant/detection.vue
@@ -1,4 +1,8 @@ <<<<<<< HEAD <template> ======= <template> >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 <div> <el-dialog title="检测报告" @@ -43,8 +47,13 @@ </el-dialog> </div> </template> <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 <script> import { getDetail, getList, update, remove, save } from "@/api/farm/farmPaper"; import { mapGetters } from "vuex"; @@ -303,6 +312,12 @@ }, }; </script> <<<<<<< HEAD <style> </style> ======= <style> </style> >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 src/views/farmplant/farmplant.vue
@@ -573,7 +573,11 @@ strainId.dicData = res.data.data; } }) <<<<<<< HEAD ======= >>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356 }, //新增 rowSave(row, done, loading) { src/views/stock/stockmanage.vue
@@ -446,6 +446,11 @@ type: "number", span: 11, prop: "amount1", rules: [{ required: true, message: "请输入入库数量", trigger: "blur" }] }, { label: "入库类型", @@ -613,6 +618,11 @@ type: "number", span: 11, prop: "amount1", rules: [{ required: true, message: "请输入入库数量", trigger: "blur" }] }, { label: "出库类型",
