fix:删除fontawesome依赖，计费方式、水卡页面删除无用字段

.env.development

@@ -19,12 +19,12 @@ VUE_APP_SYS_ID = TODO
 
 VUE_APP_SSO_ENABLED = FALSE
 
-VUE_APP_SYS_APP_MENUCFGID = 80e51453-7062-31ae-b673-00f24b0d7bed
+VUE_APP_SYS_APP_MENUCFGID = 23946ead-0189-1000-e000-05e9c0a8000a
 
-VUE_APP_SYS_BASE_URL= /water
+VUE_APP_SYS_BASE_URL= /wpr
 
-VUE_APP_ROUTER_BASE_URL= water
+VUE_APP_ROUTER_BASE_URL= wpr
 
-VUE_APP_PUBLIC_PATH= /water/
+VUE_APP_PUBLIC_PATH= /wpr/
 
 VUE_APP_THIRD_BASE_URL=

package-lock.json

@@ -20,7 +20,6 @@
         "echarts": "5.4.0",
         "element-ui": "2.15.12",
         "file-saver": "2.0.5",
-        "fontawesome-free-6.2.1": "^6.2.1",
         "fuse.js": "6.4.3",
         "highlight.js": "9.18.5",
         "js-beautify": "1.13.0",
@@ -8253,11 +8252,6 @@
         }
       }
     },
-    "node_modules/fontawesome-free-6.2.1": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/fontawesome-free-6.2.1/-/fontawesome-free-6.2.1-6.2.1.tgz",
-      "integrity": "sha512-Eq98/br5vDdkrOiAaWs2R1kEyAVQN8kgc3sfvAz4Y2ZG81N8XPABJXtKkDQanefh75YOPol5+wnPXqIar/3IRw=="
-    },
     "node_modules/for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.3.tgz",
@@ -25485,11 +25479,6 @@
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
-    "fontawesome-free-6.2.1": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/fontawesome-free-6.2.1/-/fontawesome-free-6.2.1-6.2.1.tgz",
-      "integrity": "sha512-Eq98/br5vDdkrOiAaWs2R1kEyAVQN8kgc3sfvAz4Y2ZG81N8XPABJXtKkDQanefh75YOPol5+wnPXqIar/3IRw=="
-    },
     "for-each": {
       "version": "0.3.3",
       "resolved": "https://registry.npmmirror.com/for-each/-/for-each-0.3.3.tgz",

package.json

@@ -47,7 +47,6 @@
     "echarts": "5.4.0",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",
-    "fontawesome-free-6.2.1": "^6.2.1",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",

src/main.js

@@ -4,7 +4,6 @@ import Cookies from 'store';
 import { startsWith } from 'lodash-es';
 import Element from 'element-ui';
 import './assets/styles/element-variables.scss';
-import 'fontawesome-free-6.2.1/css/all.min.css';
 
 import '@/assets/styles/index.scss'; // global css
 import '@/assets/styles/global.scss'; // global css

src/views/monitoringMamage/index.vue

@@ -62,11 +62,11 @@
               </el-row>
             </el-col>
             <el-col :span="10">
-              <div style="display: flex; justify-content: space-around">
-                <echarts-pie
+              <div style="display: flex; justify-content: flex-end;">
+                <!-- <echarts-pie
                   style="width: 30%; margin-left: 5%"
                   :proportion="proportion"
-                />
+                /> -->
                 <div style="width: 65%">
                   <el-row :gutter="20">
                     <el-col :span="12">
@@ -238,21 +238,21 @@ export default {
           number: 0,
           styleClass: 'radius'
         },
-        {
-          title: '运行',
-          number: 0,
-          styleClass: 'radius run'
-        },
-        {
-          title: '故障',
-          number: 0,
-          styleClass: 'radius error'
-        },
-        {
-          title: '告警',
-          number: 0,
-          styleClass: 'radius waring'
-        },
+        // {
+        //   title: '运行',
+        //   number: 0,
+        //   styleClass: 'radius run'
+        // },
+        // {
+        //   title: '故障',
+        //   number: 0,
+        //   styleClass: 'radius error'
+        // },
+        // {
+        //   title: '告警',
+        //   number: 0,
+        //   styleClass: 'radius waring'
+        // },
         {
           title: '离线',
           number: 0,
@@ -426,21 +426,21 @@ export default {
           number: resData?.tmnCount1,
           styleClass: 'radius'
         },
-        {
-          title: '运行',
-          number: resData?.tmnCount2,
-          styleClass: 'radius run'
-        },
-        {
-          title: '故障',
-          number: resData?.tmnCount3,
-          styleClass: 'radius error'
-        },
-        {
-          title: '告警',
-          number: resData?.tmnCount5,
-          styleClass: 'radius waring'
-        },
+        // {
+        //   title: '运行',
+        //   number: resData?.tmnCount2,
+        //   styleClass: 'radius run'
+        // },
+        // {
+        //   title: '故障',
+        //   number: resData?.tmnCount3,
+        //   styleClass: 'radius error'
+        // },
+        // {
+        //   title: '告警',
+        //   number: resData?.tmnCount5,
+        //   styleClass: 'radius waring'
+        // },
         {
           title: '离线',
           number: resData?.tmnCount4,

src/views/peasantHouseholdManage/components/IrrigationRecord.vue

@@ -34,6 +34,9 @@
       :columns="columns"
       showIndex
     >
+      <template #cardusercdBillingtype="scope">
+        {{ scope.row.cardusercdBillingtype === '1' ? '综合计价' : '阶梯计价' }}
+      </template>
     </b-table>
   </el-dialog>
 </template>
@@ -105,7 +108,7 @@ export default {
         {
           label: '计费方式',
           prop: 'cardusercdBillingtype',
-          customRender: '',
+          customRender: 'cardusercdBillingtype',
           align: 'center'
         },
         // {

src/views/waterCardManage/dataDetail.vue

@@ -149,24 +149,24 @@ export default {
           customRender: '',
           align: 'center'
         },
-        {
-          label: '使用时长',
-          prop: 'cardusercdDuration',
-          customRender: '',
-          align: 'center'
-        },
+        // {
+        //   label: '使用时长',
+        //   prop: 'cardusercdDuration',
+        //   customRender: '',
+        //   align: 'center'
+        // },
         {
           label: '计费方式',
           prop: 'cardusercdBillingtype',
           customRender: '',
           align: 'center'
         },
-        {
-          label: '计费标准',
-          prop: 'cardusercdPriceinfo',
-          customRender: '',
-          align: 'center'
-        },
+        // {
+        //   label: '计费标准',
+        //   prop: 'cardusercdPriceinfo',
+        //   customRender: '',
+        //   align: 'center'
+        // },
         {
           label: '扣除金额',
           prop: 'cardusercdUsemoney',