样式调整

src/HDrpManagement/workReport/modules/aside/index.vue

@@ -14,7 +14,7 @@
           :style="
             currentStatus == ''
               ? 'background:#3874F6;color:#ffffff'
-              : 'border:1px solid #cccccc'
+              : 'border:1px solid #cccccc;background:#fff'
           "
         >
           {{$t('全部')}}
@@ -24,7 +24,7 @@
           :style="
             currentStatus == '0'
               ? 'background:#3874F6;color:#ffffff'
-              : 'border:1px solid #cccccc'
+              : 'border:1px solid #cccccc;background:#fff'
           "
         >
           {{$t('未读')}}
@@ -34,7 +34,7 @@
           :style="
             currentStatus == '1'
               ? 'background:#3874F6;color:#ffffff'
-              : 'border:1px solid #cccccc'
+              : 'border:1px solid #cccccc;background:#fff'
           "
         >
           {{$t('已读')}}
@@ -277,6 +277,7 @@ export default {
 .list .list-item .item-left {
   display: flex;
   align-items: center;
+  margin-left: 10px;
 }
 .list .list-item .item-left .item-avatar {
   background: #3874f6;
@@ -306,5 +307,6 @@ export default {
   background-color: rgba(56,116,246,0.15);
   padding: 2px 10px;
   border-radius: 4px;
+  margin-right: 10px;
 }
 </style>

src/HManagement/archvies_mag/modules/delete.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-button icon="el-icon-delete" size="small" @click="clickDelete" :disabled="isRest">{{$t('删 除')}}</el-button>
+    <el-button icon="el-icon-delete" size="small" @click="clickDelete" :disabled="isRest" style="color: #f56c6c;">{{$t('删 除')}}</el-button>
 </template>
 
 <script>

src/HManagement/archvies_mag/modules/list.vue

@@ -5,7 +5,7 @@
         <slot name="upload"></slot>
         <slot name="add"></slot>
         <slot name="btngroup"></slot>
-        <el-button style="margin-left: 10px" :type="checkArray.length == list.length ? '' : 'primary'" size="small" @click="selectAll">{{checkArray.length == list.length ? $t('取消全选'):$t('全选')}}</el-button>
+<!--        <el-button style="margin-left: 10px" :type="checkArray.length == list.length ? '' : 'primary'" size="small" @click="selectAll">{{checkArray.length == list.length ? $t('取消全选'):$t('全选')}}</el-button>-->
       </div>
       <div class="flex-align-center">
         <el-input size="small" style="width:160px;margin-right:16px" prefix-icon="el-icon-search"
@@ -18,6 +18,8 @@
     </div>
     <div ref="ele" id="scroll" style="height:calc(100vh - 300px);overflow-y:scroll" class="container normal-panel">
       <bread-crumbs style="margin-bottom:10px" :tempFileData="tempFileData" @BreadCrumbsChange="BreadCrumbsChange"></bread-crumbs>
+      <el-checkbox class="mt-10" v-model="checkedAll"  true-label="1" false-label="0" @change="selectAll">{{$t(`全选`)}}</el-checkbox>
+      <span style="margin-left: 40px;color: #606266;font-size: 14px" v-if="selectNum > 0">{{$t(`已选中`)}}{{selectNum}}{{$t(`项`)}}</span>
       <el-row :gutter="10" >
         <el-col :span="2" v-for="folder in list" :key="folder.id">
 
@@ -121,11 +123,13 @@ export default {
        * @param data     : 文件夹id
        */
       tempFileData: [{
-        filename: '文件',
+        filename: '物料发布',
         id: null,
       }],
       seeFileData:'',
-      checkArray:[]
+      checkArray:[],
+      selectNum:0,
+      checkedAll:0
     }
   },
   methods: {
@@ -167,11 +171,18 @@ export default {
     },
     onChange(folder) {
       this.checkArray = []
+      this.selectNum = 0
       this.list.forEach((e, index) => {
         if (e.ischeck === true) {
           this.checkArray.push(e)
+          this.selectNum = this.selectNum + 1
         }
       })
+      if (this.selectNum == this.list.length){
+        this.checkedAll = '1'
+      }else {
+        this.checkedAll = '0'
+      }
       this.$emit('folderChecked', this.checkArray)
     },
     onSelect(folder){

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -213,7 +213,7 @@ export default {
     // 提交订单
     onSubmit(type) {
       this.$confirm(
-        `${$t("是否")}‘${$t(type)}’${$t("该订单")}`,
+        `${this.$t("是否")}‘${this.$t(type)}’${this.$t("该订单")}`,
         this.$t("提示"),
         {
           confirmButtonText: this.$t("确定"),

src/views/message/components/list.vue

@@ -104,11 +104,11 @@ export default {
   align-items: center;
 }
 .list .item-box .item .left .info .tag {
-  padding: 4px 6px;
+  padding: 0.2rem 0.9rem;
   border: 1px solid #3874F6;
+  border-radius: 4px 4px 4px 4px;
   color: #3874F6;
   font-size: 12px;
-  border-radius: 2px;
   margin-right: 10px;
 }
 .list .item-box .item .left .info .time {
@@ -125,8 +125,9 @@ export default {
   background: #FFEBEA;
   border-radius: 4px 4px 4px 4px;
   padding: 0.2rem 0.9rem;
+  border: 1px solid #FF3B30;
   color: #FF3B30;
-  font-size: 14px;
+  font-size: 12px;
 }
 .list .item-box .item .right .no-read {
   background: #EEEEEE;

src/views/message/index.vue

@@ -15,7 +15,7 @@
                    :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">系统消息</div>-->
             </div>
             <div class="select_right">
-              <el-button @click="allRead" size="small">{{$t('全部阅读')}}</el-button>
+              <el-button @click="allRead" size="small">{{$t('全部标为已读')}}</el-button>
             </div>
           </div>
           <el-row style="margin-top: 10px">