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

back/src/views/modules/myAgent/demo/competency-application.vue

@@ -2,7 +2,7 @@
  * @Author: hisense.liangjunhua
  * @Date: 2022-06-29 15:59:51
  * @LastEditors: Light
- * @LastEditTime: 2022-11-28 11:28:43
+ * @LastEditTime: 2022-11-30 15:45:35
  * @Description: 告诉大家这是什么
 -->
 <!--  流程业务表单   -->
@@ -41,7 +41,7 @@
           </div>
         </p> -->
         <p>
-          <div>
+          <div v-if="version == 'xihaian'">
             <el-button type="primary" size="small" @click="download(dataForm.content)">附件下载</el-button>
           </div>
         </p>
@@ -149,6 +149,7 @@ export default {
       input: '',
       visible: true,
       showKey: 0,
+      version: CONFIGITEM.version,
       // 表单属性是否可编辑
       // fieldDisabled: false,
       // dataForm: {

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

@@ -33,8 +33,12 @@
       </div>
       <a-empty
         v-else
-        style="margin-top: 160px; margin-bottom: 60px"
-        :imageStyle="{ color: '#0058e1' }"
+        style="
+          margin-top: 160px;
+          margin-bottom: 60px;
+          color: rgba(255, 255, 255, 0.5);
+        "
+        :image="empty"
       />
     </div>
   </div>
@@ -51,6 +55,7 @@
     require('../../../assets/newHome/popular-yy.png'),
     require('../../../assets/newHome/popular-zs.png'),
   ])
+  const empty = ref(require('@/assets/newHome/empty.png'))
   //查看详情方法
   function viewDetails(id) {
     console.log('id=========>', id)