From cc748e1c997a4fc78db6a597924d09fdfb6cf1af Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Mar 2023 09:33:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E6=A0=B7=E5=BC=8F,BUG=2059?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/extra/AppConsole/AppConsole.vue      |  6 ++---
 .../components/Detail.vue                     | 22 ++++++++++---------
 .../AppNativeAppVersion.vue                   |  2 +-
 ui/lib/styles/common.scss                     | 13 +++++++++--
 ui/packages/common/AiArea.vue                 |  2 +-
 ui/packages/common/AiAvatar.vue               | 15 +++++++++----
 vue.config.js                                 |  2 +-
 7 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/packages/extra/AppConsole/AppConsole.vue b/packages/extra/AppConsole/AppConsole.vue
index f1d5d478..87e475b4 100644
--- a/packages/extra/AppConsole/AppConsole.vue
+++ b/packages/extra/AppConsole/AppConsole.vue
@@ -7,7 +7,7 @@
       </el-row>
       <el-row type="flex" align="middle" class="notice fill">
         <el-button type="primary" icon="iconfont iconNotice">通知公告</el-button>
-        <div class="notice-content nowarp-text fill">
+        <div class="notice-content nowrap-text fill">
           <el-carousel ref="noticeCarousel" height="32px" direction="vertical" indicator-position="none">
             <template v-if="noticeList.length">
               <el-carousel-item v-for="(notice,i) in noticeList" :key="i">
@@ -124,10 +124,10 @@
           </template>
           <template #content>
             <div class="unread-message-list">
-              <li v-for="(msg,i) in msgList" :key="i" class="nowarp-text">
+              <li v-for="(msg,i) in msgList" :key="i" class="nowrap-text">
                 <div class="list-type">&nbsp;</div>
                 <div style="width: calc(100% - 16px)">
-                  <p class="nowarp-text">{{ msg.content }}</p>
+                  <p class="nowrap-text">{{ msg.content }}</p>
                   <span style="color: #26f" v-text="`[${msg.title}]`"/><span style="color:#999" v-text="msg.receiveTime"/>
                 </div>
               </li>
diff --git a/project/qujing/app/AppConflictMediation/components/Detail.vue b/project/qujing/app/AppConflictMediation/components/Detail.vue
index 224e8e82..9a66974a 100644
--- a/project/qujing/app/AppConflictMediation/components/Detail.vue
+++ b/project/qujing/app/AppConflictMediation/components/Detail.vue
@@ -26,19 +26,20 @@
         <div class="rightZone">
           <ai-card title="办理进度">
             <template #content>
-              <el-steps direction="vertical" :active="1">
-                <el-step v-for="(item, i) in processList" :key="i"
-                         :title="item.systemExplain" :description="item.doTime">
+              <el-steps direction="vertical">
+                <el-step v-for="(item, i) in processList" :key="i" :title="item.systemExplain" :description="item.doTime">
                   <template #title>
-                    <h2 class="step-title" style="font-weight: 500; font-size: 14px;">
-                      {{ item.user }}
-                      {{ item.title }}
-                    </h2>
+                    <div flex>
+                      <ai-avatar type="circle">{{ item.user }}</ai-avatar>
+                      <div class="fill mar-l8">
+                        <h2 class="step-title" v-text="item.title"/>
+                        <p class="color-999 font-14">{{ item.doTime }}</p>
+                      </div>
+                    </div>
                   </template>
                   <template #description>
-                    <p style="color: #888; margin: 0 4px 10px 0; font-size: 14px;">{{ item.doTime }}</p>
-                    <div style="color: #444;margin-bottom: 10px;" v-if="item.doExplain">{{ item.doExplain }}</div>
-                    <ai-uploader :instance="instance" disabled v-model="item.files"></ai-uploader>
+                    <div class="color-444 mar-b10" v-if="item.doExplain" v-text="item.doExplain"/>
+                    <ai-uploader :instance="instance" disabled v-model="item.files"/>
                   </template>
                 </el-step>
               </el-steps>
@@ -153,6 +154,7 @@ export default {
 
   .step-title {
     color: #555;
+    font-size: 14px;
   }
 
   .detail-content__wrapper {
diff --git a/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue b/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
index fb3bc97e..e240436b 100644
--- a/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
+++ b/project/xiushan/apps/AppNativeAppVersion/AppNativeAppVersion.vue
@@ -46,7 +46,7 @@
               :label="item.label"
               :align="item.align"
               :width="item.width">
-            <div class="nowarp-text" slot-scope="{row}">
+            <div class="nowrap-text" slot-scope="{row}">
               {{ row[item.prop] || "-" }}
             </div>
           </el-table-column>
diff --git a/ui/lib/styles/common.scss b/ui/lib/styles/common.scss
index 7413a2e9..b6b38e81 100644
--- a/ui/lib/styles/common.scss
+++ b/ui/lib/styles/common.scss
@@ -17,11 +17,20 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 /**
 常用内外边距样式
  */
-@each $v in (8, 10, 16, 20, 32, 48, 56, 64, 80) {
+@each $v in (333, 666, 888, 999, '26f', 'f46') {
+  .color-#{$v} {
+    color: \##{$v};
+  }
+}
+
+@each $v in (8, 10, 12, 14, 16, 20, 32, 48, 56, 64, 80) {
   //gap
   .gap-#{$v} {
     gap: #{$v}px
   }
+  .font-#{$v} {
+    font-size: #{$v}px;
+  }
   @each $padMar, $pm in (mar:margin, pad:padding) {
     .#{$padMar}-#{$v} {
       #{$pm}: #{$v}px
@@ -58,7 +67,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 /**
   不换行文本
  */
-.nowarp-text {
+.nowrap-text {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
diff --git a/ui/packages/common/AiArea.vue b/ui/packages/common/AiArea.vue
index 806912d6..dc9cf9d6 100644
--- a/ui/packages/common/AiArea.vue
+++ b/ui/packages/common/AiArea.vue
@@ -6,7 +6,7 @@
           <i style="font-size: 16px" class="iconfont iconLocation"/>
           切换地区
         </div>
-        <div class="content nowarp-text fill" v-text="fullName"/>
+        <div class="content nowrap-text fill" v-text="fullName"/>
         <i class="iconfont iconChange pad-r10"/>
       </el-row>
     </div>
diff --git a/ui/packages/common/AiAvatar.vue b/ui/packages/common/AiAvatar.vue
index 259b9a93..2761b3e4 100644
--- a/ui/packages/common/AiAvatar.vue
+++ b/ui/packages/common/AiAvatar.vue
@@ -1,8 +1,8 @@
 <template>
   <section class="AiAvatar">
-    <el-row type="flex">
+    <el-row type="flex" v-if="type=='rect'">
       <div class="image-box">
-        <el-image v-if="value" :src="value" :preview-src-list="preview?[value]:null"></el-image>
+        <el-image v-if="value" :src="value" :preview-src-list="preview?[value]:null"/>
         <div style="margin: 36px auto;" v-else>
           <i class="iconfont iconProfile_Picture"></i>
           <div style="color: #666;font-size: 12px;">暂无照片</div>
@@ -17,6 +17,9 @@
         </el-upload>
       </div>
     </el-row>
+    <el-avatar v-else-if="type=='circle'" :src="value">
+      <slot v-if="!value"/>
+    </el-avatar>
   </section>
 </template>
 
@@ -32,7 +35,8 @@ export default {
     instance: Function,
     editable: {type: Boolean, default: true},
     bid: String,
-    preview: {type: Boolean, default: true}
+    preview: {type: Boolean, default: true},
+    type: {default: "rect"}
   },
   data() {
     return {
@@ -48,7 +52,6 @@ export default {
         formData.append('bizId', this.bid)
         formData.append('bizType', '2')
         formData.append('file', this.file)
-        console.log(this.file)
         this.instance.post("/admin/file/add", formData).then(res => {
           if (res.data) {
             const fileInfo = res.data[0]
@@ -73,6 +76,10 @@ export default {
     color: #89b;
   }
 
+  :deep(.el-avatar) {
+    background: #26f;
+  }
+
   .image-box {
     width: 104px !important;
     height: 120px;
diff --git a/vue.config.js b/vue.config.js
index d6a00e13..61814631 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -57,7 +57,7 @@ module.exports = {
     proxy: {
       //设置代理,可解决跨5
       '/lan': {
-        target: 'http://192.168.1.87:39010',
+        target: 'http://192.168.1.87:9000',
         changeOrigin: true,
         pathRewrite: {
           //地址重写