Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/assets/less/base.css

@@ -11,8 +11,8 @@ html * {
 }
 html,
 body {
-  height: 100%;
-  min-height: 100%;
+  /* height: 100%; */
+  /* min-height: 100%; */
   font-family: "Microsoft Yahei", "Helvetica Neue", Helvetica, STHeiTi, Arial, sans-serif;
 }
 body {

attendance-performance-manager-ui/admin/src/assets/less/base.less

@@ -13,13 +13,13 @@ html * {
 
 html,
 body {
-  height: 100%;
-  min-height: 100%;
+  // height: 100%;
+  // min-height: 100%;
   font-family: "Microsoft Yahei", "Helvetica Neue", Helvetica, STHeiTi, Arial,
     sans-serif;
 }
 body {
-  overflow-y: scroll;
+  // overflow-y: scroll;
 }
 body,
 div,

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -205,10 +205,22 @@ export default {
           <el-tag type={"success"} size="mini">
             {content}
           </el-tag>
-        ) : row.subAddType == 1 && column.label.includes("分值") ? (
-          <p>{content}</p>
-        ) : row.subAddType == 2 && column.label.includes("分值") ? (
-          <p>{-content}</p>
+        ) : row.checkStatus == 1 || row.processStatus == 1 ? (
+          row.subAddType == 1 && column.label.includes("分值") ? (
+            <el-link type={"info"}>(+{content})</el-link>
+          ) : row.subAddType == 2 && column.label.includes("分值") ? (
+            <el-link type={"info"}>({-content})</el-link>
+          ) : (
+            <p>{content}</p>
+          )
+        ) : row.checkStatus == 2 || row.processStatus == 2 ? (
+          row.subAddType == 1 && column.label.includes("分值") ? (
+            <el-link>+{content}</el-link>
+          ) : row.subAddType == 2 && column.label.includes("分值") ? (
+            <el-link>{-content}</el-link>
+          ) : (
+            <p>{content}</p>
+          )
         ) : (
           <p>{content}</p>
         )
@@ -330,7 +342,7 @@ export default {
     },
     // 格式化单元格数据
     formatterDate(row, column) {
-      console.log("date:",row,column)
+      // console.log("date:",row,column)
       return formatterDate(row, column);
     },
     // 格式化单元格数据 只要年月日
@@ -565,7 +577,7 @@ export default {
     },
     // 查看
     toView(row, query) {
-      console.log(this.pageInfo.view);
+      // console.log(this.pageInfo.view);
       this.$router.push({
         path: this.pageInfo.view,
         query: Object.assign({}, { id: row.id }, query),

attendance-performance-manager-ui/admin/src/components/DataTable.vue

@@ -13,7 +13,6 @@
     :empty-text="emptytxt ? emptytxt : emptyText"
     border
     style="width: 100%"
-    height="530"
   >
     <el-table-column
       v-for="column in columns"

attendance-performance-manager-ui/admin/src/components/DataTreeTable.vue

@@ -8,7 +8,6 @@
       :row-class-name="tableRowClassName"
       :default-expand-all="expand"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-      height="520"
     >
 
  <el-table-column

attendance-performance-manager-ui/admin/src/components/Header.vue

@@ -226,7 +226,7 @@ export default {
     }
   }
   .controllBar {
-    background-color: rgba(170, 170, 170, 0.4);
+    background-color: rgba(255, 255, 255, 0.2);
     width: 120px;
     height: 44px;
     line-height: 44px;

attendance-performance-manager-ui/admin/src/views/Layout.vue

 <template>
   <div :style="menuPageCss" class="pages page-layout">
-    <LayoutHeader
-      v-if="menuPage !== 'left'"
-      @changePath="changePath"
-    ></LayoutHeader>
-    <LayoutHeaderLeft
-      @toggle="toggle"
-      :isOpen="isOpen"
-      v-if="menuPage === 'left'"
-    />
-    <div style="padding:15px">
+    <LayoutHeader v-if="menuPage !== 'left'" @changePath="changePath"></LayoutHeader>
+    <LayoutHeaderLeft @toggle="toggle" :isOpen="isOpen" v-if="menuPage === 'left'" />
+    <div class="layout">
       <router-view :class="{ active: !isOpen }" />
     </div>
   </div>
@@ -57,6 +50,12 @@ export default {
 </script>
 
 <style lang="less">
+.layout {
+  padding: 15px 15px 0 15px;
+  box-sizing: border-box;
+
+}
+
 .page {
   min-height: calc(100vh - 100px);
   width: 100%;
@@ -65,12 +64,32 @@ export default {
   // var(--padding-top) 5px 5px 5px;
   // margin-left: 60px;
   padding: 10px;
+
   &.active {
     margin-left: var(--margin-left);
   }
 }
+
 .page-layout {
   background: #eee;
+  height: 100vh;
+  overflow: auto;
 }
 
+/* 侧边滚动条 */
+.page-layout::-webkit-scrollbar {
+  width: 3px;
+}
+
+/* 滚动条上的滚动滑块 */
+.page-layout::-webkit-scrollbar-thumb {
+  background: #CCCCCC;
+  border-radius: 4px;
+}
+
+/* 滚动条轨道 */
+.page-layout::-webkit-scrollbar-track {
+  background: #EEEEEE;
+  border-radius: 4px;
+}
 </style>

attendance-performance-manager-ui/admin/src/views/attendance/class/dialogshow.vue

@@ -239,7 +239,6 @@
                         return
                     }
                     if(arr.length > 1 && index>0){
-                        console.log(11111)
                         // 上一次比较
                         let lastoffTime = transFormMinut(arr[index-1].offWorkDate) +
                         transFormMinut(arr[index - 1 ].offWorkDateAfter)

attendance-performance-manager-ui/admin/src/views/check/attend/record/drawershow.vue

@@ -69,6 +69,16 @@
               {{ form.subAddType == 1 ? "加分人员：" : "扣分人员：" }}
               {{ form.deductPerson ? form.deductPerson : "--" }}</el-col
             >
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12"
               >图片凭证：
 

attendance-performance-manager-ui/admin/src/views/check/complain/record/drawershow.vue

@@ -83,6 +83,16 @@
 
               {{ form.deductTime ? form.deductTime : "--" }}</el-col
             >
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12"
               >图片凭证：
               <el-image

attendance-performance-manager-ui/admin/src/views/check/effect/record/drawershow.vue

@@ -60,7 +60,15 @@
             >
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+            <el-col :span="12">
               图片凭证：
               <el-image
                 v-if="form.filePaths"

attendance-performance-manager-ui/admin/src/views/check/gowork/record/drawershow.vue

@@ -62,7 +62,15 @@
             >
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+            <el-col :span="12">
               图片凭证：
               <el-image
                 v-if="form.filePaths"

attendance-performance-manager-ui/admin/src/views/check/other/record/drawershow.vue

@@ -58,7 +58,15 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24"
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
+            <el-col :span="12"
               >图片凭证：
               <el-image
                 v-if="form.filePaths"

attendance-performance-manager-ui/admin/src/views/check/review/record/drawershow.vue

@@ -63,6 +63,14 @@
           </el-row>
 
           <el-row>
+            <el-col :span="12">
+              巡查人员：
+              {{
+                form.createUserId
+                  ? util_formatter("createUserId", form.createUserId)
+                  : "--"
+              }}
+            </el-col>
             <el-col :span="12"
               >图片凭证：
               <el-image
@@ -414,6 +422,7 @@ export default {
       kaoqinCateArr: [],
       kaoqinArr: [],
       urls: { saveUrl: "/check/review/record/examine" }, //重写核查地址
+      baseUrl: process.env.VUE_APP_API_BASE_URL + "/",
     };
   },
 

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -4,6 +4,7 @@
         <el-button class="backBtn" size="small" @click="$router.back()">返回上一级</el-button>
         <el-tabs v-model="tabs">
             <el-tab-pane label="设计问卷" name="1">
+                <!-- 步骤1 填写问卷名称 -->
                 <div style="width: 800px;margin: 100px auto;" v-show="step">
                     <el-form :model="titleForm" :rules="titleRules" ref="titleForm">
                         <el-form-item label="问卷名称：" prop="title" label-width="125px">
@@ -20,20 +21,22 @@
                         </div>
                     </el-form>
                 </div>
+                <!-- 动态表单配置 -->
                 <div v-show="!step">
                     <fc-designer style="height: 79vh;" ref="designer">
                         <template slot="handle">
                             <ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small"
                                 @click="issueBtn" round>问卷发布
                             </ElButton>
-                            <!-- <ElButton style="margin-left: 10px;" icon="el-icon-upload" type="primary" size="small"
+                            <!-- <ElButton style="margin-left: 10px;" icon="el-icon-position" type="warning" size="small"
                                 @click="issueBtn" round>外部链接
                             </ElButton> -->
-                            <ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>手机模拟预览
+                            <ElButton icon="el-icon-view" type="success" size="small" @click="showDrawer" round>手机预览
                             </ElButton>
                         </template>
                     </fc-designer>
                 </div>
+                <!-- 手机模拟预览 -->
                 <el-drawer :visible.sync="drawer" title="预览">
                     <div class="showPhone">
                         <div class="phone">
@@ -44,7 +47,7 @@
                         </div>
                     </div>
                 </el-drawer>
-
+                <!-- 问卷发布弹出框 -->
                 <el-dialog title="问卷发布" :visible.sync="issueDialog" width="30%" top="25vh">
                     <el-form :model="issueForm" :rules="issueRules" ref="issueForm">
                         <el-form-item label="问卷封面：" label-width="125px">
@@ -75,8 +78,8 @@
                         </div>
                     </el-form>
                 </el-dialog>
-
-                <el-dialog title="人员选择" :visible.sync="treeDialog">
+                <!-- 人员选择弹出框 -->
+                <el-dialog title="人员选择" :visible.sync="treeDialog" width="40%">
                     <div class="treeDialog">
                         <el-tree class="treeCss" :data="treeData" node-key="id" :props="defaultProps"
                             @node-click="handleNodeClick"></el-tree>

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/components/BarCharts.vue

@@ -70,13 +70,27 @@ export default {
             color: "#000",
           },
         },
+        dataZoom: [
+          {
+            show: true,
+            realtime: true,
+            start: 0,
+            end: 100
+          },
+          {
+            type: 'inside',
+            realtime: true,
+            start: 0,
+            end: 100
+          }
+        ],
         tooltip: {},
         xAxis: {
           data: this.chartsData.map(i => {
             // console.log(i)
-            if(this.title == "申诉次数部门排名TOP20") return i.deptName 
-            if(this.title == "申诉次数个人排名TOP20") return i.staffName 
-            if(this.title == "申诉次数规则排名TOP20") return i.ruleName 
+            if (this.title == "申诉次数部门排名TOP20") return i.deptName
+            if (this.title == "申诉次数个人排名TOP20") return i.staffName
+            if (this.title == "申诉次数规则排名TOP20") return i.ruleName
             // return i.ruleName || i.deptName || i.staffName
           })
           // this.title == "申诉次数部门排名TOP20"
@@ -151,7 +165,7 @@ export default {
         grid: {
           left: "5%",
           right: "4%",
-          bottom: "2%",
+          // bottom: "1%",
           containLabel: true,
         },
         // color:[ "#61a0a8",],

attendance-performance-manager-ui/admin/src/views/staff/list.vue

@@ -52,6 +52,7 @@
             :expand-on-click-node="false"
             :render-content="renderContent"
             @node-click="handleNodeClick"
+            :default-expand-all="true"
           >
           </el-tree>
         </el-scrollbar>
@@ -151,13 +152,13 @@
     <!-- 花名册记录查看 -->
     <el-drawer title="历史花名册" :visible.sync="drawerhistory" direction="rtl">
       <div class="hisList">
-        <div class="list mt10" v-for="item in 10" :key="item">
+        <div class="list mt10" v-for="item in 1" :key="item">
           <div class="flex flex-align-center flex-pack-justify">
             <div>花名册记录</div>
-            <el-button type="text">查看</el-button>
+            <!-- <el-button type="text">查看</el-button> -->
           </div>
           <div class="times">
-            导出时间：2020-08-13
+            导出时间：2023-07-19
           </div>
         </div>
       </div>