Ver código fonte

fix(cfc-web): 修复管理端多处模板标签闭合并将本地开发接口指向 127.0.0.1:9082 代理

李宇 2 meses atrás
pai
commit
d180aaa0be

+ 1 - 0
cfc-frontend/.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

+ 1 - 1
cfc-web/.env.development

@@ -1,2 +1,2 @@
-VUE_APP_BASE_API=http://192.168.16.18:9082
+VUE_APP_BASE_API=
 VUE_APP_SKIP_CAPTCHA=true

+ 1 - 0
cfc-web/src/views/Dashboard.vue

@@ -319,6 +319,7 @@
     >
       <div v-loading="changelogLoading" class="changelog-body" v-html="changelogContent"></div>
     </el-dialog>
+    </div>
   </div>
 </template>
 

+ 1 - 0
cfc-web/src/views/GuideFamilyTask.vue

@@ -91,6 +91,7 @@
       </el-table></div>
 
       <!-- 任务列表 -->
+      <div style="overflow:auto;max-height:calc(100vh - 300px);">
       <el-table v-if="searchForm.childId" :data="tasks" border v-loading="taskLoading">
         <template slot="empty">
           <div class="empty-table-state">

+ 1 - 1
cfc-web/src/views/Rewards.vue

@@ -53,7 +53,7 @@
           <!-- 家庭选择对话框 -->
           <el-dialog title="选择家庭" :visible.sync="familyDialogVisible" width="600px">
             <div style="overflow:auto;max-height:calc(100vh - 300px);">
-<el-table style="max-height:calc(100vh - 300px);" :data="familyList" border v-loading="familyLoading" @row-click="selectFamily" style="cursor: pointer">
+<el-table style="max-height:calc(100vh - 300px);cursor: pointer" :data="familyList" border v-loading="familyLoading" @row-click="selectFamily">
               <el-table-column prop="id" label="ID" width="80"></el-table-column>
               <el-table-column prop="name" label="家庭名称" min-width="150"></el-table-column>
               <el-table-column prop="inviteCode" label="邀请码" width="120"></el-table-column>

+ 3 - 3
cfc-web/src/views/TaskTemplates.vue

@@ -54,15 +54,15 @@
       </el-form>
 
       <!-- 模板列表 -->
+      <div style="overflow:auto;max-height:calc(100vh - 300px);">
       <el-table
         :data="tableData"
         border
         v-loading="loading"
-        style="width: 100%"
+        style="width: 100%;max-height:calc(100vh - 300px);"
       >
         <el-table-column prop="id" label="ID" width="80"></el-table-column>
-        <div style="overflow:auto;max-height:calc(100vh - 300px);">
-<el-table style="max-height:calc(100vh - 300px);"-column prop="title" label="模板名称" min-width="200"></el-table-column>
+        <el-table-column prop="title" label="模板名称" min-width="200"></el-table-column>
         <el-table-column prop="category" label="分类" width="100">
           <template slot-scope="scope">
             <el-tag :type="getCategoryType(scope.row.category)" size="small">

+ 1 - 2
cfc-web/src/views/Users.vue

@@ -51,11 +51,10 @@
 
       <!-- 用户列表 -->
       <div style="overflow:auto;max-height:calc(100vh - 300px);">
-<el-table style="max-height:calc(100vh - 300px);" 
+<el-table style="max-height:calc(100vh - 300px);width: 100%" 
         :data="tableData" 
         border 
         v-loading="loading"
-        style="width: 100%"
       >
         <el-table-column prop="id" label="ID" width="80"></el-table-column>
         <el-table-column prop="nickname" label="昵称" width="150"></el-table-column>

+ 1 - 1
cfc-web/src/views/Wishes.vue

@@ -49,7 +49,7 @@
           <div v-if="draftWishes.length > 0" class="wish-section">
             <div class="section-title">📝 待定价</div>
             <div style="overflow:auto;max-height:calc(100vh - 300px);">
-<el-table style="max-height:calc(100vh - 300px);" :data="draftWishes" border v-loading="loading" style="width: 100%">
+<el-table style="max-height:calc(100vh - 300px);width: 100%" :data="draftWishes" border v-loading="loading">
               <el-table-column prop="id" label="ID" width="80"></el-table-column>
               <el-table-column prop="childName" label="孩子" width="100"></el-table-column>
               <el-table-column prop="title" label="心愿名称" min-width="200"></el-table-column>

+ 1 - 1
cfc-web/src/views/admin/ArticleManage.vue

@@ -201,9 +201,9 @@
               </el-dropdown>
             </template>
           </template>
+        </el-table-column>
         </el-table>
         </div>
-      </div>
 
       <div class="pagination-wrap">
         <el-pagination

+ 1 - 0
cfc-web/src/views/admin/EmotionAlertManage.vue

@@ -8,6 +8,7 @@
         <el-radio-button label="false">未处理</el-radio-button>
         <el-radio-button label="true">已处理</el-radio-button>
       </el-radio-group>
