From e233629e0ca24390ccf4b81892511e402f5ba777 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 6 May 2022 13:58:34 +0800
Subject: [PATCH 1/3] Merge branch 'dev-0420' into dev

# Conflicts:
#	src/views/components/tinymce/index.vue
#	src/views/main-shuju/main-content.vue
---
 src/assets/scss/modules/visual/warning.scss | 8 +++++++-
 src/assets/scss/modules/warning.scss        | 4 ++--
 src/views/modules/base/resi.vue             | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/assets/scss/modules/visual/warning.scss b/src/assets/scss/modules/visual/warning.scss
index 36260a7f..265c3889 100644
--- a/src/assets/scss/modules/visual/warning.scss
+++ b/src/assets/scss/modules/visual/warning.scss
@@ -87,7 +87,7 @@
             content: "";
             width: 8px;
             height: 8px;
-            background: #f0f3f7;
+            background: #fef200;
             border-radius: 50%;
             position: absolute;
             left: 12px;
@@ -95,6 +95,12 @@
             transform: translate(0, -50%);
           }
 
+          &:nth-of-type(2) {
+            &::after {
+              background: #e70014;
+            }
+          }
+
           div:nth-child(1) {
             font-size: 16px;
             font-family: PingFang SC;
diff --git a/src/assets/scss/modules/warning.scss b/src/assets/scss/modules/warning.scss
index 2353a943..f28535b9 100644
--- a/src/assets/scss/modules/warning.scss
+++ b/src/assets/scss/modules/warning.scss
@@ -85,7 +85,7 @@
                         content: "";
                         width: 8px;
                         height: 8px;
-                        background: #f5f502;
+                        background: #fef200;
                         border-radius: 50%;
                         position: absolute;
                         left: 12px;
@@ -95,7 +95,7 @@
 
                     &:nth-of-type(2) {
                         &::after {
-                            background: #fb500d;
+                            background: #e70014;
                         }
                     }
 
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index a7375532..19e71ca5 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -410,7 +410,7 @@ export default {
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     tableHeight() {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeight
       const _h = this.clientHeight - 280 - this.searchH
       return this.$store.state.inIframe ? h : _h
     }

From 69eac59761cd973fe002573d7c446907bda03345 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 6 May 2022 15:38:40 +0800
Subject: [PATCH 2/3] 111

---
 .../modules/base/community/buildTable.vue     | 47 ++++++++++---------
 .../modules/base/community/roomTable.vue      | 28 +++++------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 99a435b3..0f201362 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -69,6 +69,26 @@
                          :selectable="checkSelect"
                          width="55">
         </el-table-column>
+        <el-table-column prop="sort"
+                         sortable="custom"
+                         min-width="140"
+                         label="序号">
+          <template slot-scope="scope">
+            <div @click="handleEditSort(scope.row)">
+              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
+              <el-input-number v-else
+                               @change="handleChangeSort(scope.row)"
+                               v-model="scope.row.sort"
+                               class="item_width_4"
+                               :precision="2"
+                               size="small"
+                               :min="0"
+                               :max="9999"
+                               label="描述文字"></el-input-number>
+            </div>
+
+          </template>
+        </el-table-column>
         <el-table-column prop="buildingName"
                          label="楼栋名称"
                          min-width="180">
@@ -107,25 +127,6 @@
         <el-table-column prop="totalHouseNum"
                          label="总户数">
         </el-table-column>
-        <el-table-column prop="sort"
-                         sortable="custom"
-                         min-width="140"
-                         label="序号">
-          <template slot-scope="scope">
-            <div @click="handleEditSort(scope.row)">
-              <span v-if="!scope.row.isChange">{{scope.row.sort}}</span>
-              <el-input-number v-else
-                               @change="handleChangeSort(scope.row)"
-                               v-model="scope.row.sort"
-                               class="item_width_4"
-                               :precision="2"
-                               :min="1"
-                               :max="9999"
-                               label="描述文字"></el-input-number>
-            </div>
-
-          </template>
-        </el-table-column>
 
         <el-table-column label="操作"
                          fixed="right"
@@ -265,10 +266,10 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
+        // this.$message({
+        //   type: 'success',
+        //   message: '操作成功'
+        // })
 
 
       } else {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index bb1b835e..dabbe267 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -64,8 +64,8 @@
                                v-model="scope.row.sort"
                                class="item_width_4"
                                :precision="2"
-                               size="mini"
-                               :min="1"
+                               size="small"
+                               :min="0"
                                :max="9999"
                                label="描述文字"></el-input-number>
             </div>
@@ -276,10 +276,10 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
+        // this.$message({
+        //   type: 'success',
+        //   message: '修改成功'
+        // })
 
 
       } else {
@@ -727,12 +727,12 @@ export default {
   width: 120px;
 }
 
-// /deep/.el-input-number--medium .el-input-number__decrease,
-// /deep/.el-input-number--medium .el-input-number__increase {
-//   width: 26px;
-// }
-// /deep/.el-input-number--medium .el-input__inner {
-//   padding-left: 0px;
-//   padding-right: 0px;
-// }
+/deep/.el-input-number--medium .el-input-number__decrease,
+/deep/.el-input-number--medium .el-input-number__increase {
+  width: 26px;
+}
+/deep/.el-input-number--medium .el-input__inner {
+  padding-left: 0px;
+  padding-right: 0px;
+}
 </style>

From 97fb238b39dc2997422b9718ab582a0aa5ea5063 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 6 May 2022 16:06:28 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B2=A1=E5=95=A5=E8=A6=81=E8=AF=B4?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/warning/components/screen-table/people-list.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/visual/warning/components/screen-table/people-list.vue b/src/views/modules/visual/warning/components/screen-table/people-list.vue
index 8efffffa..0cc25b6b 100644
--- a/src/views/modules/visual/warning/components/screen-table/people-list.vue
+++ b/src/views/modules/visual/warning/components/screen-table/people-list.vue
@@ -17,7 +17,7 @@
                 :loading="loading"
                 :header="header"
                 :list="list"
-                @operate="toUserInfo"
+                @operate="handlePeopleItem"
               ></cpt-tb>
             </div>
 
@@ -50,7 +50,7 @@
 <script>
 import cptCard from "@/views/modules/visual/cpts/card";
 import { requestPost } from "@/js/dai/request";
-import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
 import cptTb from "@/views/modules/visual/cpts/tb";
 import { mapGetters } from "vuex";
 
@@ -152,8 +152,9 @@ export default {
       this.getList();
     },
 
-    handlePeopleItem(uid) {
+    handlePeopleItem(index) {
       console.log(uid);
+      let uid = this.srcList[index].userId;
       this.currentPepeleId = uid;
 
       this.showedPeopleInfo = true;