Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

Fixiaobai

2023-12-14 57214d3ef6e7a32685b791ff3c8f1fc49539e055

 src/views/admin/user/info.vue

@@ -19,7 +19,7 @@
  <div class="app-container calendar-list-container">
    <basic-container>
      <template>
        <el-tabs @tab-click="switchTab">
        <el-tabs v-model="switchStatus" @tab-click="switchTab" style="padding-left:20px">
          <el-tab-pane label="信息管理" name="userManager"/>
          <el-tab-pane label="密码管理" name="passwordManager"/>
        </el-tabs>
@@ -56,7 +56,7 @@
                  <i v-else class="el-icon-plus avatar-uploader-icon"/>
                </el-upload>
              </el-form-item>
              <el-form-item
              <!-- <el-form-item
                label="社交登录"
                prop="social">
                <a
@@ -71,7 +71,7 @@
                  href="#"
                  style="color: blue"
                  @click="handleClick('osc')">开源中国</a>
              </el-form-item>
              </el-form-item> -->
              <el-form-item>
                <el-button
                  type="primary"