wangmengwei 2 月之前
父节点
当前提交
657cad4bbc

+ 3 - 3
ruoyi-ui/.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 智能校管家管理系统
+VUE_APP_TITLE = 智慧社区管理系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 智能校管家管理系统/开发环境
+# 智慧社区管理系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
@@ -14,4 +14,4 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
 VUE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 
 # 客户端id
-VUE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
+VUE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'

+ 3 - 3
ruoyi-ui/.env.production

@@ -1,14 +1,14 @@
 # 页面标题
-VUE_APP_TITLE = 智慧校园管理系统
+VUE_APP_TITLE = 智慧社区管理平台
 
 # 生产环境配置
 ENV = 'production'
 
-# 智慧校园管理系统/生产环境
+# 智慧社区管理平台/生产环境
 VUE_APP_BASE_API = '/prod-api'
 
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
 VUE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 
 # 客户端id
-VUE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'
+VUE_APP_CLIENT_ID = 'e5cd7e4891bf95d1d19206ce24a7b32e'

+ 2 - 2
ruoyi-ui/src/settings.js

@@ -1,7 +1,7 @@
 module.exports = {
-   // urls:`https://zhsq.qs163.cn`,
+   urls:`https://zhsq.qs163.cn`,
    // http://10.90.90.52:8065
-   urls:`http://192.168.101.86:8077`,
+   // urls:`http://192.168.101.245:8077`,
    // http://10.90.90.52:8065
    // zhsq.qs163.cn
   /**

+ 2 - 2
ruoyi-ui/src/views/login.vue

@@ -43,7 +43,7 @@
           </el-input>
         </el-form-item>
         <!-- v-if="captchaEnabled" -->
-        <el-form-item prop="code" v-if='!xgmemberMe && captchaEnabled' >
+        <el-form-item prop="code" v-if='captchaEnabled' >
           <el-input
             v-model="loginForm.code"
             auto-complete="off"
@@ -172,7 +172,7 @@ export default {
         password: [
           { required: true, trigger: "blur", message: "请输入您的密码" }
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        // code: [{ required: true, trigger: "change", message: "请输入验证码" }]
       },
       loading: false,
       // 验证码开关

+ 6 - 1
ruoyi-ui/src/views/wuguan/wuyefeigl/index.vue

@@ -262,7 +262,7 @@
       </div>
     </el-dialog>
     <el-dialog :title="titlel" :visible.sync="openl" width="440px" append-to-body class="botr">
-      <div class="carlist houselist" v-for="(item,index) in lsieshle">
+      <div class="carlist houselist" v-for="(item,index) in lsieshle" v-if="ishse == true">
       	<div class="ctop flexc" style="justify-content: flex-start;">
       		<img src="../../../assets/images/icon_lszd_rq.png" class="imgs" style="margin-right: 10px;" />
       		<!-- <image src="../../../assets/images/icon_fwgl_zhs.png" class="imgs" v-if="ite.type==2"></image> -->
@@ -359,6 +359,8 @@ export default {
        isshoe:true,
        statisticsLise:{},
        tableMaxHeight:'200',
+       ishse:false,
+       lsieshle:[]
       };
     },
     computed: {
@@ -508,8 +510,11 @@ export default {
            const propertyId = row.houseId
            let sgse={'houseId':propertyId}
            this.openl = true
+           // this.lsieshle = []
+           this.ishse = false
            listFee(sgse).then(response => {
              this.lsieshle = response.rows;
+             this.ishse = true
            });
     },
     /** 提交按钮 */

+ 5 - 5
ruoyi-ui/src/views/wuguan/wuyefeishezhi/index.vue

@@ -84,9 +84,9 @@
         </template>
       </el-table-column>
       <el-table-column label="应缴物业费用/m²" align="center" prop="tenementExpense" />
-      <el-table-column label="应缴车位费用" align="center" prop="parkingExpense" />
-      <el-table-column label="应缴能耗费用" align="center" prop="energyExpense" />
-      <el-table-column label="应缴总费用" align="center" prop="totalExpense" />
+      <el-table-column label="应缴车位费用/元" align="center" prop="parkingExpense" />
+      <el-table-column label="应缴能耗费用/元" align="center" prop="energyExpense" />
+      <el-table-column label="应缴总费用/元" align="center" prop="totalExpense" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -134,10 +134,10 @@
         <el-form-item label="应缴物业费用(平方米)" prop="tenementExpense">
           <el-input v-model="form.tenementExpense" placeholder="请输入应缴物业费用" />
         </el-form-item>
-        <el-form-item label="应缴车位费用" prop="parkingExpense">
+        <el-form-item label="应缴车位费用(元)" prop="parkingExpense">
           <el-input v-model="form.parkingExpense" placeholder="请输入应缴车位费用" />
         </el-form-item>
-        <el-form-item label="应缴能耗费用" prop="energyExpense">
+        <el-form-item label="应缴能耗费用(元)" prop="energyExpense">
           <el-input v-model="form.energyExpense" placeholder="请输入应缴能耗费用" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">