Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/assets/styles/index.scss

@@ -37,7 +37,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   color: #000;
-  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: Arial, sans-serif;
   /*框架自带字体*/
   //font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
   //  Microsoft YaHei, Arial, sans-serif;
@@ -45,10 +45,10 @@ body {
 
 .el-button{
   //font-weight: 400;
-  font-family: SYBold,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family:  Arial, sans-serif;
 }
 .el-button--text{
-  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: Arial, sans-serif;
 }
 .el-table__header-wrapper{
   //font-weight: normal;

src/components/elDialog/dialog.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog center v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
+    <el-dialog  v-dialogDrag v-bind="$attrs" v-on="$listeners" @close="handleClose" :close-on-click-modal="false" class="centerDialog">
       <slot></slot>
       <slot name="footer" class="dialog-footer"></slot>
     </el-dialog>

src/components/table/gx.search.table.vue

@@ -26,6 +26,7 @@
     <!--  -->
     <el-table ref="$table"
               class="w-full"
+              size="small"
               :default-expand-all="expand"
               @sort-change="onSort"
               v-if="$slots['columns']"

src/views/core/accessPlan/index.vue

@@ -442,6 +442,7 @@
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
+ 
       </div>
     </DialogCom>
     <DialogThreeState ref="DialogThreeState"> </DialogThreeState>
@@ -578,6 +579,7 @@ export default {
       if (value <= this.initNum) this.form.planFrequency = this.initNum;
       //value = parseInt(value);
     },
+
     getPageIndex($index) {
       //表格序号
       return (

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

@@ -108,6 +108,7 @@
           <el-table
             border
             height="646"
+            size="small"
             v-loading="loading"
             :data="drillDictionaryList"
             @selection-change="handleSelectionChange"

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

@@ -132,6 +132,7 @@
           <el-table
             height="646"
             border
+            size="small"
             :data="planList"
             @selection-change="handleSelectionChange"
             row-key="id"

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

@@ -126,6 +126,7 @@
           <el-table
             border
             height="646"
+            size="small"
             v-loading="loading"
             :data="eduTaskList"
             @selection-change="handleSelectionChange"
@@ -366,6 +367,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/core/knowledge/index.vue

@@ -61,6 +61,7 @@
     </div>
     <el-table
       height="646"
+      size="small"
       v-loading="loading"
       :data="knowledgeList"
       @selection-change="handleSelectionChange">

src/views/core/outIn/approve/dialog.approve.letter.detail.vue

@@ -42,7 +42,7 @@
             </h3>
           </el-col>
         </el-row>
-        <el-table border :data="formData.userInfos" height="300">
+        <el-table border size="small" :data="formData.userInfos" height="300">
           <el-table-column label="序号"  align="center"  type="index" width="70" />
           <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
           <el-table-column label="来访人员" width="100" align="center" prop="userName" />

src/views/core/outIn/approve/dialog.approve.letter.vue

@@ -69,7 +69,7 @@
                 </h3> 
             </el-col>              
           </el-row>   
-          <el-table border :data="formData.userInfos" height="300">
+          <el-table border size="small" :data="formData.userInfos" height="300">
                   <el-table-column label="序号"  align="center"  type="index" width="70" />
                   <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
                   <el-table-column label="来访人员" width="100" align="center" prop="userName" />

src/views/core/outIn/approve/index.vue

@@ -54,8 +54,8 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
       </div>
-      <el-table v-loading="loading" :data="letterList" border height="646">
-        <el-table-column align="center" label="介绍信编号" prop="letterNo" width="120">
+      <el-table v-loading="loading" :data="letterList" border height="646" size="small">
+        <el-table-column align="center" label="介绍信编号" prop="letterNo" width="200">
         </el-table-column>
         <!-- <el-table-column label="序号"  align="center"  type="index" width="70" /> -->
         <el-table-column align="center" label="介绍信类型" prop="type" width="150">

src/views/core/outIn/letter/dialog.addletter.vue

@@ -106,7 +106,7 @@
             </el-col>
           </el-row>
 
-          <el-table border :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
+          <el-table border size="small" :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
             <el-table-column label="序号"  align="center"  type="index" width="70" />
             <el-table-column label="来访单位" width="100" align="center" prop="companyName" />
             <el-table-column label="来访人员" width="100" align="center" prop="userName" />

src/views/core/outIn/letter/dialog.letter.detail.vue

@@ -97,7 +97,7 @@
             </h3>
           </el-col>
         </el-row>
-        <el-table border :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
+        <el-table border size="small" :data="formData.userInfos" max-height="500" style="margin-bottom: 10px;">
           <el-table-column label="序号"  align="center"  type="index" width="70" />
           <el-table-column label="来访单位" width="150" align="center" prop="companyName" />
           <el-table-column label="来访人员" width="100" align="center" prop="userName" />
@@ -123,7 +123,7 @@
             </h3>
           </el-col>
         </el-row>
-        <el-table border :data="formData.approveInfos" max-height="500" style="margin-bottom: 10px;">
+        <el-table border size="small" :data="formData.approveInfos" max-height="500" style="margin-bottom: 10px;">
           <el-table-column label="机构名称" align="center" prop="orgName" />
           <el-table-column label="审批状态" align="center" prop="approveStatus" >
             <template slot-scope="scope">

src/views/core/outIn/letter/index.vue

@@ -52,8 +52,8 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
           </div>
-    <el-table v-loading="loading" height="646" border :data="letterList">
-      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="170">
+    <el-table v-loading="loading" height="646" border size="small" :data="letterList">
+      <el-table-column label="介绍信编号" align="center" prop="letterNo" width="200">
       </el-table-column>
 
       <el-table-column label="接待机构"  :show-overflow-tooltip="true" align="center"  prop="receptionOrgNames" />

src/views/core/outIn/outInLog/index.vue

@@ -102,6 +102,7 @@
             v-loading="loading"
             height="646"
             border
+            size="small"
             :data="outInRecrodList"
           >
             <el-table-column
@@ -160,7 +161,7 @@
             <el-table-column
               label="出入时间"
               align="center"
-              width="360"
+              width="420"
             >
               <template slot-scope="scope">
                 <span

src/views/core/safeLevel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-table border height="760" v-loading="loading" :data="safeLevelList" @selection-change="handleSelectionChange">
+    <el-table border height="760" size="small" v-loading="loading" :data="safeLevelList" @selection-change="handleSelectionChange">
 
       <el-table-column label="安全等级" align="center" prop="levelName"/>
       <el-table-column label="风险等级" align="center" prop="riskLevel">

src/views/core/task/index.vue

@@ -197,6 +197,13 @@
                   v-hasPermi="['core:task:query']"
                   >详情</el-button
                 >
+                <el-button
+                  icon="el-icon-document-copy"
+                  type="text"
+                  v-if="scope.row.pdfUrl"
+                  @click="onDown(scope.row.pdfUrl)"
+                  >登记簿
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -304,6 +311,9 @@ export default {
         console.log(res,'res111')
       });*!/
     },*/
+    async onDown(pdfUrl) {
+      window.open(pdfUrl);
+    },
     getDefaultOrg(org) {
       this.orgName = org.name;
       this.selectedOrgName = org.shortName;

src/views/core/weather/index.vue

@@ -59,7 +59,7 @@
       </div>
 
 
-      <el-table v-loading="loading" border :data="weatherList" height="646">
+      <el-table v-loading="loading" border :data="weatherList" height="646" size="small">
         <el-table-column align="center" label="预警标题" prop="alarmTitle"/>
         <el-table-column align="center" label="预警城市" prop="city" width="140"/>
         <el-table-column align="center" label="预警区域" prop="area" width="100"/>

src/views/dashboard/PanelGroup.vue

@@ -1,15 +1,19 @@
 <template>
     <div class="panel-group">
-        <div class="card-panel" @click="handleClick(v)" v-for="(v,i) in menusList" :key="i">
-          <div class="card-panel-icon-wrapper" :class="`color${v.meta.colorIndex}`" :style="{color:v.meta.color}">
-            <svg-icon class-name="card-panel-icon" v-if="v.meta.icon" :icon-class="v.meta.icon"/>
-          </div>
-          <div class="card-panel-description">
-            <div class="card-panel-text">
-              {{v.meta.title}}
+      <el-row :gutter="20">
+        <el-col class="item-col" :span="2.18" v-for="(v,i) in menusList" :key="i">
+          <div class="card-panel" @click="handleClick(v)" >
+            <div class="card-panel-icon-wrapper" :class="`color${v.meta.colorIndex}`" :style="{color:v.meta.color}">
+              <svg-icon class-name="card-panel-icon" v-if="v.meta.icon" :icon-class="v.meta.icon"/>
+            </div>
+            <div class="card-panel-description">
+              <div class="card-panel-text">
+                {{v.meta.title}}
+              </div>
             </div>
           </div>
-        </div>
+        </el-col>
+      </el-row>
     </div>
 </template>
 
@@ -92,8 +96,13 @@ export default {
   //grid-template-columns:repeat(auto-fill, 130px);
   //grid-row-gap: 20px;
   //grid-column-gap: 20px;
-  justify-content: space-between;
+  justify-content: flex-start;
+  //flex-wrap: wrap;
+  .item-col{
+    margin: 10px 0;
+  }
   .card-panel {
+    width: 126px;
     cursor: pointer;
     font-size: 12px;
     position: relative;
@@ -102,6 +111,10 @@ export default {
     background: #fff;
     box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
     border-color: rgba(0, 0, 0, .05);
+    //margin-bottom: 20px;
+    &:last-child{
+      margin-right: 0;
+    }
     &:hover {
       .card-panel-icon-wrapper {
         color: #fff!important;

src/views/index.vue

@@ -13,11 +13,11 @@
 
 
       <!--  待办事项  -->
-      <el-col :xs="24" :sm="12" :md="13"  :lg="10">
+      <el-col :xs="24" :sm="12" :md="9"  :lg="9">
         <el-card class="card-group">
           <p class="card-title">待办事项</p>
           <el-row :gutter="20">
-            <el-col :xs="24" :sm="24" :md="12"  :lg="12" v-for="(v,i) in dataList" :key="i">
+            <el-col :xs="24" :sm="12" :md="12"  :lg="12" v-for="(v,i) in dataList" :key="i">
               <div class="card-panel">
                 <div class="card-panel-icon-wrapper icon-people">
 <!--                  <svg-icon icon-class="example" class-name="card-panel-icon" />-->
@@ -41,10 +41,8 @@
         </el-card>
       </el-col>
 
-
-
       <!--  其他  -->
-      <el-col :xs="24" :sm="12" :md="11"  :lg="14">
+      <el-col :xs="24" :sm="12" :md="15"  :lg="15">
         <el-card class="chart-wrapper">
           <el-tabs type="border-card">
             <el-tab-pane label="通知公告">
@@ -60,7 +58,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 +81,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 +123,7 @@ export default {
           name:'预案演练',
           path:'/drillTask',
           query:{
-            status:0
+            status:'0'
           }
         },
         {
@@ -140,6 +140,9 @@ export default {
         {
           name:'隐患问题',
           path:'/question/list',
+          query: {
+            confirmStatus: 0
+          }
         },
         {
           name:'隐患整改',
@@ -203,7 +206,7 @@ export default {
 <style lang="scss">
 .home-container{
   .el-card__body{
-    padding: 10px 20px 20px 20px;
+    padding: 10px 20px 10px 20px;
   }
   .card-group{
     .el-card__body {
@@ -293,7 +296,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 +310,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 +399,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/monitor/job/index.vue

@@ -91,7 +91,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
     </div>
-    <el-table v-loading="loading" border height="646" :data="jobList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border height="646" size="small" :data="jobList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="任务编号" width="100" align="center" prop="jobId" />
       <el-table-column label="任务名称" align="center" prop="jobName" :show-overflow-tooltip="true" />

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/registerBook/index.vue

@@ -151,6 +151,7 @@
           <el-table
             border
             height="646"
+            size="small"
             v-loading="loading"
             :data="registerBookList"
             @selection-change="handleSelectionChange"

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/config/index.vue

@@ -103,7 +103,7 @@
     </div>
 
 
-    <el-table height="646" border v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+    <el-table height="646" border size="small" v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="参数主键" align="center" prop="configId" />
       <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />

src/views/system/dept/index.vue

@@ -216,7 +216,7 @@
             ></el-table-column>
             <el-table-column
               label="操作"
-              align="left"
+              align="center"
               width="280"
               class-name="small-padding fixed-width"
             >

src/views/system/device/index.vue

@@ -153,7 +153,7 @@
             <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
             <el-table-column
               label="操作"
-              align="left"
+              align="center"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">

src/views/system/logininfor/index.vue

@@ -97,7 +97,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
     </div>
-    <el-table ref="tables" height="646" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" height="646" border size="small" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="访问编号"  align="center" prop="infoId" />
       <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />

src/views/system/operlog/index.vue

@@ -102,7 +102,7 @@
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
     </div>
-    <el-table ref="tables" border height="646" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table ref="tables" border height="646" size="small" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="50" align="center" />
       <el-table-column label="日志编号" align="center" prop="operId" />
       <el-table-column label="系统模块" align="center" prop="title" />

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();