Merge remote-tracking branch 'origin/master'

吴羡

3 天以前 1193ed5cf72c8d1093d0c061b9eefe61a28b0cb7

 src/views/CNAS/personnel/personalOverview/index.vue

@@ -22,8 +22,8 @@
            display: flex;
            align-items: center;
            justify-content: center;
            border: 1px solid #EEEEEE;">
                <lims-icon name="el-icon-picture-outline" style="font-size:30px;color:#666666;"></lims-icon>
            border: 1px solid var(--lims-divider);">
                <lims-icon name="el-icon-picture-outline" style="font-size:30px;color:var(--lims-text-2);"></lims-icon>
              </div></template>
            </el-image>
            <el-image style="width: 195px;
@@ -33,15 +33,15 @@
            display: flex;
            align-items: center;
            justify-content: center;
            border: 1px solid #EEEEEE;">
                <lims-icon name="el-icon-picture-outline" style="font-size:30px;color:#666666;"></lims-icon>
            border: 1px solid var(--lims-divider);">
                <lims-icon name="el-icon-picture-outline" style="font-size:30px;color:var(--lims-text-2);"></lims-icon>
              </div></template>
            </el-image>
            <div class="title">{{ m.name }}</div>
          </li>
        </ul>
      </scroll-pagination>
      <div v-if="list.length<1&&!loading" style="color:#909399;font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
      <div v-if="list.length<1&&!loading" style="color:var(--lims-text-3);font-size:14px;text-align: center;margin-top:200px" >暂无数据</div>
    </div>
  </div>
</template>
@@ -178,7 +178,7 @@
  width: 320px;
  border-radius: 8px 8px 8px 8px;
  box-shadow: 4px 4px 8px 0px rgba(51,51,51,0.04);
  border: 1px solid #EEEEEE;
  border: 1px solid var(--lims-divider);
  margin: 0 !important;
  display: flex;
  align-items: center;
@@ -214,7 +214,7 @@
  width: 88px;
  font-size: 14px;
  font-weight: 700;
  color: #606266;
  color: var(--lims-text-2);
}
.search_button {
  line-height: 30px;