调整责任书文件不显示问题，调整首页界面调整，修复状态显示问题

src/views/core/drill/task/index.vue

@@ -366,6 +366,16 @@ export default {
     this.getList();
     this.getTaskStatus();
   },
+  beforeRouteEnter(to,from,next){
+    console.log(from,'to')
+    if(from.path === '/home'){
+      next(vm=>{
+        vm.queryParams.status = to.query.status;
+      })
+    }else {
+      next()
+    }
+  },
   computed: {
     ...mapGetters(["orgId", "orgName"]),
   },

src/views/index.vue

@@ -60,7 +60,7 @@
               <div class="tab-panel">
                 <div class="file-item" v-for="(v,i) in fileList" :key="i">
                   <a :href="imageUrl(v.url)" target="_blank">
-                    <i>{{v.name}}</i>
+                    <span><i class="el-icon-document"></i>{{v.name}}</span>
                     <span>{{v.createTime}}</span>
                   </a>
                 </div>
@@ -83,14 +83,16 @@
         <p>{{selectMsg.publishTime}}</p>
         <div class="content-box">
           <p>{{selectMsg.content}}</p>
-          <ul v-if="selectMsg.fileList && selectMsg.fileList.length > 0">
-            <li v-for="(v,i) in selectMsg.fileList" :key="v.url">
-              <a :href="imageUrl(v.url)" target="_blank">
-<!--                <i class="el-icon-document"></i>-->
-                {{v.name}}
-              </a>
-            </li>
-          </ul>
+          <div>
+            附件：
+            <ul v-if="selectMsg.fileList && selectMsg.fileList.length > 0">
+              <li v-for="(v,i) in selectMsg.fileList" :key="v.url">
+                <a :href="imageUrl(v.url)" target="_blank">
+                  <span><i class="el-icon-document"></i>{{v.name}}</span>
+                </a>
+              </li>
+            </ul>
+          </div>
         </div>
       </div>
     </DialogCom>
