xgb 2 дней назад
Родитель
Сommit
e69024f543
2 измененных файлов с 27 добавлено и 27 удалено
  1. 24 24
      src/views/admin/sysCompany/index.vue
  2. 3 3
      vue.config.js

+ 24 - 24
src/views/admin/sysCompany/index.vue

@@ -35,53 +35,53 @@
       <el-table-column label="租户名称" prop="tenantName" min-width="140" />
       <el-table-column label="联系人" prop="contactName" width="90" align="center" />
       <el-table-column label="联系电话" prop="contactPhone" width="120" align="center" />
-      <!-- TODO 后续优化:余额需切到租户库查询 company 表 -->
-      <el-table-column label="余额" align="center" width="110">
+      <el-table-column label="余额" prop="balance" align="center" width="110">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.balance != null">{{ scope.row.balance }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
-      <!-- TODO 后续优化:已消费总额需切到租户库查询 company_money_logs 表 -->
-      <el-table-column label="已消费总额" align="center" width="120">
+      <el-table-column label="已消费总额" prop="totalConsumption" align="center" width="120">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.totalConsumption != null">{{ scope.row.totalConsumption }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
-      <!-- TODO 后续优化:开通账户数需切到租户库查询 company_user 表 -->
-      <el-table-column label="开通账户数" align="center" width="110">
+      <el-table-column label="开通账户数" prop="accountCount" align="center" width="110">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.accountCount != null">{{ scope.row.accountCount }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
-      <!-- TODO 后续优化:绑定企微账户数需切到租户库查询 company_user 表 -->
-      <el-table-column label="绑定企微账户数" align="center" width="130">
+      <el-table-column label="绑定企微账户数" prop="qwAccountCount" align="center" width="130">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.qwAccountCount != null">{{ scope.row.qwAccountCount }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
-      <!-- TODO 后续优化:绑定个微账户数需切到租户库查询 company_wx_user 表 -->
-      <el-table-column label="绑定个微账户数" align="center" width="130">
+      <el-table-column label="绑定个微账户数" prop="wxAccountCount" align="center" width="130">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.wxAccountCount != null">{{ scope.row.wxAccountCount }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
-      <!-- TODO 后续优化:客户数需切到租户库查询 qw_external_contact 表 -->
-      <el-table-column label="客户数" align="center" width="100">
+      <el-table-column label="客户数" prop="customerCount" align="center" width="100">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.customerCount != null">{{ scope.row.customerCount }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
-      <!-- TODO 后续优化:企微用户数需切到租户库查询 qw_user 表 -->
-      <el-table-column label="企微用户数" align="center" width="110">
+      <el-table-column label="企微用户数" prop="qwUserCount" align="center" width="110">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.qwUserCount != null">{{ scope.row.qwUserCount }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
       <el-table-column label="过期时间" align="center" prop="expireTime" width="110" />
-      <!-- TODO 后续优化:归属代理需查询 proxy_tenant_rel + proxy 表 -->
-      <el-table-column label="归属代理" align="center" width="110">
+      <el-table-column label="归属代理" prop="proxyName" align="center" width="110">
         <template slot-scope="scope">
-          <span style="color:#999">-</span>
+          <span v-if="scope.row.proxyName">{{ scope.row.proxyName }}</span>
+          <span v-else style="color:#999">-</span>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" width="80">

+ 3 - 3
vue.config.js

@@ -43,7 +43,7 @@ module.exports = {
     proxy: {
       // 为 watch 模块单独设置的代理
       '/watch-api': {
-        target: 'http://localhost:8004', // 另一个目标服务器
+        target: 'http://localhost:8003', // 另一个目标服务器
         changeOrigin: true,
         pathRewrite: {
           '^/watch-api': '' // 将 /watch-api 替换为空
@@ -129,9 +129,9 @@ module.exports = {
         }
       },
       // detail: https://cli.vuejs.org/config/#devserver-proxy
-      // 默认所有其他请求代理到 fs-admin(8004) - 平台管理端
+      // 默认所有其他请求代理到 fs-admin(8003) - 平台管理端
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8004`,
+        target: `http://localhost:8003`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''