From 38f3ecc28820e63ba986c40ea9b95d5644e7c832 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 28 Apr 2022 16:25:30 +0800
Subject: [PATCH] =?UTF-8?q?saas=E7=A0=94=E5=8F=91=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=8F=8A=E7=BD=91=E6=A0=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/router/axios.js                      |  2 +
 .../apps/AppGridBlock/components/list.vue     | 94 +++++++++++--------
 vue.config.js                                 |  8 ++
 3 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/examples/router/axios.js b/examples/router/axios.js
index 76e20ca9..09e31fa7 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -11,6 +11,8 @@ instance.interceptors.request.eject(0);
 instance.interceptors.request.use(config => {
   if (config.url.startsWith("/node")) {
     config.baseURL = "/ns"
+  } else if (/\/project\/sass/.test(location.pathname)) {
+    config.baseURL = "/saas"
   } else if (/\/xiushan/.test(location.pathname)) {
     config.baseURL = "/xsjr"
     config.url = config.url.replace(/(app|auth|admin)\//, "")
diff --git a/project/sass/apps/AppGridBlock/components/list.vue b/project/sass/apps/AppGridBlock/components/list.vue
index b1b55ffb..2f02e890 100644
--- a/project/sass/apps/AppGridBlock/components/list.vue
+++ b/project/sass/apps/AppGridBlock/components/list.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-grid-block">
+  <section class="app-grid-block">
     <ai-list>
       <template slot="title">
         <ai-title title="网格区块" :isShowBottomBorder="true"></ai-title>
@@ -100,30 +100,12 @@
             ref="aitableex"
             :current.sync="page.current"
             :size.sync="page.size"
-            @selection-change="(v) => (ids = v.map((e) => e.id))"
+            @selection-change="v=>ids=v.map((e) => e.id)"
             @getList="getList()"
-            :dict="dict"
-        >
-          <el-table-column
-              slot="selectId"
-              type="selection"
-              align="center"
-              width="40"
-          >
-          </el-table-column>
-          <el-table-column
-              label="网格员"
-              slot="user"
-              align="center"
-              fixed="right"
-              width="160">
+            :dict="dict">
+          <el-table-column label="网格成员" slot="user" align="center" width="160">
             <template slot-scope="{ row }">
-              <div class="flex-box">
-                <div v-for="(item, index) in row.girdMemberNames" v-show="index < 3" :key="index">
-                  <AiOpenData type="userName" :openid="item"></AiOpenData>
-                  <span v-if="index < 2 && index < row.girdMemberNames.length - 1">、</span>
-                </div>
-              </div>
+              <el-button type="text" @click="showGridMembers(row)">{{ row.girdMemberNumber || 0 }}</el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -196,7 +178,21 @@
         >
       </div>
     </ai-dialog>
-  </div>
+    <ai-dialog :title="`${gridInfo.girdName}网格成员`" :visible.sync="dialog" customFooter @closed="gridInfo={}"
+               width="700px">
+      <ai-table :tableData="gridInfo.tableData" :colConfigs="gridMemberColConfigs" :dict="dict"
+                :isShowPagination="false" :show-header="false">
+        <el-table-column slot="tags">
+          <template slot-scope="{row}">
+            <el-tag v-if="row.tags" effect="dark">{{ row.tags || '标签' }}</el-tag>
+          </template>
+        </el-table-column>
+      </ai-table>
+      <template #footer>
+        <el-button @click="dialog=false">关闭</el-button>
+      </template>
+    </ai-dialog>
+  </section>
 </template>
 
 <script>
@@ -245,27 +241,31 @@ export default {
       isEdit: false,
       searchId: "",
       fileList: [],
-      location: {}
+      location: {},
+      dialog: false,
+      gridInfo: {},
+      gridMemberColConfigs: [
+        {prop: "wxUserId", openType: 'userName'},
+        {prop: "girdMemberType", dict: "girdMemberType"},
+        {slot: "tags"}
+      ]
     };
   },
   created() {
     this.getTreeList();
     this.getList();
     this.getCorpLocation()
-    this.dict.load("girdLevel", "girdType", "isLastLevel", "plottingStatus");
+    this.dict.load("girdLevel", "girdType", "isLastLevel", "plottingStatus", "girdMemberType");
   },
   computed: {
     colConfigs() {
-      let _ = this;
       return [
         {type: 'selection'},
         {prop: "girdName", align: "left", label: "网格名称",},
-        {prop: "girdCode", align: "center", label: "网格编码",},
-        {prop: "girdType", align: "center", label: "网格类型", dict: "girdType"},
-        {prop: "girdLevel", align: "center", label: "网格层级", dict: "girdLevel"},
+        {slot: 'user'},
         {prop: "plottingStatus", align: "center", label: "标绘状态", dict: "plottingStatus"},
         {prop: "createTime", align: "center", label: "创建时间", dateFormat: "YYYY-MM-DD"},
-        {prop: "girdMemberNames", align: "center", slot: 'user', width: 200, label: "网格员"},
+        {slot: "options"}
       ];
     },
   },
@@ -283,12 +283,9 @@ export default {
       this.getList();
     },
     getTreeList() {
-      this.instance
-      .post("/app/appgirdinfo/listByTop", null, null)
-      .then((res) => {
-        if (res.code == 0) {
-          this.treeObj.treeList = [...res.data];
-
+      this.instance.post("/app/appgirdinfo/listAllByTop").then(res => {
+        if (res?.data) {
+          this.treeObj.treeList = [res.data];
           this.$nextTick(() => {
             if (this.treeObj.treeList.length && !this.info.girdLevel) {
               this.$refs.tree.setCurrentKey(this.treeObj.treeList[0].id)
@@ -347,15 +344,13 @@ export default {
       });
     },
     getList() {
-      this.instance
-      .post("/app/appgirdinfo/list", null, {
+      this.instance.post("/app/appgirdinfo/list", null, {
         params: {
           ...this.searchObj,
           ...this.page,
           parentGirdId: this.info.girdLevel === '0' ? '' : this.searchId,
         },
-      })
-      .then((res) => {
+      }).then((res) => {
         if (res?.data) {
           this.tableData = res.data.records.map(v => {
             return {
@@ -556,6 +551,19 @@ export default {
       });
       this.getList();
     },
+    showGridMembers(row) {
+      if (row.girdMemberNumber > 0) {
+        this.gridInfo = this.$copy(row)
+        this.instance.post("/app/appgirdmemberinfo/listByGirdIdByThree", null, {
+          params: {girdId: row.id}
+        }).then(res => {
+          if (res?.data) {
+            this.gridInfo.tableData = res.data
+            this.dialog = true
+          }
+        })
+      } else this.$message.warning("当前网格无成员")
+    }
   },
 };
 </script>
@@ -660,6 +668,10 @@ export default {
     }
   }
 
+  ::v-deep.ai-list__content--right {
+    overflow: visible !important;
+  }
+
   ::v-deep .treePanel {
     display: flex;
     flex-direction: column;
diff --git a/vue.config.js b/vue.config.js
index f365a93e..65df9360 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -71,6 +71,14 @@ module.exports = {
           '^/lan': '/'
         }
       },
+      '/saas': {
+        target: 'http://192.168.1.34:19898',
+        changeOrigin: true,
+        pathRewrite: {
+          //地址重写
+          '^/saas': '/'
+        }
+      },
       '/omsapi': {
         target: 'http://192.168.1.87:19898',
         changeOrigin: true,