Commit 21d75ed24563013526ebc11b403cc32a35f5a89d
1 parent
266b99a2
v1.9 解决张峰提出的问题
Showing
4 changed files
with
21 additions
and
17 deletions
src/components/system/EditSystemInfo.vue
| 1 | <template> | 1 | <template> |
| 2 | - <el-dialog :title="$t('systemInfo.editTitle')" :visible="visible" width="70%" :close-on-click-modal="false"> | 2 | + <el-dialog :title="$t('systemInfo.editTitle')" :visible="visible" width="70%" :close-on-click-modal="true" @close="close"> |
| 3 | <el-form ref="form" :model="formData" label-width="150px" :rules="rules"> | 3 | <el-form ref="form" :model="formData" label-width="150px" :rules="rules"> |
| 4 | <el-row :gutter="20"> | 4 | <el-row :gutter="20"> |
| 5 | <el-col :span="12"> | 5 | <el-col :span="12"> |
| @@ -64,14 +64,12 @@ | @@ -64,14 +64,12 @@ | ||
| 64 | <el-row :gutter="20"> | 64 | <el-row :gutter="20"> |
| 65 | <el-col :span="12"> | 65 | <el-col :span="12"> |
| 66 | <el-form-item :label="$t('systemInfo.propertyTitle')" prop="propertyTitle"> | 66 | <el-form-item :label="$t('systemInfo.propertyTitle')" prop="propertyTitle"> |
| 67 | - <el-input v-model="formData.propertyTitle" | ||
| 68 | - /> | 67 | + <el-input v-model="formData.propertyTitle" /> |
| 69 | </el-form-item> | 68 | </el-form-item> |
| 70 | </el-col> | 69 | </el-col> |
| 71 | <el-col :span="12"> | 70 | <el-col :span="12"> |
| 72 | <el-form-item :label="$t('systemInfo.qqMapKey')" prop="qqMapKey"> | 71 | <el-form-item :label="$t('systemInfo.qqMapKey')" prop="qqMapKey"> |
| 73 | - <el-input v-model="formData.qqMapKey" | ||
| 74 | - /> | 72 | + <el-input v-model="formData.qqMapKey" /> |
| 75 | </el-form-item> | 73 | </el-form-item> |
| 76 | </el-col> | 74 | </el-col> |
| 77 | </el-row> | 75 | </el-row> |
| @@ -79,8 +77,7 @@ | @@ -79,8 +77,7 @@ | ||
| 79 | <el-row :gutter="20"> | 77 | <el-row :gutter="20"> |
| 80 | <el-col :span="12"> | 78 | <el-col :span="12"> |
| 81 | <el-form-item :label="$t('systemInfo.mallUrl')" prop="mallUrl"> | 79 | <el-form-item :label="$t('systemInfo.mallUrl')" prop="mallUrl"> |
| 82 | - <el-input v-model="formData.mallUrl" | ||
| 83 | - /> | 80 | + <el-input v-model="formData.mallUrl" /> |
| 84 | </el-form-item> | 81 | </el-form-item> |
| 85 | </el-col> | 82 | </el-col> |
| 86 | </el-row> | 83 | </el-row> |
| @@ -88,7 +85,7 @@ | @@ -88,7 +85,7 @@ | ||
| 88 | 85 | ||
| 89 | <div slot="footer" class="dialog-footer"> | 86 | <div slot="footer" class="dialog-footer"> |
| 90 | <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button> | 87 | <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button> |
| 91 | - <el-button type="primary" @click="submitForm">{{$t('common.save')}}</el-button> | 88 | + <el-button type="primary" @click="submitForm">{{ $t('common.save') }}</el-button> |
| 92 | 89 | ||
| 93 | </div> | 90 | </div> |
| 94 | </el-dialog> | 91 | </el-dialog> |
| @@ -164,6 +161,9 @@ export default { | @@ -164,6 +161,9 @@ export default { | ||
| 164 | } | 161 | } |
| 165 | } | 162 | } |
| 166 | }) | 163 | }) |
| 164 | + }, | ||
| 165 | + close() { | ||
| 166 | + this.visible = false | ||
| 167 | } | 167 | } |
| 168 | } | 168 | } |
| 169 | } | 169 | } |
src/router/index.js
| @@ -655,6 +655,10 @@ const routes = [ | @@ -655,6 +655,10 @@ const routes = [ | ||
| 655 | } | 655 | } |
| 656 | }, | 656 | }, |
| 657 | { | 657 | { |
| 658 | + path: '/login', | ||
| 659 | + redirect: '/views/user/login' | ||
| 660 | + }, | ||
| 661 | + { | ||
| 658 | path: '/views/resource/printEquipmentAccountLabel', | 662 | path: '/views/resource/printEquipmentAccountLabel', |
| 659 | name: '/views/resource/printEquipmentAccountLabel', | 663 | name: '/views/resource/printEquipmentAccountLabel', |
| 660 | component: printEquipmentAccountLabel | 664 | component: printEquipmentAccountLabel |
src/views/layout/layout.vue
src/views/system/systemInfoManageList.vue
| @@ -9,7 +9,7 @@ | @@ -9,7 +9,7 @@ | ||
| 9 | {{ $t('common.edit') }} | 9 | {{ $t('common.edit') }} |
| 10 | </el-button> | 10 | </el-button> |
| 11 | </div> | 11 | </div> |
| 12 | - | 12 | + |
| 13 | <el-row :gutter="20"> | 13 | <el-row :gutter="20"> |
| 14 | <el-col :span="8"> | 14 | <el-col :span="8"> |
| 15 | <div class="info-item"> | 15 | <div class="info-item"> |
| @@ -91,11 +91,7 @@ | @@ -91,11 +91,7 @@ | ||
| 91 | </el-col> | 91 | </el-col> |
| 92 | </el-row> | 92 | </el-row> |
| 93 | 93 | ||
| 94 | - <edit-system-info | ||
| 95 | - ref="editSystemInfoRef" | ||
| 96 | - :form-data="systemInfo" | ||
| 97 | - @success="handleEditSuccess" | ||
| 98 | - /> | 94 | + <edit-system-info ref="editSystemInfoRef" :form-data="systemInfo" @success="handleEditSuccess" /> |
| 99 | </div> | 95 | </div> |
| 100 | </template> | 96 | </template> |
| 101 | 97 | ||
| @@ -160,16 +156,16 @@ export default { | @@ -160,16 +156,16 @@ export default { | ||
| 160 | <style lang="scss" scoped> | 156 | <style lang="scss" scoped> |
| 161 | .system-info-manage-container { | 157 | .system-info-manage-container { |
| 162 | padding: 20px; | 158 | padding: 20px; |
| 163 | - | 159 | + |
| 164 | .info-item { | 160 | .info-item { |
| 165 | margin-bottom: 20px; | 161 | margin-bottom: 20px; |
| 166 | text-align: left; | 162 | text-align: left; |
| 167 | - | 163 | + |
| 168 | label { | 164 | label { |
| 169 | margin-right: 10px; | 165 | margin-right: 10px; |
| 170 | } | 166 | } |
| 171 | } | 167 | } |
| 172 | - | 168 | + |
| 173 | .float-right { | 169 | .float-right { |
| 174 | float: right; | 170 | float: right; |
| 175 | } | 171 | } |