Skip to content

D
dcxy-manage-shell
Commit 27fe828b by 姜雷
Options

Merge branch 'test' into 'master'

Test See merge request !174
parents 8abfa358 44d254a3
Showing with 38 additions and 8 deletions
public/index.html
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>ic_logo.ico" /> <link rel="icon" href="<%= BASE_URL %>ic_logo.ico" />
<script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script> <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
...@@ -22,13 +25,19 @@ ...@@ -22,13 +25,19 @@
<script src="https://webapi.amap.com/maps?v=1.4.12&key=dd6103c90f2f17310a8711f2d330a0a6"></script> <script src="https://webapi.amap.com/maps?v=1.4.12&key=dd6103c90f2f17310a8711f2d330a0a6"></script>
<script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script> <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>
<script src="<%= VUE_APP_DEV_LIB_URL %>/lib/manageShell.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> <script src="<%= VUE_APP_DEV_LIB_URL %>/lib/manageShell.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> <script
src="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> <script src="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> <script
<script src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> src="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> <script
<script src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script src="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script> <script
src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script
src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<script
src="<%= VUE_APP_SUBSYSTEM %>/smaproManage/lib/smaproManage.umd.min.js?<%= VUE_APP_SYSTEM_VERSION %>"></script>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
</body> </body>
......
src/components/UserCard/UserWithContent.vue
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
:showMoney="showMoney" :showMoney="showMoney"
:showCellphone="showCellphone" :showCellphone="showCellphone"
:visible="visible" :visible="visible"
:isRefresh="isRefresh"
ref="UserInfo" ref="UserInfo"
/> />
<div class="right-part"> <div class="right-part">
...@@ -50,6 +51,10 @@ export default { ...@@ -50,6 +51,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
isRefresh:{
type: Boolean,
default: false,
},
}, },
methods: { methods: {
refreshBeanData() { refreshBeanData() {
......
src/containers/layout/components/UserBox.vue
...@@ -131,11 +131,12 @@ ...@@ -131,11 +131,12 @@
<el-form label-width="120px"> <el-form label-width="120px">
<el-form-item label="登录账户">{{userInfo.loginAccount}}</el-form-item> <el-form-item label="登录账户">{{userInfo.loginAccount}}</el-form-item>
<el-form-item label="姓名"> <el-form-item label="姓名">
<el-input <!-- <el-input
v-model="userForm.name" v-model="userForm.name"
maxlength="20" maxlength="20"
placeholder="请输入姓名" placeholder="请输入姓名"
></el-input> ></el-input> -->
{{userInfo.name}}
</el-form-item> </el-form-item>
<el-form-item label="运营商">{{userInfo.operateName}}</el-form-item> <el-form-item label="运营商">{{userInfo.operateName}}</el-form-item>
<el-form-item label="手机号">{{userInfo.cellphone}}</el-form-item> <el-form-item label="手机号">{{userInfo.cellphone}}</el-form-item>
......
src/dev-local/develop.html
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<meta http-equiv="Pragma" content="no-cache" />
<meta http-equiv="Expires" content="0" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="<%= BASE_URL %>ic_logo.ico" /> <link rel="icon" href="<%= BASE_URL %>ic_logo.ico" />
<script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script> <script src="https://unpkg.com/vue@2.6.10/dist/vue.js"></script>
......
src/mixins/user/userBaseInfo.js
...@@ -11,6 +11,10 @@ export default { ...@@ -11,6 +11,10 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
isRefresh:{
type: Boolean,
default: false,
},
}, },
data() { data() {
return { return {
...@@ -26,6 +30,14 @@ export default { ...@@ -26,6 +30,14 @@ export default {
this.getAllData(); this.getAllData();
} }
}, },
isRefresh(newIsRefresh){
if(newIsRefresh && this.visible){
this.fetchUserBaseInfo({
customerId: this.customerId,
});
this.getAllData();
}
},
customerId(newId) { customerId(newId) {
if (newId && this.visible) { if (newId && this.visible) {
this.fetchUserBaseInfo({ this.fetchUserBaseInfo({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment