Merge branch 'dev-220411' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-220411

src/assets/scss/common.scss

@@ -813,3 +813,11 @@ img {
   background-color: #fe6252;
   border-color: #fe6252;
 }
+
+// 修改表格不换行的问题
+div.el-table div.cell {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-wrap: normal;
+}

src/assets/scss/modules/visual/people.scss

@@ -184,7 +184,7 @@
   .wrap {
     position: relative;
     margin: 120px auto;
-    width: 1000px;
+    width: 1180px;
 
     .title {
       padding: 10px;
@@ -265,18 +265,18 @@
       .tab {
         margin: 0 5px;
         min-width: 76px;
-        padding: 0 5px;
+        padding: 0 10px;
-        height: 30px;
+        height: 36px;
         background: rgba(255, 255, 255, 0);
         border: 1px solid #1257c9;
         box-shadow: 0 0 10px 0 inset #1257c9;
         border-radius: 2px;
         text-align: center;
-        font-size: 14px;
+        font-size: 18px;
         font-family: PingFang SC;
         font-weight: 400;
         color: #ffffff;
-        line-height: 30px;
+        line-height: 36px;
         cursor: pointer;
         transition: all ease 0.5s;
         &.z-on {

src/assets/scss/people-info.scss

@@ -10,14 +10,14 @@
         position: relative;
         margin: 5vh auto;
         height: 90vh;
-        width: 1040px;
+        width: 1180px;
         background-color: #fff;
 
         .wrap2 {
             box-sizing: border-box;
             padding: 20px;
             height: 90vh;
-            width: 1040px;
+            width: 1180px;
             overflow-y: auto;
             overflow-x: hidden;
         }
@@ -102,18 +102,18 @@
             .tab {
                 margin: 0 5px;
                 min-width: 76px;
-                padding: 0 5px;
+                padding: 0 10px;
-                height: 30px;
+                height: 36px;
                 background: #fff;
                 border: 1px solid #eee;
                 box-shadow: 0 0 10px 0 inset #ddd;
                 border-radius: 2px;
                 text-align: center;
-                font-size: 14px;
+                font-size: 18px;
                 font-family: PingFang SC;
                 font-weight: 400;
                 color: #333;
-                line-height: 30px;
+                line-height: 36px;
                 cursor: pointer;
                 transition: all ease 0.1s;
                 &.z-on {

src/views/modules/communityService/sqzzz/cpts/edit.vue

@@ -134,6 +134,23 @@
           </el-input>
         </el-form-item>
 
+        <el-form-item
+          label="备注"
+          prop="remark"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="3"
+            placeholder="请输入备注，不超过1000字"
+            v-model="dataForm.remark"
+          ></el-input>
+        </el-form-item>
+
         <el-form-item
           label="创建时间"
           prop="organizationCreatedTime"
@@ -234,6 +251,7 @@ export default {
         principalPhone: "",
         organizationCreatedTime: "",
         address: "",
+        remark: "",
         longitude: "",
         latitude: "",
         organizationPersonnel: [],
@@ -444,6 +462,7 @@ export default {
         principalPhone: "",
         organizationCreatedTime: "",
         address: "",
+        remark: "",
         longitude: "",
         latitude: "",
         organizationPersonnel: [],

src/views/modules/communityService/sqzzz/index.vue

@@ -28,6 +28,16 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            v-model="fmData.remark"
+            class="resi-cell-input"
+            size="small"
+            clearable
+            placeholder="请输入"
+          >
+          </el-input>
+        </el-form-item>
         <el-form-item>
           <el-button
             class="diy-button--search"
@@ -119,6 +129,8 @@
         </el-table-column>
         <el-table-column prop="principalPhone" align="center" label="联系电话">
         </el-table-column>
+        <el-table-column prop="remark" align="center" label="备注">
+        </el-table-column>
         <el-table-column
           prop="organizationCreatedTime"
           align="center"
@@ -241,6 +253,7 @@ export default {
 
       fmData: {
         organizationName: "",
+        remark: "",
         startTime: "",
         endTime: "",
         createTime: ["", ""],
@@ -260,7 +273,7 @@ export default {
         ? this.clientHeight - 360 + this.iframeHeigh
         : this.clientHeight - 360;
     },
-    ...mapGetters(['clientHeight', 'iframeHeight']),
+    ...mapGetters(["clientHeight", "iframeHeight"]),
   },
   watch: {
     "fmData.createTime": function (val) {

src/views/modules/shequ/cpts/bar-chart.vue

@@ -18,6 +18,7 @@ let srcData = [];
 const iniChart = function (config, srcData, total, that) {
   chart = new F2.Chart({
     id: "myChart",
+    pixelRatio: window.devicePixelRatio,
     ...config,
   });
 
@@ -91,7 +92,7 @@ const iniChart = function (config, srcData, total, that) {
       attrs: {
         x: point.x,
         y: point.y + offset,
-        text: obj.count + '人',
+        text: obj.count + "人",
         textAlign: "center",
         textBaseline: "bottom",
         fill: "#808080",

src/views/modules/shequ/index.vue

@@ -319,7 +319,8 @@
                                    label="所属网格">
                   </el-table-column>
                   <el-table-column prop="name"
-                                   label="姓名"> </el-table-column>
+                                   label="姓名"
+                                   width="80"> </el-table-column>
                   <el-table-column prop="family"
                                    label="所属家庭">
                   </el-table-column>
@@ -328,7 +329,8 @@
                   </el-table-column>
                   <el-table-column fixed="right"
                                    label="操作"
-                                   align="center">
+                                   align="center"
+                                   width="60">
                     <template slot-scope="scope">
                       <el-button @click="handleWatchWarning(scope.$index)"
                                  type="text"

src/views/modules/visual/cpts/tb.vue

@@ -18,9 +18,9 @@
       <tbody class="table-body">
         <tr class="table-body-tr" v-for="(value, index) in list" :key="index">
           <td class="td" v-for="(item, indexs) in value" :key="indexs">
-            <span v-if="typeof item === 'string' || typeof item === 'number'">{{
+            <div v-if="typeof item === 'string' || typeof item === 'number'">
-              item
+              {{ item }}
-            }}</span>
+            </div>
             <div v-if="typeof item === 'object' && item.type == 'index'">
               <img
                 v-if="highlightTop3 && index == 0"
@@ -46,6 +46,11 @@
               @click="handleClickBtn(index, btn)"
               >{{ btn }}</a
             >
+            <a
+              v-else-if="typeof item === 'object' && item.type == 'people'"
+              @click="handleClickPeople(item)"
+              >{{ item.name }}</a
+            >
           </td>
         </tr>
       </tbody>
@@ -139,6 +144,11 @@ export default {
     handleClickBtn(index, type) {
       this.$emit("operate", index, type);
     },
+    handleClickPeople(item) {
+      this.$router.push({
+        path: `/main-shuju/visual-basicinfo-people/${item.uid}`,
+      });
+    },
   },
 };
 </script>
@@ -150,6 +160,7 @@ export default {
     width: 100%;
     height: 100%;
     border: none;
+    table-layout: fixed;
 
     &-header {
       width: 100%;
@@ -179,9 +190,18 @@ export default {
         min-height: 50px;
 
         .td {
+          box-sizing: border-box;
           text-align: center;
           border: none;
-          padding: 10px 0;
+          padding: 10px 5px;
+
+          > div {
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            word-wrap: normal;
+          }
+
           a {
             font-size: 16px;
             font-weight: 400;

src/views/modules/visual/heart/index.vue

@@ -266,7 +266,7 @@ export default {
         this.tb2.list = data.map((item) => {
           return [
             { type: "index" },
-            item.userName,
+            { type: "people", name: item.userName, uid: item.userId },
             item.gridName,
             item.pointTotal,
           ];
@@ -296,7 +296,7 @@ export default {
         this.tb3.list = data.map((item) => {
           return [
             { type: "index" },
-            item.userName,
+            { type: "people", name: item.userName, uid: item.userId },
             item.gridName,
             item.pointTotal,
           ];

src/views/modules/visual/warning/components/screen-table/index.vue

@@ -236,13 +236,16 @@ export default {
           width: 5%;
         }
         &:nth-child(2) {
-          width: 25%;
+          width: 20%;
         }
         &:nth-child(3) {
-          width: 25%;
+          width: 20%;
+        }
+        &:nth-child(4) {
+          width: 15%;
         }
         &:nth-child(5) {
-          width: 25%;
+          width: 40%;
         }
       }
     }
@@ -266,22 +269,28 @@ export default {
         .td {
           text-align: center;
           width: 20%;
+          display: flex;
+          justify-content: center;
           &:nth-child(1) {
             width: 5%;
           }
           &:nth-child(2) {
-            width: 25%;
+            width: 20%;
           }
           &:nth-child(3) {
-            width: 25%;
+            width: 20%;
+          }
+          &:nth-child(4) {
+            width: 15%;
           }
           &:nth-child(5) {
-            width: 25%;
+            width: 40%;
           }
           a {
             cursor: pointer;
           }
           .more {
+            margin: 0 10px;
             font-size: 18px;
             font-weight: 400;
             color: #e4dc00;
@@ -292,17 +301,19 @@ export default {
               box-sizing: border-box;
               display: block;
               box-sizing: border-box;
-              width: 215px;
+              width: 600px;
+              max-height: 300px;
               height: auto;
+              overflow-y: auto;
               line-height: 20px;
               border: 1px solid red;
               position: absolute;
-              right: -100%;
+              right: 0;
-              top: 150%;
+              bottom: 150%;
               background: #06186d;
               border: 1px solid #1a64cc;
               border-radius: 5px;
-              font-size: 9px;
+              font-size: 18px;
               font-weight: 400;
               color: #ffffff;
               padding: 16px 8px 10px 9px;

src/views/modules/warning/components/screen-table/index.vue

@@ -263,13 +263,16 @@ export default {
           width: 5%;
         }
         &:nth-child(2) {
-          width: 25%;
+          width: 20%;
         }
         &:nth-child(3) {
-          width: 25%;
+          width: 20%;
+        }
+        &:nth-child(4) {
+          width: 15%;
         }
         &:nth-child(5) {
-          width: 25%;
+          width: 40%;
         }
       }
     }
@@ -296,25 +299,28 @@ export default {
           height: 50px;
           display: flex;
           align-items: center;
-          justify-content: space-around;
+          justify-content: center;
 
           &:nth-child(1) {
             width: 5%;
-            border-left: 0;
           }
           &:nth-child(2) {
-            width: 25%;
+            width: 20%;
           }
           &:nth-child(3) {
-            width: 25%;
+            width: 20%;
+          }
+          &:nth-child(4) {
+            width: 15%;
           }
           &:nth-child(5) {
-            width: 25%;
+            width: 40%;
           }
           a {
             cursor: pointer;
           }
           .more {
+            margin: 0 10px;
             font-size: 16px;
             font-weight: 400;
             color: #e4dc00;
@@ -325,37 +331,25 @@ export default {
               box-sizing: border-box;
               display: block;
               box-sizing: border-box;
-              width: 500px;
+              width: 600px;
+              max-height: 300px;
               height: auto;
+              overflow-y: auto;
               line-height: 20px;
               border: 1px solid red;
               position: absolute;
-              right: -100%;
+              right: 0;
               bottom: 150%;
               background: #fff;
               box-shadow: 0 0 10px 0 #2194fe;
               border: 1px solid #42a4fe;
               border-radius: 5px;
-              font-size: 9px;
+              font-size: 16px;
               font-weight: 400;
               color: #333;
               padding: 16px 8px 10px 9px;
               z-index: 1;
               cursor: default;
-              // &::after{
-              //   position: absolute;
-              //   left: 30%;
-              //   top: -30%;
-              //   display: flex;
-              //   content:'';
-              //   width: 0;
-              //   height: 0;
-              //   border-width: 13px;
-              //   border-style: solid;
-              //   border-color: transparent transparent rgba(26, 100, 204,0.5) transparent;
-              //   // border-color: transparent transparent red transparent;
-              //   transform: translate(-50%,0);
-              // }
             }
           }
         }