Merge branch 'main' of http://47.109.205.240:3000/Web/digital-agriculture-admin

.eslintrc.js

@@ -48,7 +48,7 @@ module.exports = {
     'camelcase': [0, {
       'properties': 'always'
     }],
-    'comma-dangle': [2, 'off'],
+    'comma-dangle': [0, 'always'],
     'comma-spacing': [2, {
       'before': false,
       'after': true
@@ -183,7 +183,7 @@ module.exports = {
       'after': true
     }],
     'space-before-blocks': [2, 'always'],
-    'space-before-function-paren': [2, 'off'],
+    'space-before-function-paren': [0, 'always'],
     'space-in-parens': [2, 'never'],
     'space-infix-ops': 2,
     'space-unary-ops': [2, {

src/views/dataV/pageOne/MapChart.vue

@@ -20,7 +20,7 @@
             <!-- <p>产业园总产值（亿元）</p>
             <p style="color: #ff6e6f">27.51</p> -->
               <p>耕地面积(万亩)</p>
-            <p style="color: #ff6e6f">100.45</p>
+            <p style="color: #ff6e6f">73.98</p>
           </div>
         </li>
         <li>
@@ -29,14 +29,14 @@
             <!-- <p>主导鸡肉产量（吨）</p>
             <p style="color: #fcde1f">30,656.00</p> -->
             <p>农业总产值(亿元)</p>
-            <p style="color: #fcde1f">90.83</p>
+            <p style="color: #fcde1f">104.17</p>
           </div>
         </li>
         <li>
           <img src="../img/123.png" alt="" />
           <div class="topRit">
             <p>人均增收(万元)</p>
-            <p style="color: #00f6ff">1.02</p>
+            <p style="color: #00f6ff">1.79</p>
           </div>
         </li>
       </ul>

src/views/iot/device/components/CommonDeviceView/CdDetail.vue

@@ -41,7 +41,7 @@
       :w="Number(layout.img.w)"
       :h="Number(layout.img.h)"
     >
-      <el-image class="w100 h100" :src="device.imgUrl ? $baseUrl + device.imgUrl.split(',')[0] : ''" fit="fill" :lazy="true"></el-image>
+      <el-image class="w100 h100" :src="device.imgUrl ? device.imgUrl.split(',')[0] : ''" fit="fill" :lazy="true"></el-image>
     </vue-draggable-resizable>
 
     <vue-draggable-resizable