前端

ruoyi-ui/src/views/invest/channel/index.vue

@@ -137,29 +137,30 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column
-        label="渠道名称"
-        width="150"
+        label="渠道编号"
+        width="100"
         align="center"
-        prop="channelName"
+        prop="channelCode"
       >
         <template slot-scope="scope">
-          <div :title="scope.row.channelName">
-            {{ scope.row.channelName }}
+          <div :title="scope.row.channelCode">
+            {{ scope.row.channelCode }}
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        label="渠道编号"
-        width="100"
+        label="渠道名称"
+        width="150"
         align="center"
-        prop="channelCode"
+        prop="channelName"
       >
         <template slot-scope="scope">
-          <div :title="scope.row.channelCode">
-            {{ scope.row.channelCode }}
+          <div :title="scope.row.channelName">
+            {{ scope.row.channelName }}
           </div>
         </template>
       </el-table-column>
+
       <el-table-column
         label="渠道类别"
         width="450"

ruoyi-ui/src/views/invest/components/channelItem.vue

@@ -16,6 +16,7 @@
       >
         <el-table-column type="selection" width="55" align="center" />
         <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
+        <el-table-column label="渠道编号" align="center" prop="channelCode" />
         <el-table-column
           label="渠道名称"
           width="150"
@@ -28,7 +29,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="渠道编号" align="center" prop="channelCode" />
+
         <el-table-column
           label="渠道类别"
           width="450"

ruoyi-ui/src/views/invest/components/projectList.vue

@@ -230,6 +230,7 @@
     </el-row>
 
     <el-table
+      class="tableWrapper"
       v-loading="loading"
       border
       :data="poolList"
@@ -242,19 +243,38 @@
         align="center"
         prop="projectName"
         width="300"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.projectName">
+            {{ scope.row.projectName }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="投资负责人"
         align="center"
         prop="investHead"
         width="100px"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.investHead">
+            {{ scope.row.investHead }}
+          </div>
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="项目编号" align="center" prop="projectCode" /> -->
       <el-table-column
         label="渠道"
         align="center"
+        width="150"
         prop="tProjectChannel.channelName"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectChannel.channelName">
+            {{ scope.row.tProjectChannel.channelName }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="所属组别"
         align="center"
@@ -268,7 +288,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="项目阶段" align="center" prop="projectStage">
+      <el-table-column label="项目阶段" width="120" align="center" prop="projectStage">
         <template slot-scope="scope">
           <dict-tag
             :options="dict.type.project_stage"
@@ -280,7 +300,7 @@
         label="项目状态"
         align="center"
         prop="projectState"
-        width="120"
+        width="150"
       >
         <template slot-scope="scope">
           <dict-tag
@@ -334,16 +354,28 @@
 
       <el-table-column
         label="项目所属公司"
-        width="300"
+        width="250"
         align="center"
         prop="tProjectCompany.companyName"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectCompany.companyName">
+            {{ scope.row.tProjectCompany.companyName }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column
         label="项目联系人"
         width="120"
         align="center"
         prop="tProjectContacts.name"
-      />
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectContacts.name">
+            {{ scope.row.tProjectContacts.name }}
+          </div>
+        </template>
+      </el-table-column>
 
       <!-- <el-table-column
         label="历次融资"
@@ -423,7 +455,7 @@
         width="160"
       /> -->
       <el-table-column
-        :width="stage == '0'||stage == '2' ? 300:400"
+        :width="stage == '0' || stage == '2' ? 300 : 400"
         fixed="right"
         label="操作"
         align="center"

ruoyi-ui/vue.config.js

@@ -35,8 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
-        target: `http://192.168.100.234:8091`,
-        // target: `http://47.103.79.143:8091`,
+        // target: `http://192.168.100.234:8091`,
+        target: `http://47.103.79.143:8091`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''