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

zhanghua

2023-01-29 e40748d026cdd85225b2eb2582299ed54ec862fb

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

 src/App.vue

@@ -113,7 +113,6 @@
.el-dialog__body {
  // background-color: #06122c;
}

.el-dialog__header {
  display: flex;
  align-items: center;
@@ -121,7 +120,6 @@
  padding: 20px;
  line-height: 60px;
}

.el-dialog__close {
  width: 20px;
  height: 20px;
@@ -134,10 +132,12 @@

#app {
  .userList{

    height: 100%;
    overflow: auto;
  }
  .list{

    height: 100%;
    overflow: auto;
  }
  // 设置弹出框样式
  .el-dialog__title {
@@ -148,28 +148,22 @@
    background-color: #DCDFE6;
    //border: 1px solid #DCDFE6;
  }

  // 设置table样式
  .el-table__empty-block {
    // background-color: #09152f;
  }

  .el-table__empty-block {
    color: #4b9bb7;
  }

  .el-table__empty-text {
    color: #4b9bb7;
  }

  .el-table .warning-row {
    // background: #06122c;
  }

  .el-table .success-row {
    // background: #071f39;
  }

  .el-input__inner {
    // background-color: #09152f;
    // border: 1px solid #17324c;

 src/assets/icons/svg/icon_shenheguanlileft.svg

New file
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="36" height="36" viewBox="0 0 36 36"><defs><clipPath id="master_svg0_3_864"><rect x="7" y="7" width="22" height="22.000001907348633" rx="0"/></clipPath></defs><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"><g style="mix-blend-mode:passthrough"><rect x="0" y="0" width="36" height="36" rx="4" fill="#FF7513" fill-opacity="1"/></g><g clip-path="url(#master_svg0_3_864)"><g><path d="M18,8C16.740000000000002,8,15.57,8.818181,15.21,10L10.98,10C9.9,10,9,10.909089999999999,9,12L9,26C9,27.0909,9.9,28,10.98,28L25.02,28C26.1,28,27,27.0909,27,26L27,12C27,10.909089999999999,26.1,10,25.02,10L20.880000000000003,10C20.43,8.818182,19.259999999999998,8.000000572205,18,8ZM22.59,14.545449999999999L24.03,16L16.02,24L12.06,20L13.5,18.5455L16.11,21.090899999999998L22.59,14.545449999999999ZM18,10C18.54,10,18.990000000000002,10.45455,18.990000000000002,11C18.990000000000002,11.54545,18.54,12,18,12C17.46,12,17.009999999999998,11.54545,17.009999999999998,11C17.009999999999998,10.45455,17.46,10,18,10Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></g></svg>

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

@@ -172,6 +172,13 @@
  created() {
    this.setLoginInfo();
  },
  watch:{
    $route() {
      this.menuLeftList.map(item=>{
        item.checked = false
      })
    },
  },
  methods: {
    cancelChannel(){
      this.channelSettingVisible=false
@@ -354,6 +361,14 @@
      color: #fff;
      background-color: #313350;
    }
    .my-active:hover {
      color: #2f54eb;
      background-color: #313350;
    }
    .my-activeno:hover{
      color: #2f54eb;
      background-color: #313350;
    }
  }

  .header-right {
@@ -466,8 +481,9 @@

    .user:hover,
    .btn:hover {
      background-color: #092c4a;
      //background-color: #092c4a;
      cursor: pointer;
      color: #2f54eb;
    }
  }
}

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

@@ -264,7 +264,7 @@
              id: 39,
              label: '审核管理',
              link: '/operate/management/myIndex',
              icon: 'icon_shenheguanli'
              icon: 'icon_shenheguanlileft'
            },
            {
              id: 40,
@@ -348,19 +348,16 @@
.el-main {
  min-width: 1024px;
  padding: 0;

  .content {
    padding: 11px;
    //height: 100%;
    height: 100%;
    background-color: #F5F9FA;
    overflow: auto;
    .page-nav {
      padding: 40px 100px;
      text-align: left;

      .nav-item {
        line-height: 60px;


        .nav-title {
          color: #4178FE;
          display: flex;
@@ -416,7 +413,6 @@
            transform: none;
          }
        }

      }
    }
  }

 src/views/systemSetting/baseSetting/department/index.vue

@@ -448,15 +448,16 @@
<style lang="scss" scoped>
.userList {
  text-align: left;
  margin: 10px 20px;
  padding: 10px 20px;
  // color: #4b9bb7;
  //height: 100%;
  border: 1px solid #ccc;
  header {
    // background-color: white;
    // border: 1 pox solid #fff;

    .headerContent {
      padding: 0 40px;
      padding: 0;
      display: flex;
      line-height: 100px;
      justify-content: space-between;
@@ -517,11 +518,12 @@
      display: flex;
      justify-content: space-between;
      align-items: center;
      padding: 0 20px;
      padding: 0;

      .funs-sp {
        // border: 1px solid #17324c;
        border: 1px solid #DCDFE6;
        background-color: #fff;
      }

      .funs {

 src/views/systemSetting/baseSetting/role/index.vue

@@ -360,53 +360,44 @@
<style lang="scss" scoped>
.userList {
    text-align: left;
    margin: 10px 20px;
    padding: 10px 20px;
    // color: #4b9bb7;
    //height: 100%;
  border: 1px solid #ccc;
    header {
        // background-color: #09152f;
        // border: 1pox solid #fff;

        .headerContent {
            padding: 0 40px;
            padding: 0;
            display: flex;
            line-height: 100px;
            justify-content: space-between;
            align-items: center;

            .search {
                display: flex;
                justify-content: flex-start;

                span {
                    flex: 1;
                }

                .el-input {
                    flex: 2;
                    // color: #1d3f57;

                    &::v-deep .el-input__inner {
                        // background-color: #09152f;
                        // border: 1px solid #17324c;
                    }
                }

            }

            .findBtn {
                line-height: 100px;
                margin-left: 15px;
                display: flex;
                align-items: center;
                margin-top: -2px;

                .el-button {
                    padding: 12px 25px;

                }
            }

            .addBtn {
                //background-color: #eb5d01;
                border: none;
@@ -415,29 +406,26 @@
            }
        }
    }

    main {
        // background-color: #09152f;
        margin-top: 20px;
        padding-bottom: 50px;
        // border: 1pox solid #fff;

        .mainTitle {
            line-height: 60px;
        }

        .tools {
            display: flex;
            justify-content: space-between;
            align-items: center;
            padding: 0 20px;
            padding: 0;
            .funs-sp{
                // border: 1px solid #17324c;
              border: 1px solid #DCDFE6;
              background-color: #fff;
            }
            .funs {
                display: flex;

                .funsItem {
                    line-height: 28px;
                    display: flex;
@@ -450,42 +438,33 @@
                        width: 80px;
                        padding: 0 10px;
                    }

                    .el-select {
                        width: 120px;
                    }

                    // &::v-deep .el-input__inner {
                    //     border: none;
                    //     background-color: #09152f;
                    // }

                    // &:hover {
                    //     border: 1px solid #4b9bb7;
                    // }

                    // &:hover .el-checkbox {
                    //     color: #4b9bb7;
                    // }
                }

            }

            .pagination {
                margin-top: 50px;
                display: flex;
                line-height: 50px;
                justify-content: center;

                .el-pagination {

                    // &::v-deep li,
                    // &::v-deep .btn-prev,
                    // &::v-deep .btn-next {
                    //     background-color: #071f39;
                    //     color: #4b9bb7;
                    // }

                    // &::v-deep .active {
                    //     background-color: #409eff;
                    //     color: #fff;
@@ -493,24 +472,19 @@
                }
            }
        }

        .el-table {
            // color: #4b9bb7;
            // font-size: 10px;

            .operation {
                display: flex;

                .line {
                    padding: 0 5px;
                }

                span:hover {
                    cursor: pointer;
                }
            }
        }

    }
}
</style>

 src/views/systemSetting/baseSetting/user/components/header/index.vue

@@ -55,55 +55,43 @@
<style lang="scss" scoped>
header {
    // background-color: #09152f;
    border: 1px solid #fff;

    //border: 1px solid #fff;
    .headerContent {
        padding: 0 40px;
        padding: 0;
        display: flex;
        line-height: 100px;
        justify-content: space-between;
        align-items: center;

        .search {
            display: flex;
            justify-content: flex-start;

            span {
                flex: 1;
            }

            .el-input {
                flex: 2;
                // color: #1d3f57;

                &::v-deep .el-input__inner {
                    // background-color: #09152f;
                    // border: 1px solid #17324c;
                }
            }

        }

        .findBtn {
            line-height: 100px;
            margin-left: 15px;
            display: flex;
            align-items: center;
            margin-top: -2px;

            .el-button {
                padding: 12px 25px;

            }
        }

        .addBtn {
            background-color: #409EFF;
            border: none;
            padding: 12px 30px;
        }


    }
}
</style>

 src/views/systemSetting/baseSetting/user/components/main/index.vue

@@ -118,45 +118,46 @@
      </el-dialog>
      <!-- tools -->
      <div class="tools">
        <div class="funs">
          <div class="funsItem funs-sp">
            <el-checkbox v-model="all" @change="selectAll()">全选</el-checkbox>
          </div>
          <div class="funsItem funs-sp">
            <el-checkbox v-model="unsame" @change="disSame(tableData)"
              >反选</el-checkbox
            >
          </div>
          <div class="funsItem">
            <el-select
              v-model="myIdx"
              placeholder="批量操作"
              @change="selectChange"
            >
              <el-option
                v-for="item in options"
                :key="item.value"
                :label="item.label"
                :value="item.value"
                :disabled="item.disabled"
              >
              </el-option>
            </el-select>
          </div>
        </div>
        <div class="pagination">
          <el-pagination
            background
            :current-page="currentPage"
            layout="prev, pager, next"
            :total="totalNum"
            :page-size="pageSize"
            @current-change="changeCurrentPage"
            @prev-click="handlePrev"
            @next-click="handleNext"
          >
          </el-pagination>
        </div>
         <div class="funs">
           <div class="funsItem funs-sp">
             <el-checkbox v-model="all" @change="selectAll()">全选</el-checkbox>
           </div>
           <div class="funsItem funs-sp">
             <el-checkbox v-model="unsame" @change="disSame(tableData)"
             >反选</el-checkbox
             >
           </div>
           <div class="funsItem">
             <el-select
                 v-model="myIdx"
                 placeholder="批量操作"
                 @change="selectChange"
             >
               <el-option
                   popper-class="funs-select"
                   v-for="item in options"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
                   :disabled="item.disabled"
               >
               </el-option>
             </el-select>
           </div>
         </div>
         <div class="pagination">
           <el-pagination
               background
               :current-page="currentPage"
               layout="prev, pager, next"
               :total="totalNum"
               :page-size="pageSize"
               @current-change="changeCurrentPage"
               @prev-click="handlePrev"
               @next-click="handleNext"
           >
           </el-pagination>
         </div>
      </div>
    </div>
  </main>
@@ -485,22 +486,20 @@
  // background-color: #09152f;
  margin-top: 20px;
  padding-bottom: 50px;
  border: 1pox solid #fff;

  //border: 1px solid #fff;
  .mainTitle {
    line-height: 60px;
  }

  .tools {
    display: flex;
    justify-content: space-between;
    align-items: center;
    padding: 0 20px;

    padding: 0;
    .funs {
      display: flex;
      .funs-sp {
         border: 1px solid #DCDFE6;
        background-color: #fff;
      }
      .funsItem {
        line-height: 28px;
@@ -509,26 +508,24 @@
        border-radius: 4px;
        font-size: 12px;
        margin-left: 10px;

        .el-checkbox {
          width: 80px;
          padding: 0 10px;
        }

        .el-select {
          width: 120px;

          .funs-select{
            background-color: transparent;
          }
        }


      }
    }

    .pagination {
      margin-top: 50px;
      display: flex;
      line-height: 50px;
      justify-content: center;

      .el-pagination {
        &::v-deep li,
        &::v-deep .btn-prev,
@@ -536,7 +533,6 @@
          // background-color: #071f39;
          // color: #4b9bb7;
        }

        &::v-deep .active {
          background-color: #409eff;
          color: #fff;
@@ -544,7 +540,6 @@
      }
    }
  }

  .el-table {
    // color: #4b9bb7;
    // font-size: 10px;
@@ -554,7 +549,6 @@
      .line {
        padding: 0 1px;
      }

      span:hover {
        cursor: pointer;
      }

 src/views/systemSetting/baseSetting/user/index.vue

@@ -42,9 +42,10 @@
</script>
<style lang="scss" scoped>
.userList {
  //height: 100%;
    text-align: left;
    margin: 10px 20px;
    padding: 10px 20px;
    color: #4b9bb7;
  border: 1px solid #ccc;
    border: 1px solid #ccc;
}
</style>