Преглед на файлове

feat:行政区划列表移除

zhb преди 8 месеца
родител
ревизия
6053e60e04

+ 6 - 2
src/views/equipmentList/components/CardRecordDialog.vue

@@ -9,7 +9,7 @@
     :close-on-press-escape="false"
     @close="handleClose"
   >
-    <div class="dialog-common-page" style="height: 600px">
+    <div class="dialog-common-page" style="height: 800px">
       <div class="dialog-common-page__header">
         <el-form
           :model="queryParams"
@@ -80,7 +80,8 @@ export default {
       columns: [
         {
           label: '会员卡号',
-          prop: 'cardNo'
+          prop: 'cardNo',
+          width: 100
         },
         {
           label: '农户号',
@@ -91,6 +92,7 @@ export default {
         {
           label: '农户名称',
           prop: 'farmerName',
+          width: '80px',
           align: 'center'
         },
         {
@@ -101,6 +103,7 @@ export default {
         {
           label: '手机号',
           prop: 'farmerPhone',
+          width: 110,
           align: 'center'
         },
         {
@@ -110,6 +113,7 @@ export default {
         },
         {
           label: '管理机器',
+          width: '80px',
           prop: 'devCode',
           align: 'center'
         }

+ 1 - 1
src/views/equipmentList/components/RechargeRecordDialog.vue

@@ -9,7 +9,7 @@
     :close-on-press-escape="false"
     @close="handleClose"
   >
-    <div class="dialog-common-page" style="height: 600px">
+    <div class="dialog-common-page" style="height: 800px">
       <div class="dialog-common-page__header">
         <el-form
           :model="queryParams"

+ 5 - 5
src/views/peasantHouseholdManage/index.vue

@@ -1,14 +1,14 @@
 <template>
   <el-row class="el-row-container" style="height: 100%" v-loading="loading">
-    <el-col :span="4" style="height: 100%; padding-bottom: 32px">
+    <!-- <el-col :span="4" style="height: 100%; padding-bottom: 32px">
       <el-card style="margin: 16px; height: 100%; overflow-y: auto">
         <data-report-left
           @setCurrentData="setCurrentData"
           :treeData="treeData"
         ></data-report-left>
       </el-card>
-    </el-col>
-    <el-col :span="20" style="padding: 16px 16px 16px 0; height: 100%">
+    </el-col> -->
+    <el-col :span="24" style="padding: 16px; height: 100%">
       <el-card style="height: 100%; overflow-y: auto">
         <el-col :span="24" class="elrow-main__col-top">
           <div style="display: flex">
@@ -26,7 +26,7 @@
               @click="handleSearch"
               >查询</el-button
             >
-            <el-upload
+            <!-- <el-upload
               class="avatar-uploader"
               :action="uploadUrl"
               :show-file-list="false"
@@ -52,7 +52,7 @@
               @click="downloadExcel()"
               v-hasPermi="['wpr:farmer:template:upload']"
               >下载模板</el-button
-            >
+            > -->
           </div>
           <!-- <div class="top-left">
             <el-button

+ 3 - 7
src/views/waterCardManage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <el-row class="el-row-container" v-loading="loading">
-    <el-col
+    <!-- <el-col
       v-if="!detailType"
       :span="4"
       style="height: 100%; padding-bottom: 32px"
@@ -11,12 +11,8 @@
           :treeData="treeData"
         ></data-report-left>
       </el-card>
-    </el-col>
-    <el-col
-      v-show="!detailType"
-      :span="20"
-      style="padding: 16px 16px 16px 0; height: 100%"
-    >
+    </el-col> -->
+    <el-col v-show="!detailType" :span="24" style="padding: 16px; height: 100%">
       <el-card style="height: 100%; overflow-y: auto">
         <el-col :span="24" class="elrow-main__col-top">
           <div>

+ 2 - 1
vue.config.js

@@ -12,7 +12,8 @@ const name = process.env.VUE_APP_TITLE || '水价改革'; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 8021; // 端口
 
-const proxyPath = 'http://192.168.3.40:7000';
+// const proxyPath = 'http://192.168.3.40:7000';
+const proxyPath = 'https://dev.a.yunfeiyun.com';
 
 // vue.config.js 配置说明
 // 官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions