From 46a4255840059622b58612efd3b4c931972e5f0d Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Mon, 15 May 2023 17:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9=20=E5=A2=9E=E5=8A=A0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icon/svg/time.svg             |  1 +
 src/views/Report/ReportDetail.vue | 32 ++++++++++++++++++-------------
 src/views/Report/ReportList.vue   |  8 ++++----
 3 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 src/icon/svg/time.svg

diff --git a/src/icon/svg/time.svg b/src/icon/svg/time.svg
new file mode 100644
index 0000000..626cd69
--- /dev/null
+++ b/src/icon/svg/time.svg
@@ -0,0 +1 @@
+<svg t="1684140839559" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16762" width="200" height="200"><path d="M896 1024h-768A128 128 0 0 1 0 896v-682.666667A128 128 0 0 1 128 85.333333H256V42.666667a42.666667 42.666667 0 0 1 85.333333 0V85.333333h341.333334V42.666667a42.666667 42.666667 0 0 1 85.333333 0V85.333333h128A128 128 0 0 1 1024 213.333333v682.666667a128 128 0 0 1-128 128zM85.333333 386.133333V896A42.666667 42.666667 0 0 0 128 938.666667h768a42.666667 42.666667 0 0 0 42.666667-42.666667V386.133333H85.333333z m0-85.333333h853.333334V213.333333A42.666667 42.666667 0 0 0 896 170.666667H768v42.666666a42.666667 42.666667 0 0 1-85.333333 0V170.666667H341.333333v42.666666a42.666667 42.666667 0 0 1-85.333333 0V170.666667H128A42.666667 42.666667 0 0 0 85.333333 213.333333v87.466667zM456.533333 808.106667a42.666667 42.666667 0 0 1-29.013333-11.52l-115.626667-108.8a42.865778 42.865778 0 0 1 58.88-62.293334l85.333334 80.64L652.8 512a42.666667 42.666667 0 0 1 59.733333 60.586667l-225.706666 222.72a42.666667 42.666667 0 0 1-30.293334 12.8z" fill="#555" p-id="16763"></path></svg>
diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue
index 6e1cb50..7f87f22 100644
--- a/src/views/Report/ReportDetail.vue
+++ b/src/views/Report/ReportDetail.vue
@@ -75,11 +75,10 @@
       </div>
     </div>
     <div class="juggle_box showLimit">
-      <el-row>
-        <el-col :span="1">
-          <span>评论</span>
-        </el-col>
-        <el-col :span="21">
+      <span >评论</span>
+      <el-row style="margin-top: 5px">
+
+        <el-col :span="22">
           <el-input type="textarea" v-model="comment" maxlength="1000" show-word-limit></el-input>
         </el-col>
         <el-col :span="2">
@@ -98,7 +97,10 @@
         <div class="juggle_right">
           <div class="content">{{ item.comment }}</div>
           <div class="bottom">
-            <div class="time">{{ item.createTime && formatDate2(item.createTime) }}</div>
+            <div class="time">
+              <svg-icon icon-class="time"  style="font-size: 20px"
+                        class-name="icon"></svg-icon>
+              {{ item.createTime && formatDate2(item.createTime) }}</div>
             <el-button class="delbtn" size="medium" plain type="primary" v-if="item.userId==userId || isAdmin"
                        @click="delJugg(item.id)">删除
             </el-button>
@@ -140,8 +142,8 @@ export default {
         pageSize: 5,
 
       },
-      userId: this.$store.getters.userInfo.USID,
-      userName: this.$store.getters.userInfo.USNAME,
+      userId: this.$store.getters.userInfo.usid,
+      userName: this.$store.getters.userInfo.usname,
     }
   },
   methods: {
@@ -268,7 +270,7 @@ export default {
     getReportDetail() {
       this.$api.report.getReportDetail(this.reportId).then(res => {
         this.row = res.data
-        this.isAdmin = this.$store.getters.userInfo.userId==this.row.createUserId
+        this.isAdmin = this.$store.getters.userInfo.usid==this.row.createUserId
         // 需要给分数/2
         this.previewRow()
       })
@@ -434,6 +436,7 @@ export default {
         .content {
           width: 100%;
           color: #434343;
+          margin-bottom: 5px;
         }
 
         .bottom {
@@ -443,16 +446,16 @@ export default {
           width: calc(100% - 40px);
           bottom: 10px;
           left: 20px;
-          height: 30px;
+          height: 35px;
           color: #434343;
 
           .time {
-            line-height: 30px;
-            color: #ccc;
+            line-height: 35px;
+            color: #858585;
           }
 
           .delbtn {
-            vertical-align: center;
+            //vertical-align: center;
           }
         }
       }
@@ -472,4 +475,7 @@ export default {
 .pointclick {
   cursor: pointer;
 }
+.showLimit ::v-deep .el-textarea .el-input__count{
+  width: 98%;
+}
 </style>
diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue
index e810ed8..4138641 100644
--- a/src/views/Report/ReportList.vue
+++ b/src/views/Report/ReportList.vue
@@ -122,9 +122,9 @@
             <vxe-column show-overflow show-header-overflow field="uploader" title="上传人"></vxe-column>
             <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
               <template #default="{ row }">
-                <el-button type="text" v-if="isAdmin ||row.power == 1 ||row.power == 2" @click="goReportDetail(row)">预览</el-button>
-                <el-button type="text" v-if="isAdmin || row.power == 3 || row.power == 2 " @click="downloadRow(row)">下载</el-button>
-                <el-button type="text" v-if="!isAdmin && row.power !== 2" @click="permissionApp(row)">申请权限</el-button>
+                <el-button type="text" v-if="row.power == 1 ||row.power == 2" @click="goReportDetail(row)">预览</el-button>
+                <el-button type="text" v-if="row.power == 3 || row.power == 2 " @click="downloadRow(row)">下载</el-button>
+                <el-button type="text" v-if=" row.power !== 2" @click="permissionApp(row)">申请权限</el-button>
 
               </template>
             </vxe-column>
@@ -473,7 +473,7 @@ export default {
   created() {
     this.init()
     // 判断当前人是不是管理员
-    this.isAdmin = this.$store.getters.userInfo.roleIdList.indexOf('35LLRCAQ8D') > -1
+    // this.isAdmin = this.$store.getters.userInfo.levelId <= 0.5
   }
 }
 </script>