Merge branch 'fax' into preview

src/views/modules/base/community/community.vue

@@ -380,7 +380,6 @@ export default {
         this.rentFlag = '';
         this.handleSearch()
       }
-
   },
   computed: {
     rowHeight() {

src/views/modules/base/migration/records/index.vue

@@ -5,109 +5,69 @@
     <div class="m-table">
       <div class="div_btn">
         <div class="div_btn_left">
-          <el-button class="diy-button--add" size="small"
+          <el-button class="diy-button--add" size="small" type="primary" @click="handleAdd('community')">
-                     type="primary" @click="handleAdd('community')">
             迁移小区
           </el-button>
-          <el-button class="diy-button--add" size="small"
+          <el-button class="diy-button--add" size="small" type="primary" @click="handleAdd('building')">
-                     type="primary" @click="handleAdd('building')">
             迁移楼栋
           </el-button>
 
         </div>
       </div>
-      <el-table
+      <el-table ref="ref_table" v-loading="tableLoading" :data="tableData" :height="tableHeight" border
-          ref="ref_table"
+        class="m-table-item" style="width: 100%">
-          v-loading="tableLoading"
+        <el-table-column align="center" label="序号" type="index" width="50" />
-          :data="tableData"
+        <el-table-column label="迁移主体类型" prop="subjectType" width="120">
-          :height="tableHeight"
-          border
-          class="m-table-item"
-          style="width: 100%"
-      >
-        <el-table-column align="center" label="序号" type="index" width="50"/>
-        <el-table-column
-            label="迁移主体类型"
-            prop="subjectType"
-            width="120"
-        >
           <template slot-scope="{row}">
             {{
-              row.subjectType === 'building' ? '楼栋' :
+            row.subjectType === 'building' ? '楼栋' :
-                  row.subjectType === 'quarters' ? '小区' : ''
+              row.subjectType === 'quarters' ? '小区' : ''
-            }}
+          }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="迁移主体名称" prop="subjectName" width="200" />
-            label="迁移主体名称"
+        <el-table-column label="来源名称" prop="sourceName" width="200" />
-            prop="subjectName"
+        <el-table-column label="目标名称" prop="targetName" width="200" />
-            width="200"
+        <el-table-column label="状态" prop="status" width="100">
-        />
-        <el-table-column
-            label="来源名称"
-            prop="sourceName"
-            width="200"
-        />
-        <el-table-column
-            label="目标名称"
-            prop="targetName"
-            width="200"
-        />
-        <el-table-column
-            label="状态"
-            prop="status"
-            width="100"
-        >
           <template slot-scope="{row}">
-            <el-tag :type="
+            <el-tag :type="row.status === -1 ? 'danger' :
-              row.status === -1 ? 'danger' :
               row.status === 0 ? 'warning' :
-              row.status === 1 ? 'info' :
+                row.status === 1 ? 'info' :
-              row.status === 2 ? 'success' : ''
+                  row.status === 2 ? 'success' : ''
-">
+            ">
               {{
-                row.status === -1 ? '失败' :
+            row.status === -1 ? '失败' :
-                    row.status === 0 ? '未开始' :
+              row.status === 0 ? '未开始' :
-                        row.status === 1 ? '执行中' :
+                row.status === 1 ? '执行中' :
-                            row.status === 2 ? '成功' : ''
+                  row.status === 2 ? '成功' : ''
-              }}
+          }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip />
-            label="备注"
-            prop="remark"
-            show-overflow-tooltip
-        />
       </el-table>
       <div>
-        <el-pagination
+        <el-pagination :current-page.sync="pageNo" :page-size="parseInt(pageSize)" :page-sizes="[20, 50, 100, 200]"
-            :current-page.sync="pageNo"
+          :total="total" layout="sizes, prev, pager, next, total" @size-change="handleSizeChange"
-            :page-size="parseInt(pageSize)"
+          @current-change="handleCurrentChange">
-            :page-sizes="[20, 50, 100, 200]"
-            :total="total"
-            layout="sizes, prev, pager, next, total"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-        >
         </el-pagination>
       </div>
     </div>
-    <transferBuilding v-if="transferBuildingDialog" @close="transferBuildingDialog=false" @ok="getTableData"/>
+    <transferBuilding v-if="transferBuildingDialog" @close="transferBuildingDialog = false" @ok="getTableData" />
-    <transferCommunity v-if="transferCommunityDialog" @close="transferCommunityDialog=false" @ok="getTableData"/>
+    <transferCommunity v-if="transferCommunityDialog" @close="transferCommunityDialog = false" @ok="getTableData" />
 
   </div>
 </template>
 
 <script>
-import {requestGet, requestPost} from "@/js/dai/request"
+import { requestGet, requestPost } from "@/js/dai/request"
-import {mapGetters} from "vuex"
+import { mapGetters } from "vuex"
 import transferBuilding from "@/views/modules/base/migration/records/transferBuilding.vue";
 import transferCommunity from "@/views/modules/base/migration/records/transferCommunity.vue";
 
 export default {
   name: 'records',
-  components: {transferBuilding, transferCommunity},
+  components: { transferBuilding, transferCommunity },
   data() {
     return {
       pageNo: 1,
@@ -155,8 +115,8 @@ export default {
     async getTableData() {
       this.tableLoading = true
       const url = "/actual/base/baseDataTransfer/recordList"
-      const {pageSize, pageNo} = this
+      const { pageSize, pageNo } = this
-      const {data, code, msg} = await requestGet(url, {
+      const { data, code, msg } = await requestGet(url, {
         pageSize,
         pageNo,
       })
@@ -168,11 +128,11 @@ export default {
     }
   },
 };
+
+
 </script>
 
 <style lang="scss" scoped>
-
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/buttonstyle.scss";
-
 </style>

src/views/modules/home/index.vue

@@ -774,8 +774,12 @@ export default {
           }
           ]
         };
+        const resizeHandler = () => {
+            this.myBarchart.resize();
+        };
         this.myBarchart.setOption(option);
         window.addEventListener("resize", this.handleWindowResize);
+        window.addEventListener("resize", resizeHandler);
         this.myBarchart.on("click", (e) => {
           this.$router.push({
             path: "/main/base-nonIntResi",