Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev

back/src/views/modules/abilityStatistics/index.vue

@@ -55,14 +55,13 @@
         <!--类型-->
         <el-form-item>
           <span>类型：</span>
-          <el-select v-if="this.departmentId === 2 || this.departmentId === 4" v-model="abilityType" placeholder="请选择类型"
+          <el-select  @change="changeIiem" v-if="this.departmentId === 2 || this.departmentId === 4"   v-model="abilityType" placeholder="请选择类型" clearable>
-            clearable>
             <el-option label="全部" value=""></el-option>
             <el-option v-for="(item, i) in typeOptions" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
               v-bind="item">
             </el-option>
           </el-select>
-          <el-select v-else v-model="abilityType" placeholder="请选择类型" clearable>
+          <el-select   @change="changeIiem" v-else v-model="abilityType" placeholder="请选择类型" clearable>
             <el-option label="全部" value=""></el-option>
             <el-option v-for="(item, i) in typeOptions1" :key="`${item.name}${i}`" :label="item.name" :value="item.name"
               v-bind="item">
@@ -416,7 +415,7 @@ export default {
     closeModal() {
       this.detailsVisible = false
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log('val------------>', val)
       this.currentPage = val
       // todo
@@ -873,6 +872,10 @@ export default {
       this.resourcesIsShow = false
       this.handleCurrentChange(1)
     },
+    changeIiem(){
+      this.currentPage=1
+      this.pageSize=10
+    },
     // 明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数//明细按钮函数
     goToDetail () {
       this.currentPage=1

front/src/views/abilityStatistics/components/ResourceAggregation.vue

@@ -262,6 +262,7 @@
           center: ['50%', '40%'],
           type: 'pie',
           selectedMode: 'single',
+          silent: true,
           radius: ['50%', '30%'],
           color: ['#fe845e', '#6cc95a', '#02d1b0', '#1772ff', '#FAC858'],
           top: '0',
@@ -289,6 +290,7 @@
           type: 'pie',
           center: ['50%', '40%'],
           radius: ['58%', '50%'],
+          silent: true,
           itemStyle: {
             normal: {
               color: '#c2c7d6',

front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-17 14:11:08
- * @LastEditors: hisense.wuhongjian
+ * @LastEditors: Light
- * @LastEditTime: 2022-08-25 19:52:03
+ * @LastEditTime: 2022-10-26 14:57:25
  * @Description: 上架
 -->
 <template>
@@ -95,7 +95,7 @@
                 disabled
                 v-model:value="val[attr.field]"
                 :showCount="true"
-                :maxlength="200"
+                :maxlength="1000"
                 :placeholder="'请填写' + attr.name"
                 v-else-if="attr.type == 'textArea'"
               />
@@ -166,7 +166,7 @@
             <a-textarea
               v-model:value="val.note1"
               :showCount="true"
-              :maxlength="200"
+              :maxlength="1000"
               :placeholder="'请填写' + val.name"
               v-else-if="val.type == 'textArea'"
             />
@@ -270,7 +270,7 @@
                 v-else-if="item.type == 'textArea'"
                 v-model:value="item.note1"
                 :showCount="true"
-                :maxlength="200"
+                :maxlength="1000"
                 :placeholder="'请输入' + item.name"
                 @change="changeIiem(item.name, item.note1)"
               />
@@ -1132,7 +1132,7 @@
 </script>
 <style></style>
 <style lang="less" scoped>
-.put-on-the-shelf {
+  .put-on-the-shelf {
     height: 6.8rem;
     overflow: scroll;
     display: flex;
@@ -1272,9 +1272,9 @@
     & > div:nth-of-type(1) {
       margin-top: 0;
     }
-}
+  }
 
-.application-Area {
+  .application-Area {
     width: 5.2rem;
     display: grid;
     margin-top: -0.05rem;
@@ -1300,78 +1300,78 @@
       background: #0087ff;
       color: #fff;
     }
-}
+  }
 
-:deep(.ant-image-img) {
+  :deep(.ant-image-img) {
     width: 100%;
     height: 100%;
     object-fit: contain;
-}
+  }
 
-:deep(.ant-modal) {
+  :deep(.ant-modal) {
     width: 9.6rem;
-}
+  }
 
-:deep(.ant-transfer-list) {
+  :deep(.ant-transfer-list) {
     width: 39.5%;
     height: 5.2rem;
-}
+  }
 
-:deep(.ant-transfer-operation) {
+  :deep(.ant-transfer-operation) {
     flex-direction: row-reverse;
     margin: 0 0.3rem;
-}
+  }
 
-:deep(.ant-btn) {
+  :deep(.ant-btn) {
     width: 0.56rem;
     height: 0.4rem;
     border-radius: 0.04rem;
-}
+  }
 
-:deep(.ant-btn:first-child) {
+  :deep(.ant-btn:first-child) {
     margin-left: 0.04rem;
-}
+  }
 
-:deep(.ant-modal-footer) {
+  :deep(.ant-modal-footer) {
     border: 0;
-}
+  }
 
-:deep(.ant-modal-header) {
+  :deep(.ant-modal-header) {
     border: 0;
-}
+  }
 
-:deep(.ant-modal-title) {
+  :deep(.ant-modal-title) {
     line-height: 0.24rem;
     font-size: 0.18rem;
     color: #303133;
-}
+  }
 
-:deep(.ant-transfer-list-header) {
+  :deep(.ant-transfer-list-header) {
     background: #f5f7fa;
-}
+  }
 
-:deep(.ant-transfer-list-header-selected) {
+  :deep(.ant-transfer-list-header-selected) {
     display: flex;
     width: 90%;
     flex-direction: row-reverse;
     justify-content: space-between;
     align-items: center;
-}
+  }
 
-:deep(.ant-transfer-list-header-title) {
+  :deep(.ant-transfer-list-header-title) {
     font-size: 0.16rem;
     color: #303133;
     font-weight: 400;
     text-align: left;
-}
+  }
-:deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
+  :deep(.ant-transfer-list-header .ant-checkbox-wrapper) {
     display: none !important;
-}
+  }
-:deep(.ant-upload-list-item-name) {
+  :deep(.ant-upload-list-item-name) {
     width: 1rem;
-}
+  }
 
-.del {
+  .del {
     display: flex;
     justify-content: flex-start;
     align-items: center;
@@ -1390,8 +1390,8 @@
     div {
       cursor: pointer;
     }
-}
+  }
-.item {
+  .item {
     position: relative;
     span:first-child {
       width: unset;
@@ -1417,5 +1417,5 @@
       bottom: -20px;
       left: 110px;
     }
-}
+  }
 </style>