From 553444f6e83650be22a69b92b9d0cd4e11fc56db Mon Sep 17 00:00:00 2001
From: hh <292475944@qq.com>
Date: Mon, 30 Nov 2020 14:38:15 +0800
Subject: [PATCH] =?UTF-8?q?topic=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{management.js => topicProject.js}        |  10 +-
 src/views/system/area/index.vue               |   2 +-
 .../{infoManagement => topicList}/index.vue   | 126 +++++++++++++-----
 vue.config.js                                 |   4 +-
 4 files changed, 99 insertions(+), 43 deletions(-)
 rename src/api/topicInfo/{management.js => topicProject.js} (79%)
 rename src/views/topic/{infoManagement => topicList}/index.vue (72%)

diff --git a/src/api/topicInfo/management.js b/src/api/topicInfo/topicProject.js
similarity index 79%
rename from src/api/topicInfo/management.js
rename to src/api/topicInfo/topicProject.js
index 70aec47..888bdcd 100644
--- a/src/api/topicInfo/management.js
+++ b/src/api/topicInfo/topicProject.js
@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 // 查询列表
-export function ProList(params) {
+export function topicProjectList(params) {
     return request({
         url: '/system/topic/project/list',
         method: 'get',
@@ -10,7 +10,7 @@ export function ProList(params) {
 }
 
 // 查询详细
-export function ProInfo(id) {
+export function topicProInfo(id) {
     return request({
       url: '/system/topic/project/' + id,
       method: 'get'
@@ -36,15 +36,15 @@ export function saves(data) {
 }
 
 // 删除
-export function ProDel(ids) {
+export function topicProDel(ids) {
     return request({
-        url: '/system/topic/project' + ids,
+        url: '/system/topic/project/' + ids,
         method: 'delete'
     })
 }
 
 // 下拉
-export function ProSelect(topicId) {
+export function topicProSelect(topicId) {
     return request({
         url: '/system/topic/project/select',
         method: 'get',
diff --git a/src/views/system/area/index.vue b/src/views/system/area/index.vue
index 96b8ede..5261a7d 100644
--- a/src/views/system/area/index.vue
+++ b/src/views/system/area/index.vue
@@ -29,7 +29,7 @@
         <el-col :span="8">
           <span v-if="!areaData.length">该大区下暂无省份</span>
           <el-row>
-            <el-tag class="mb5 mr5" v-for="tag in areaData" :key="tag.code" closable :type="tag.code" @close="handleDelAreaProvince(tag)">
+            <el-tag class="mb5 mr5" v-for="tag in areaData" :key="tag.code" closable @close="handleDelAreaProvince(tag)">
               {{tag.cityName}}
             </el-tag>
           </el-row>
diff --git a/src/views/topic/infoManagement/index.vue b/src/views/topic/topicList/index.vue
similarity index 72%
rename from src/views/topic/infoManagement/index.vue
rename to src/views/topic/topicList/index.vue
index fbec541..fc509fd 100644
--- a/src/views/topic/infoManagement/index.vue
+++ b/src/views/topic/topicList/index.vue
@@ -36,8 +36,7 @@
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300px">
             <template slot-scope="scope">
-              <!-- <el-button size="mini" type="text" icon="el-icon-view" @click="handleview(scope.row)">查看</el-button> -->
-              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEditPro(scope.row)">编辑项目</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="handleView(scope.row)">编辑项目</el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
               <el-button class="text-danger" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
             </template>
@@ -66,24 +65,50 @@
       </div>
     </el-dialog>
     <!-- 关联项目参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="projectListOpen" width="800px" append-to-body>
-      <el-checkbox-group v-model="projectIds">
+    <el-dialog title="项目管理列表" :visible.sync="projectListOpen" width="800px" append-to-body>
+      <el-row>
+        <el-col :span="8">
+          <span v-if="!projectIds.length">暂无项目</span>
+          <el-tag class="mb5 mr5" v-for="tag in projectIds" :key="tag.projectId" closable @close="handleTopicProDel(tag)">
+            {{tag.projectName}}
+          </el-tag>
+        </el-col>
+        <el-col :span="16">
+          <el-table :data="projectList"
+            :row-class-name="({row}) => { if(projectIds.find(v => v.projectId == row.projectId)) return 'topicListDisabled' }"
+            style="width: 100%" @selection-change="handleSelectionChange">
+            <el-table-column prop="projectId" align="center" label="项目ID">
+            </el-table-column>
+            <el-table-column prop="projectName" align="center" label="项目名称">
+            </el-table-column>
+            <el-table-column align="center" label="操作">
+              <template slot-scope="scope">
+                <el-button size="mini" type="text" icon="el-icon-plus" @click="handleTopicProjectSave(scope.row)">添加</el-button>
+              </template>
+            </el-table-column>
+
+          </el-table>
+          <pagination v-show="proTotal > 0" :total="proTotal" :page.sync="proQueryParams.pageNum" :limit.sync="proQueryParams.pageSize"
+            @pagination="getProjectList" />
+        </el-col>
+      </el-row>
+      <!-- <el-checkbox-group v-model="projectIds">
         <el-row>
           <el-col style="margin-bottom: 15px" :span="12" v-for="data in projectList" :key="data.projectId">
             <el-checkbox size="medium" :label="data.projectId">{{data.projectName}}</el-checkbox>
           </el-col>
         </el-row>
-      </el-checkbox-group>
+      </el-checkbox-group> -->
       <!-- <el-table :data="projectList" @selection-change="handleProjectSelectionChange">
         <el-table-column type="selection" width="55" align="center">
         </el-table-column>
         <el-table-column prop="projectName" align="center" label="项目名称">
         </el-table-column>
       </el-table> -->
-      <div slot="footer" class="dialog-footer">
+      <!-- <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitPro">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
-      </div>
+      </div> -->
     </el-dialog>
     <!-- 查看项目列表弹框 -->
     <!-- <el-dialog title="项目管理列表" :visible.sync="projectManagementOpen">
@@ -106,10 +131,10 @@
 
 <script>
 import { list, info, add, del, select } from "@/api/topicInfo/info";
-import { ProList, ProInfo, save, saves, ProDel, ProSelect } from "@/api/topicInfo/management";
-import { select as proSelect } from "@/api/hardware/project";
+import { save, saves, topicProDel, topicProSelect } from "@/api/topicInfo/topicProject";
+import { list as proList } from "@/api/hardware/project";
 export default {
-  name: "InfoList",
+  name: "TopicList",
   data () {
     return {
       // 选中数组
@@ -124,6 +149,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      proTotal: 0,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -137,6 +163,10 @@ export default {
         pageNum: 1,
         pageSize: 10
       },
+      proQueryParams: {
+        pageNum: 1,
+        pageSize: 5
+      },
       snapRow: {},
       select: {},
       row: {},
@@ -155,6 +185,12 @@ export default {
     this.getList()
   },
   methods: {
+    rowClassRow ({ row, rowIndex }) {
+      if (this.projectIds.find(v => v.projectId == row.projectId)) {
+        return 'topicListDisabled';
+      }
+      return '';
+    },
     // 获取Topic列表
     getList () {
       list(this.queryParams).then((res) => {
@@ -164,15 +200,14 @@ export default {
     },
     // 获取项目列表
     getProjectList () {
-      this.projectList = [];
-      proSelect().then((response) => {
-        this.projectList = response.select;
-      });
-    },
-    // 获取列表
-    getManagementList () {
-      ProList(this.queryParams).then((res) => {
-        this.proData = res.rows;
+      proList(this.proQueryParams).then(({ code, msg, rows, total }) => {
+        if (200 == code) {
+          this.projectList = rows;
+          this.proTotal = total;
+          this.$forceUpdate()
+        } else {
+          this.msgError(msg);
+        }
       });
     },
     /** 搜索按钮操作 */
@@ -206,33 +241,47 @@ export default {
         this.getList()
       })
     },
-    // handleview (row) {
-    //   this.row = row;
-    //   ProSelect(row.topicId).then(response => {
-    //     this.snspPro = response.select.map(v => v.topicId);
-    //     this.projectManagementOpen = true;
-    //   });
-    // },
-    handleEditPro (row) {
-      ProSelect(row.topicId).then(response => {
-        this.projectIds = response.select.map(v => v.projectId);
+    handleView (row) {
+      this.row = row;
+      this.topicProSelect(row);
+    },
+    topicProSelect (row) {
+      topicProSelect(row.topicId).then(response => {
+        this.projectIds = response.select;
       });
       this.snapRow = Object.assign({}, row);
       this.projectListOpen = true;
     },
-    submitPro () {
-      console.log(this.snapRow.topicId)
-      console.log(this.projectIds)
-      saves({ topicId: this.snapRow.topicId, projectIds: this.projectIds }).then(res => {
+    handleTopicProjectSave (row) {
+      const loading = this.$loading({
+        lock: true,
+        text: '添加中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.3)'
+      });
+      save({ topicId: this.snapRow.topicId, projectId: row.projectId }).then(res => {
         if (200 == res.code) {
-          this.msgSuccess(res.msg);
-          this.projectListOpen = false;
-          this.getProjectList()
+          this.topicProSelect(this.row);
+          this.getProjectList();
         } else {
           this.msgError(res.msg);
         }
+        loading.close();
       });
     },
+    handleTopicProDel ({ id }) {
+      const loading = this.$loading({
+        lock: true,
+        text: '添加中',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.3)'
+      });
+      topicProDel(id).then(res => {
+        this.topicProSelect(this.row);
+        this.getProjectList();
+        loading.close();
+      })
+    },
     /** 删除按钮操作 */
     handleDelete (row) {
       const ids = row.id || this.ids;
@@ -287,4 +336,9 @@ export default {
 </script>
 
 <style>
+.topicListDisabled {
+  pointer-events: none;
+  cursor: default;
+  opacity: 0.6;
+}
 </style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 09db99d..1c0f650 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,7 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://47.115.73.110:8080`,
+        // target: `http://47.115.73.110:8080`,
+        // target: `http://121.37.250.170:8080`,
         target: `http://192.168.0.129:8080`,
         changeOrigin: true,
         pathRewrite: {
@@ -48,6 +49,7 @@ module.exports = {
     name: name,
     resolve: {
       alias: {
+        'vue$': 'vue/dist/vue.esm.js',
         '@': resolve('src')
       }
     }