@@ -123,7 +125,7 @@ export default {
           name:'预案演练',
           path:'/drillTask',
           query:{
-            status:0
+            status:'0'
           }
         },
         {
@@ -140,6 +142,9 @@ export default {
         {
           name:'隐患问题',
           path:'/question/list',
+          query: {
+            confirmStatus: 0
+          }
         },
         {
           name:'隐患整改',
@@ -293,7 +298,7 @@ export default {
   font-size: 15px;
   padding: 0 10px;
   color:#1ea8e9;
-  text-decoration:underline;
+  //text-decoration:underline;
   line-height: 39px;
   >a{
     display: flex;
@@ -307,10 +312,13 @@ export default {
     }
   }
   &:hover{
-    background-color: #6eb9ec;
-    color:#fff;
-    transition: all .38s ease-out;
+    text-decoration:underline;
   }
+  //&:hover{
+  //  background-color: #6eb9ec;
+  //  color:#fff;
+  //  transition: all .38s ease-out;
+  //}
 }
 .card-group {
   margin-top: 20px;
@@ -393,14 +401,19 @@ export default {
       width: 100%;
       color: #777;
     }
-    >ul{
-      font-size: 15px;
-      color:#1ea8e9;
-      >li{
-        margin-bottom: 6px;
-      }
-      >li:hover{
-        text-decoration:underline;
+    >div{
+      >ul{
+        font-size: 15px;
+        margin: 0;
+        color:#1ea8e9;
+        >li{
+          align-items: center;
+          list-style:none;
+          margin-bottom: 4px;
+        }
+        >li:hover{
+          text-decoration:underline;
+        }
       }
     }
   }

src/views/question/list/index.vue

@@ -317,7 +317,16 @@ export default {
   computed: {
     ...mapGetters(["orgId", "userId", "orgName"]),
   },
-  created() {},
+  beforeRouteEnter(to,from,next){
+    console.log(from,'to')
+    if(from.path === '/home'){
+      next(vm=>{
+        vm.queryParams.confirmStatus = to.query.confirmStatus;
+      })
+    }else {
+      next()
+    }
+  },
   methods: {
     dayjs,
     getLabel,

src/views/question/reform/index.vue

@@ -141,7 +141,7 @@
             <el-table-column
               align="center"
               label="隐患描述"
-              prop="questionDesc"            
+              prop="questionDesc"
               show-overflow-tooltip
               v-if="columns[3].visible"
             />
@@ -275,7 +275,16 @@ export default {
   computed: {
     ...mapGetters(["orgId", "userId","orgName"]),
   },
-  created() {},
+  beforeRouteEnter(to,from,next){
+    console.log(from,'to')
+    if(from.path === '/home'){
+      next(vm=>{
+        vm.queryParams.reformStatus = to.query.reformStatus;
+      })
+    }else {
+      next()
+    }
+  },
   methods: {
     dayjs,
     getLabel,

src/views/safetyBook/newBook/dialog.des.vue

@@ -114,25 +114,17 @@
             </el-descriptions-item>
             <el-descriptions-item
               labelClassName="gx_info_label"
-              label="签署文件"
-            >
-              <div
-                v-for="(file, index) in formData.files"
-                :key="index"
-                class="container"
-              >
-                <el-image
-                  class="item"
-                  v-if="isPic(file.url)"
-                  :src="file.url"
-                  :preview-src-list="[file.url]"
-                  fit="contain"
-                ></el-image>
-                <div v-else>
-                  <el-link :href="file.url" :underline="false" target="_blank">
-                    <span class="el-icon-document"> {{ file.name }} </span>
-                  </el-link>
-                </div>
+              label="签署文件">
+              <div class="container">
+                <el-link
+                  :href="imageUrl(file.url)"
+                  v-for="(file, index) in formData.files"
+                  :key="index" :underline="false"
+                  target="_blank">
+                  <span class="el-icon-document file-item">
+                    {{ file.name }}
+                  </span>
+                </el-link>
               </div>
             </el-descriptions-item>
           </el-descriptions>
@@ -151,6 +143,7 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getLabel } from "@/views/commonOption.js";
+import {imageUrl} from "@/utils/ruoyi";
 import {
   listSafetyBook,
   getSafetyBook,
@@ -196,6 +189,7 @@ export default {
     ...mapState([]),
   },
   methods: {
+    imageUrl,
     isPic(url) {
       if (url.endsWith("jpg") || url.endsWith("png")) {
         return true;
@@ -292,16 +286,14 @@ export default {
   }
 }
 .container {
-  height: 50px;
-  display: flex;
-  justify-content: flex-start;
-  .item {
-    width: 50px;
-    height: 100%;
-  }
-  .item >img {
-    width: 100% !important;
-    object-fit: cover !important;
+  .file-item{
+    font-size: 12px !important;
+    line-height: 16px;
+    color:#1ea8e9;
+    margin: 4px 0;
+    &:hover{
+      text-decoration:underline;
+    }
   }
 }
 </style>

src/views/safetyBook/newBook/index.vue

@@ -99,6 +99,8 @@
           ></right-toolbar>
         </el-row>
       </div>
+
+
       <!-- 表格数据 -->
       <el-table
         border
@@ -134,23 +136,18 @@
 
         <el-table-column prop="files" width="400px" label="签署文件">
           <template slot-scope="r">
-            <div
-              v-for="(file, index) in r.row.files"
-              :key="index"
-              class="container"
-            >
-              <el-image style="width: 50px;height: 50px;"
-                class="item"
-                v-if="isPic(file.url)"
-                :src="file.url"
-                :preview-src-list="[file.url]"
-                fit="contain"
-              ></el-image>
-              <div v-else="isPic(file.url)">
-                <el-link :href="file.url" :underline="false" target="_blank">
-                  <span class="el-icon-document"> {{ file.name }} </span>
+            <div class="container">
+<!--              <el-image style="width: 50px;height: 50px;"-->
+<!--                class="item"-->
+<!--                v-if="isPic(file.url)"-->
+<!--                :src="file.url"-->
+<!--                :preview-src-list="[file.url]"-->
+<!--                fit="contain"-->
+<!--              ></el-image>-->
+                <el-link :href="imageUrl(file.url)"  v-for="(file, index) in r.row.files"
+                         :key="index" :underline="false" target="_blank">
+                  <span class="el-icon-document file-item" > {{ file.name }} </span>
                 </el-link>
-              </div>
             </div>
           </template>
         </el-table-column>
@@ -222,6 +219,7 @@ import KFileUpload from "@/components/K-FileUpload/index.vue";
 import tableList from "@/mixins/tableList";
 import orgTree from "@/components/orgTree";
 import dayjs from "dayjs";
+import {imageUrl} from "@/utils/ruoyi";
 export default {
   dicts: ["safety_book_type"],
   name: "safetyBook",
@@ -297,6 +295,7 @@ export default {
     this.getList();
   },
   methods: {
+    imageUrl,
     isPic(url) {
       if (url.endsWith("jpg") || url.endsWith("png")) {
         return true;
@@ -414,4 +413,13 @@ export default {
     width: 264px;
   }
 }
+.file-item{
+  font-size: 12px !important;
+  line-height: 16px;
+  color:#1ea8e9;
+  margin: 4px 0;
+  &:hover{
+    text-decoration:underline;
+  }
+}
 </style>

src/views/safetycheck/task/index.vue

@@ -341,7 +341,7 @@
               align="center"
               min-width="120px"
             >
-              <template slot-scope="r">    
+              <template slot-scope="r">
                 <el-button
                   type="text"
                   @click="showscanRecord(r.row)"
@@ -357,7 +357,7 @@
                   icon="el-icon-view"
                   >详情</el-button
                 >
-                
+
                 <el-button
                   type="text"
                   icon="el-icon-s-check"
@@ -485,6 +485,16 @@ export default {
   computed: {
     ...mapGetters(["orgName", "userId", "roleList", "orgId"]),
   },
+  beforeRouteEnter(to,from,next){
+    console.log(from,'to')
+    if(from.path === '/home'){
+      next(vm=>{
+        vm.queryParams.status = to.query.status;
+      })
+    }else {
+      next()
+    }
+  },
   activated() {
     // console.log("刷新");
     this.getList();

src/views/system/workTimeSet/workTime.vue

@@ -188,8 +188,9 @@
                   size="mini"
                   icon="el-icon-edit-outline"
                   type="text"
-                  v-if="hideEdit(r.row)"
                   v-hasPermi="['system:time:edit']"
+                  v-if="hideEdit(r.row)"
+                  v-show="ifOrg(r.row)"
                   @click="onEditTime(r.row)"
                   >编辑</el-button
                 >
@@ -298,6 +299,9 @@ export default {
     this.getNowTime();
   },
   methods: {
+    ifOrg(row){
+      console.log(row.orgId,this.orgId,'row')
+    },
     getNowTime() {
       const dateObj = new Date(); // 获取当前时间对象
       const year = dateObj.getFullYear(); // 获取年份

src/views/system/workTimeSet/workTimeWeek.vue

@@ -89,10 +89,24 @@
             <el-table-column prop="updateTime" align="center" label="更新时间" width="180"></el-table-column>
             <el-table-column label="操作" align="center"  width="140" >
               <template slot-scope="r">
-                  <el-button size="mini" type="text" v-if="r.row.timeCheck===0||r.row.timeCheck===3" @click="onEdit(r.row)">编辑</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    v-hasPermi="['system:time:edit']"
+                    v-if="r.row.timeCheck===0||r.row.timeCheck===3"
+                    v-show="ifOrg(r.row)"
+                    @click="onEdit(r.row)">
+                    编辑
+                  </el-button>
   <!--                <el-button type="text" v-if="r.row.timeCheck===0" @click="onDelete(r.row.id)">删除</el-button>-->
   <!--                <el-button type="text" v-if="r.row.timeCheck===1||r.row.timeCheck===2" @click="lookItem(r.row)">查看</el-button>-->
-                  <el-button size="mini" type="text" @click="lookItem(r.row)">查看</el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    icon="el-icon-document"
+                    @click="lookItem(r.row)">
+                    查看
+                  </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -190,6 +204,10 @@ export default {
     // });
   },
   methods: {
+    ifOrg(row){
+      console.log(row.orgId,this.orgId,'row')
+      return true
+    },
     getDefaultKey(key) {
       this.queryParams.orgId = key;
       this.getList();