MrShi
15 小时以前 ae63493e4767c91d0e28cc5368138c00833d096a
优化
已添加18个文件
已修改3个文件
136 ■■■■ 文件已修改
admin/.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_1.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_2.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_3.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_4.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_5.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_6.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_7.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/ic_8.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/sousuo.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/xl.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_1.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_2.png 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_3.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_4.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_5.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_6.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_7.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/assets/icons/菜单图标/__MACOSX/._ic_8.jpg 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/common/CommonHeader.vue 130 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/.env.development
@@ -5,9 +5,9 @@
#VUE_APP_API_URL  = 'http://192.168.1.45:10010'
# #VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
VUE_APP_API_URL  = 'http://192.168.0.7/system_gateway'
VUE_APP_API_URL  = 'http://localhost:10010'
# VUE_APP_API_URL  = 'http://localhost:10010'
#key:045542fc5f436b75e6c911c5c84ff8cd
#密钥:8bd38497f9aee2b75e7a888a4dfd1e6c
admin/src/assets/icons/ic_1.jpg
admin/src/assets/icons/ic_2.png
admin/src/assets/icons/ic_3.jpg
admin/src/assets/icons/ic_4.jpg
admin/src/assets/icons/ic_5.jpg
admin/src/assets/icons/ic_6.jpg
admin/src/assets/icons/ic_7.jpg
admin/src/assets/icons/ic_8.jpg
admin/src/assets/icons/sousuo.png
admin/src/assets/icons/xl.png
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_1.jpg
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_2.png
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_3.jpg
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_4.jpg
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_5.jpg
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_6.jpg
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_7.jpg
admin/src/assets/icons/²Ëµ¥Í¼±ê/__MACOSX/._ic_8.jpg
admin/src/components/common/CommonHeader.vue
@@ -10,18 +10,48 @@
        </div>
      </div>
      <div class="user">
        <el-dropdown v-if="isLogined" trigger="click">
          <span class="el-dropdown-link">
            <!-- <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon--right"></i> -->
            <img v-if="userInfo != null" style="width: 30px !important" src="@/assets/avatar/man.png" alt="" />{{
              userInfo | displayName
            }}<i class="el-icon-arrow-down el-icon--right"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item @click.native="changePwd">修改密码</el-dropdown-item>
            <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
          <div class="user-search">
              <div class="user-search-left">
                <span>全部</span>
                  <img src="@/assets/icons/xl.png" alt="">
              </div>
              <div class="user-search-right">
                  <input type="text" placeholder="请输入" />
                  <img src="@/assets/icons/sousuo.png" alt="">
              </div>
          </div>
          <div class="user-images">
              <img src="@/assets/icons/ic_1.jpg" alt="">
              <img src="@/assets/icons/ic_2.png" alt="">
              <img src="@/assets/icons/ic_3.jpg" alt="">
              <img src="@/assets/icons/ic_4.jpg" alt="">
              <img src="@/assets/icons/ic_5.jpg" alt="">
              <img src="@/assets/icons/ic_6.jpg" alt="">
              <img src="@/assets/icons/ic_7.jpg" alt="">
              <img src="@/assets/icons/ic_8.jpg" alt="">
          </div>
          <el-dropdown v-if="isLogined" trigger="click">
            <span class="el-dropdown-link" style="cursor: pointer; color: rgba(255,255,255,.56);">
              {{ userInfo | displayName }}
              <i class="el-icon-arrow-down el-icon--right"></i>
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item @click.native="changePwd">修改密码</el-dropdown-item>
              <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
<!--        <el-dropdown v-if="isLogined" trigger="click">-->
<!--          <span class="el-dropdown-link">-->
<!--            &lt;!&ndash; <img v-if="userInfo != null" :src="userInfo.avatar == null ? `${require('@/assets/avatar/man.png')}` : userInfo.avatar" alt="">{{userInfo | displayName}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i> &ndash;&gt;-->
<!--            <img v-if="userInfo != null" style="width: 30px !important" src="@/assets/avatar/man.png" alt="" />{{-->
<!--              userInfo | displayName-->
<!--            }}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
<!--          </span>-->
<!--          <el-dropdown-menu slot="dropdown">-->
<!--            <el-dropdown-item @click.native="changePwd">修改密码</el-dropdown-item>-->
<!--            <el-dropdown-item @click.native="logout">退出登录</el-dropdown-item>-->
<!--          </el-dropdown-menu>-->
<!--        </el-dropdown>-->
      </div>
    </div>
    <!-- ä¿®æ”¹å¯†ç  -->
@@ -382,15 +412,83 @@
  }
  .user {
    width: 152px;
    /*width: 152px;*/
    box-sizing: border-box;
    height: 56px;
    padding-right: 25px;
    background: url("../../assets/images/top_ic_bolang@2x.png") no-repeat;
    /*background: url("../../assets/images/top_ic_bolang@2x.png") no-repeat;*/
    flex-shrink: 0;
    text-align: right;
    cursor: pointer;
    display: flex;
    align-items: center;
    .user-search {
        width: 346px;
        height: 32px;
        border-radius: 30px;
        border: 1px solid rgba(255,255,255,.56);
        margin-right: 15px;
        display: flex;
        align-items: center;
        .user-search-left {
            flex-shrink: 0;
            width: 106px;
            height: 100%;
            display: flex;
            align-items: center;
            justify-content: center;
            span {
                font-size: 14px;
                font-weight: 400;
                color: rgba(255,255,255,.56);
                margin-right: 10px;
            }
            img {
                top: 0;
                margin: 0;
                width: 20px;
                height: 16px;
            }
        }
        .user-search-right {
            flex: 1;
            height: 100%;
            display: flex;
            align-items: center;
            justify-content: center;
            padding-right: 10px;
            box-sizing: border-box;
            input {
                flex: 1;
                height: 100%;
                font-size: 14px;
                font-weight: 400;
                color: rgba(255,255,255,.56);
                border: none;
                outline: none;
                background-color: rgba(0,0,0,0);
                &::placeholder {
                    color: rgba(255,255,255,.56);
                }
            }
            img {
                top: 0;
                margin: 0;
                width: 20px;
                height: 20px;
            }
        }
    }
    .user-images {
        height: 100%;
        display: flex;
        align-items: center;
        img {
            top: 0 !important;
            width: 24px;
            height: 24px;
            margin-right: 15px;
        }
    }
    .el-dropdown {
      top: 2px;
      color: #fff;
admin/src/views/login.vue
@@ -3,7 +3,7 @@
    <img src="@/assets/images/bg@2x.png" class="main_bg" alt="">
    <div class="login_wrap">
      <div class="login_img">
        <div class="h2">芜湖烟草智慧安消安全防范系统</div>
        <div class="h3" style="font-size: 30px; margin-left: 140px; margin-bottom: 0;">芜湖烟草</div>
        <div class="h3">智慧物流园区安消一体化系统</div>
      </div>
      <div class="form_wrap">