Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

odc.xiaohui

2023-02-17 9b7032666d105dc6abde1b8c7f1cfb2b5f1c989e

Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0

# Conflicts:
#	src/views/layout/components/Menu/index.vue
SHA-1: 72ec074601a963f7bf54c7246b83bbe2e502296a

* 2023/2/17
肖辉
修改图片管理以及案卷查询，我的代办

 src/views/layout/components/Menu/index.vue

@@ -90,7 +90,8 @@
      const userName = sessionStorage.getItem('name');
      users.getMenu({ name: userName })
          .then(res => {
            console.log(res)
            // console.log(res)
            // debugger
            this.menuList = res.menus;
            sessionStorage.setItem('user', JSON.stringify(res));
          })
@@ -172,7 +173,7 @@
          color: #e9eef3;
          background-color: #313350;
          font-size: 16px;
          border-bottom: 1px solid #ccc;
          // border-bottom: 0.5px solid #7c7979;
        }
        .el-menu-item:hover {
          background-color: #409EFF;

 src/views/systemSetting/platform/mySetting/index.vue

@@ -1,9 +1,9 @@
<template>
    <div class="mySetting">
        <!-- header 页面标题提示 -->
        <header>
        <!-- <header>
            <div class="header-title">系统设置 >> 门户管理 > 自定义菜单设置</div>
        </header>
        </header> -->
        <main>
            <div class="main-content">
                <!-- 数据展示 -->

 src/views/systemSetting/platform/otherInterface/index.vue

@@ -1,7 +1,7 @@
<template>
    <div class="otherInterface">
        <header>
            <div class="headerTitle">系统设置 >> 门户管理 > 第三方应用接口管理</div>
            <!-- <div class="headerTitle">系统设置 >> 门户管理 > 第三方应用接口管理</div> -->
            <div class="addInterface">
                <el-button class="add button-addition" @click="handleAdd">添加第三方接口</el-button>
            </div>

 src/views/systemSetting/platform/portalSetting/index.vue

@@ -1,9 +1,9 @@
<template>
    <div class="log">
        <header>
            <div class="headerTitle">
            <!-- <div class="headerTitle">
                系统设置 >> 门户管理 > logo管理
            </div>
            </div> -->
        </header>
        <main>
            <div class="mainTitle">LOGO</div>