Merge branch 'dev'
Showing
3 changed files
with
18 additions
and
8 deletions
| 1 | <!-- | 1 | <!-- |
| 2 | * @Description: workFrame左侧菜单列表-分割 | 2 | * @Description: workFrame左侧菜单列表-分割 |
| 3 | * @Autor: renchao | 3 | * @Autor: renchao |
| 4 | * @LastEditTime: 2024-02-01 16:58:20 | 4 | * @LastEditTime: 2024-03-08 12:52:22 |
| 5 | --> | 5 | --> |
| 6 | <template> | 6 | <template> |
| 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> | 7 | <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> |
| ... | @@ -96,7 +96,15 @@ | ... | @@ -96,7 +96,15 @@ |
| 96 | watch: { | 96 | watch: { |
| 97 | isRefresh: { | 97 | isRefresh: { |
| 98 | handler (newVal, oldVal) { | 98 | handler (newVal, oldVal) { |
| 99 | if (newVal) this.loadBdcdylist(true) | 99 | let that = this |
| 100 | if (newVal) { | ||
| 101 | if (that.activeIndex >= 0) { | ||
| 102 | that.unitClick(sessionStorage.getItem('keyPath') - 0) | ||
| 103 | } | ||
| 104 | if (that.activeHIndex >= 0) { | ||
| 105 | that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0) | ||
| 106 | } | ||
| 107 | } | ||
| 100 | }, | 108 | }, |
| 101 | immediate: true | 109 | immediate: true |
| 102 | }, | 110 | }, |
| ... | @@ -139,9 +147,10 @@ | ... | @@ -139,9 +147,10 @@ |
| 139 | this.judgeBatchShow(); | 147 | this.judgeBatchShow(); |
| 140 | if (!status) { | 148 | if (!status) { |
| 141 | if (sessionStorage.getItem('keyPath')) { | 149 | if (sessionStorage.getItem('keyPath')) { |
| 142 | if (this.aroundShow) { | 150 | if (that.activeIndex >= 0) { |
| 143 | that.unitClick(sessionStorage.getItem('keyPath') - 0) | 151 | that.unitClick(sessionStorage.getItem('keyPath') - 0) |
| 144 | } else { | 152 | } |
| 153 | if (that.activeHIndex >= 0) { | ||
| 145 | that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0) | 154 | that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0) |
| 146 | } | 155 | } |
| 147 | } else { | 156 | } else { |
| ... | @@ -178,9 +187,10 @@ | ... | @@ -178,9 +187,10 @@ |
| 178 | this.judgeBatchShow(); | 187 | this.judgeBatchShow(); |
| 179 | if (!status) { | 188 | if (!status) { |
| 180 | if (sessionStorage.getItem('keyPath')) { | 189 | if (sessionStorage.getItem('keyPath')) { |
| 181 | if (this.aroundShow) { | 190 | if (that.activeIndex >= 0) { |
| 182 | that.unitClick(sessionStorage.getItem('keyPath') - 0) | 191 | that.unitClick(sessionStorage.getItem('keyPath') - 0) |
| 183 | } else { | 192 | } |
| 193 | if (that.activeHIndex >= 0) { | ||
| 184 | that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0) | 194 | that.handleAfterunitClick(sessionStorage.getItem('keyPath') - 0) |
| 185 | } | 195 | } |
| 186 | } else { | 196 | } else { | ... | ... |
| ... | @@ -109,7 +109,7 @@ | ... | @@ -109,7 +109,7 @@ |
| 109 | label="权利性质"> | 109 | label="权利性质"> |
| 110 | </el-table-column> | 110 | </el-table-column> |
| 111 | <el-table-column | 111 | <el-table-column |
| 112 | property="syqmj" | 112 | property="qlmjmc" |
| 113 | label="面积"> | 113 | label="面积"> |
| 114 | </el-table-column> | 114 | </el-table-column> |
| 115 | <el-table-column | 115 | <el-table-column | ... | ... |
| ... | @@ -75,7 +75,7 @@ module.exports = { | ... | @@ -75,7 +75,7 @@ module.exports = { |
| 75 | filename: `static/js/[name].[hash].js`, | 75 | filename: `static/js/[name].[hash].js`, |
| 76 | chunkFilename: `static/js/[name].[hash].js`, | 76 | chunkFilename: `static/js/[name].[hash].js`, |
| 77 | }, | 77 | }, |
| 78 | devtool: process.env.NODE_ENV === 'development' ? '#eval-source-map' : false | 78 | devtool: "source map" |
| 79 | }, | 79 | }, |
| 80 | // chainWebpack通过链式编程的形式,来修改默认的webpack配置 | 80 | // chainWebpack通过链式编程的形式,来修改默认的webpack配置 |
| 81 | chainWebpack (config) { | 81 | chainWebpack (config) { | ... | ... |
-
Please register or sign in to post a comment