+    </div>
     <div style="overflow:auto;max-height:calc(100vh - 300px);">
     <el-table style="max-height:calc(100vh - 300px);" :data="list" v-loading="loading" border stripe>
       <el-table-column prop="id" label="ID" width="70" />

+ 1 - 0
cfc-web/src/views/admin/EnergyRuleManagement.vue

@@ -10,6 +10,7 @@
         </el-select>
         <el-button type="primary" icon="el-icon-plus" @click="showDialog(null)">新增规则</el-button>
       </div>
+    </div>
     <div style="overflow:auto;max-height:calc(100vh - 300px);">
     <el-table style="max-height:calc(100vh - 300px);" :data="list" v-loading="loading" border stripe>
       <el-table-column prop="id" label="ID" width="60" />

+ 1 - 0
cfc-web/src/views/admin/GrowthTaskManagement.vue

@@ -19,6 +19,7 @@
           </el-select>
           <el-button type="primary" size="mini" @click="openCreate">创建任务</el-button>
         </div>
+      </div>
       <div style="overflow:auto;max-height:calc(100vh - 300px);">
       <el-table style="max-height:calc(100vh - 300px);" :data="tasks" v-loading="loading" border stripe>
         <el-table-column prop="id" label="ID" width="80" />

+ 1 - 0
cfc-web/src/views/admin/KnowledgeTag.vue

@@ -7,6 +7,7 @@
           <el-input v-model="keyword" placeholder="搜索标签名称..." prefix-icon="el-icon-search" size="small" clearable style="width: 200px;" />
           <el-button type="primary" size="small" @click="handleCreate">+ 新增标签</el-button>
         </div>
+      </div>
       <div style="overflow:auto;max-height:calc(100vh - 300px);">
       <el-table style="max-height:calc(100vh - 300px);" :data="filteredTags" v-loading="loading" border stripe>
         <el-table-column prop="id" label="ID" width="70" />

+ 1 - 0
cfc-web/src/views/admin/MembershipCenter.vue

@@ -32,6 +32,7 @@
     <el-card style="margin-bottom:20px;">
       <div slot="header">
         <span>会员等级配置</span>
+      </div>
       <div style="overflow:auto;max-height:calc(100vh - 300px);">
       <el-table style="max-height:calc(100vh - 300px);" :data="levels" v-loading="levelsLoading" border stripe>
         <el-table-column prop="levelCode" label="等级编码" width="120">

+ 1 - 0
cfc-web/src/views/admin/ProductProfitRate.vue

@@ -12,6 +12,7 @@
         </el-select>
         <el-button type="primary" @click="loadList">查询</el-button>
       </div>
+    </div>
     <div style="overflow:auto;max-height:calc(100vh - 300px);">
     <el-table style="max-height:calc(100vh - 300px);" :data="list" v-loading="loading" border stripe>
       <el-table-column prop="id" label="ID" width="70" />

+ 1 - 0
cfc-web/src/views/admin/VirtualTeamDetail.vue

@@ -19,6 +19,7 @@
     <el-card style="margin-top: 16px">
       <div slot="header">
         <span>成员列表</span>
+      </div>
       <div style="overflow:auto;max-height:calc(100vh - 300px);">
       <el-table style="max-height:calc(100vh - 300px);" :data="members" stripe v-loading="membersLoading">
         <el-table-column prop="id" label="关系ID" width="80"></el-table-column>

+ 0 - 1
cfc-web/src/views/admin/data-source-config.vue

@@ -51,7 +51,6 @@
         class="pagination-wrap"
         :total="total"
         style="margin-top:16px;text-align:right"
-        :total="total"
         :page.sync="page"
         :limit.sync="size"
         @current-change="fetchRecords"

+ 1 - 0
cfc-web/src/views/nutritionist/NutritionMappings.vue

@@ -4,6 +4,7 @@
       <div slot="header">
         <span>营养素映射管理</span>
         <el-button type="primary" size="mini" style="float:right" @click="openCreateDialog">新增映射</el-button>
+      </div>
       <div style="overflow:auto;max-height:calc(100vh - 300px);">
       <el-table style="max-height:calc(100vh - 300px);" :data="mappings" v-loading="loading" border stripe>
         <el-table-column prop="id" label="ID" width="60" />

+ 1 - 0
cfc-web/src/views/teacher/TeacherTeam.vue

@@ -145,6 +145,7 @@
           </template>
         </el-table-column>
       </el-table>
+    </div>
     </el-card>
 
     <!-- 成员详情抽屉 -->

+ 1 - 1
cfc-web/vue.config.js

@@ -14,7 +14,7 @@ module.exports = {
     port: 8082,
     proxy: {
       '/api': {
-        target: 'http://192.168.16.18:8080',
+        target: 'http://127.0.0.1:9082',
         changeOrigin: true
       }
     }