diff --git a/src/views/components/commonDialog.vue b/src/views/components/commonDialog.vue
index 97360ca..07383c4 100644
--- a/src/views/components/commonDialog.vue
+++ b/src/views/components/commonDialog.vue
@@ -162,10 +162,10 @@
                           </template>
 
                           <template v-else-if="item.t_slot === 'examineStatus'">
-                            <span v-if="scope.row[item.t_props]==0">{{ '审核中' }}</span>
+                            <span v-if="scope.row[item.t_props]==0">{{ '待审核' }}</span>
                             <span v-if="scope.row[item.t_props]==1">{{ '通过' }}</span>
                             <span v-if="scope.row[item.t_props]==2">{{ '不通过' }}</span>
-                            <span v-if="scope.row[item.t_props]==3">{{ '待审核' }}</span>
+                            <span v-if="scope.row[item.t_props]==3">{{ '已撤回' }}</span>
                             <span v-else>{{  }}</span>
                           </template>
                         
diff --git a/src/views/dashboard/bottomOne.vue b/src/views/dashboard/bottomOne.vue
index cc8a6f0..e9c0035 100644
--- a/src/views/dashboard/bottomOne.vue
+++ b/src/views/dashboard/bottomOne.vue
@@ -62,7 +62,7 @@ export default {
                 // console.log(this.orgNumBean,22222222222222)
                 let arr = this.handleTree(this.orgNumBean, "orgId");
                 this.treeData = {
-                    orgName:'公司架构',
+                    orgName:'组织架构',
                     orgId:'0',
                     personNum:'',
                     children:arr
diff --git a/src/views/dashboard/topOne.vue b/src/views/dashboard/topOne.vue
index ab9c292..44f8f0e 100644
--- a/src/views/dashboard/topOne.vue
+++ b/src/views/dashboard/topOne.vue
@@ -73,12 +73,12 @@ export default {
             },
             pageData:{},
             todayAbnormalBean:{    
-                lateNum:'1',
-                earlyNum:'1',
-                skippingNum:'1',
-                leaveNum:'1',
-                addressErrorNum:'1',
-                einErrorNum:'1',
+                lateNum:'0',
+                earlyNum:'0',
+                skippingNum:'0',
+                leaveNum:'0',
+                addressErrorNum:'0',
+                einErrorNum:'0',
             }
         }
     },
@@ -123,8 +123,8 @@ export default {
                 title:'今日出勤状态',
                 percentage:this.pageData.todayAttBean.attRate+'%',
                 data:[
-                    {value:Number(this.pageData.todayAttBean.shouldAttNum),name:'应出勤人数'}, 
-                    {value:Number(this.pageData.todayAttBean.actualAttNum),name:'实际出勤人数'} 
+                    {value:Number(this.pageData.todayAttBean.shouldAttNum)||0,name:'应出勤人数'}, 
+                    {value:Number(this.pageData.todayAttBean.actualAttNum)||0,name:'实际出勤人数'} 
                 ],
             }
             var option = {
@@ -167,10 +167,63 @@ export default {
                 }, //提示框，鼠标悬浮交互时的信息提示
                 legend: {
                     left: "center",
+                    orient: 'horizontal',
                     bottom: "5%",
-                    itemGap: 8,
-                    itemWidth: 12,
-                    itemHeight: 12,
+                    itemGap: 80,
+                    icon: 'circle',
+                    itemWidth: 8,
+                    itemHeight: 8,
+                    itemStyle: {
+                        borderColor: '#fff', // 设置边框颜色
+                        borderWidth: 0 // 设置边框宽度为0，即无边框
+                    },
+                    textStyle: {
+                        color: "#333",
+                        rich: {
+                            a: {
+                                verticalAlign: "right",
+                                align: "left",
+                                width: 90,
+                                fontSize: 14,
+                            },
+                            b: {
+                                align: "left",
+                                fontSize: 14,
+                                color: "#ff5722",
+                            },
+                            df: {
+                                align: "left",
+                                fontSize: 16,
+                                fontWeight: "600",
+                                color: "#f7c122",
+                            },
+                            yjf: {
+                                align: "left",
+                                fontSize: 16,
+                                fontWeight: "600",
+                                color: "#6395fa",
+                            }, 
+                        },
+                    },
+                    formatter: (name) => {
+                        let total = 0;
+                        let target;
+                        let className = "b";
+                        for (let i = 0, l = data.data.length; i < l; i++) {
+                            total += Number(data.data[i].value);
+                            if (data.data[i].name == name) {
+                                target = data.data[i].value;
+                            }
+                            if (name == "应出勤人数") {
+                                className = "yjf";
+                            }
+                            if (name == "实际出勤人数") {
+                                className = "df";
+                            }
+                        }
+                        let str = "{a|" + name + "}{" + className + "|" + target +"}";
+                        return str;
+                    },
                 },
                 series: [
                     {
@@ -183,9 +236,10 @@ export default {
                         label: {
                             position: "center",
                             normal: {
-                            show: false,
+                                show: false,
                             },
                         },
+                        
                         data: [
                             { value: data.data[0].value, name: data.data[0].name },
                             { value: data.data[1].value, name: data.data[1].name },
@@ -198,6 +252,12 @@ export default {
                         center: ["50%", "50%"],
                         hoverAnimation: false,
                         color: "#fff",
+                        label: {
+                            position: "center",
+                            normal: {
+                                show: false,
+                            },
+                        },
                         data: [
                             {
                             value: 0,
diff --git a/src/views/dashboard/topTwo.vue b/src/views/dashboard/topTwo.vue
index 13e2eff..8820055 100644
--- a/src/views/dashboard/topTwo.vue
+++ b/src/views/dashboard/topTwo.vue
@@ -31,7 +31,11 @@ export default {
     props: {
         pageData: {
             // required: true,
-            type: Object
+            type: Object,
+            default:{
+                processedData:'0',
+                unProcessedData:'0'
+            }
         },
   
     },
diff --git a/src/views/process/outApply/index.vue b/src/views/process/outApply/index.vue
index a0c739d..5e7d361 100644
--- a/src/views/process/outApply/index.vue
+++ b/src/views/process/outApply/index.vue
@@ -380,6 +380,7 @@ export default {
       console.log(this.orgList)
       this.reset();
       this.open = true;
+      this.isView = false;
       this.title = "新增";
     },
     // 多选框选中数据
@@ -458,7 +459,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const Ids = row.id;
-      this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除该申请？').then(function() {
         return delHoliday(Ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/process/restApply/index.vue b/src/views/process/restApply/index.vue
index 1b8b7a1..85be3e7 100644
--- a/src/views/process/restApply/index.vue
+++ b/src/views/process/restApply/index.vue
@@ -371,6 +371,7 @@
         console.log(this.orgList)
         this.reset();
         this.open = true;
+        this.isView = false;
         this.title = "新增";
       },
       // 多选框选中数据
@@ -449,7 +450,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const Ids = row.id;
-        this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
+        this.$modal.confirm('是否确认删除该申请？').then(function() {
           return delHoliday(Ids);
         }).then(() => {
           this.getList();
diff --git a/src/views/report/attReport/index.vue b/src/views/report/attReport/index.vue
index 0e95b06..038b798 100644
--- a/src/views/report/attReport/index.vue
+++ b/src/views/report/attReport/index.vue
@@ -122,7 +122,7 @@
         @pagination="getList"
       />
 
-    <el-dialog title="批量修改" :visible.sync="open" width="1200px" append-to-body> 
+    <el-dialog title="批量修改" :visible.sync="open" width="1200px" append-to-body @close="cancel"> 
         <el-table v-loading="loading" :data="dialogList" width="100%" height="500px">
             <el-table-column label="序号" type="index" width="55" align="center" fixed/>
             <el-table-column label="姓名" align="center" prop="userName" fixed/>
@@ -315,13 +315,14 @@
         },
         /** 重置按钮操作 */
         resetQuery() {
+            this.dateRange=[]
             this.getWeekDates();
             this.resetForm("queryForm");
             this.handleQuery();
         },
         // 多选框选中数据
-        handleSelectionChange(selection) {
-          this.dialogList = selection;
+        handleSelectionChange(selection) { 
+          this.dialogList=selection.slice();
         },
         openDialog(){
           console.log(this.dialogList)
@@ -334,8 +335,7 @@
         submitEdit(){ 
           let paramList = []
           var index = this.dialogList.findIndex(item => {return !item.toErrorRemake||item.toErrorRemake==""||!item.offErrorRemake||item.offErrorRemake==""})
-          console.log(index)
-          this.$modal.msgSuccess("修改申请提交成功,耐心等待审批，请勿重复提交！");
+      
           if(index>-1){
             // this.$modal.msgSuccess("原因说明不可为空！");
             this.$message({ message: '原因说明不可为空！', type: 'warning' })
@@ -368,9 +368,9 @@
           }
         },
         cancel(){
+            this.getList();
             this.open=false;
         },
-        
         /** 导出按钮操作 */
         handleExport() {
             this.download('system/dict/type/export', {
diff --git a/src/views/report/dayReport/index.vue b/src/views/report/dayReport/index.vue
index 471d5af..a5656d5 100644
--- a/src/views/report/dayReport/index.vue
+++ b/src/views/report/dayReport/index.vue
@@ -73,13 +73,13 @@
              <div v-else>{{ scope.row.lateNum}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="早退人数" align="center" prop="eaelyNum">
+        <el-table-column label="早退人数" align="center" prop="earlyNum">
           <template slot-scope="scope">
-            <div v-if="scope.row.eaelyNum!=0"
+            <div v-if="scope.row.earlyNum!=0"
             @click="openRecord(scope.row,title3)" style="color: #02a7f0; cursor: pointer">
-                {{ scope.row.eaelyNum}}
+                {{ scope.row.earlyNum}}
             </div>
-             <div v-else>{{ scope.row.eaelyNum}}</div>
+             <div v-else>{{ scope.row.earlyNum}}</div>
           </template>
         </el-table-column>
         <el-table-column label="旷工人数" align="center" prop="skippingNum">
@@ -325,6 +325,7 @@
         /** 重置按钮操作 */
         resetQuery() {
             this.dateRange = [];
+            this.getWeekDates();
             this.resetForm("queryForm");
             this.handleQuery();
         },
diff --git a/src/views/report/monthReport/index.vue b/src/views/report/monthReport/index.vue
index 3ecedcc..c4d461e 100644
--- a/src/views/report/monthReport/index.vue
+++ b/src/views/report/monthReport/index.vue
@@ -67,7 +67,7 @@
               <div v-else>{{ scope.row.lateNum}}</div>
           </template>
         </el-table-column>
-        <el-table-column label="早退次数" align="center" prop="eaelyNum">
+        <el-table-column label="早退次数" align="center" prop="earlyNum">
           <template slot-scope="scope">
               <div v-if="scope.row.earlyNum!=0"
               @click="openRecord(scope.row,title3)" style="color: #02a7f0; cursor: pointer">
diff --git a/src/views/report/originalReport/index.vue b/src/views/report/originalReport/index.vue
index a434036..178db75 100644
--- a/src/views/report/originalReport/index.vue
+++ b/src/views/report/originalReport/index.vue
@@ -217,9 +217,10 @@ export default {
       },
       /** 重置按钮操作 */
       resetQuery() {
-          this.getWeekDates();
-          this.resetForm("queryForm");
-          this.handleQuery();
+        this.dateRange=[]
+        this.getWeekDates();
+        this.resetForm("queryForm");
+        this.handleQuery();
       },
       /** 导出按钮操作 */
       handleExport() {
diff --git a/src/views/setting/devices/index.vue b/src/views/setting/devices/index.vue
index 019abce..d210253 100644
--- a/src/views/setting/devices/index.vue
+++ b/src/views/setting/devices/index.vue
@@ -300,7 +300,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const Ids = row.id;
-        this.$modal.confirm('是否确认删除编号为"' + Ids + '"的数据项？').then(function() {
+        this.$modal.confirm('是否确认删除该数据项？').then(function() {
           return delMachine(Ids);
         }).then(() => {
           this.getList();
diff --git a/src/views/setting/rules/index.vue b/src/views/setting/rules/index.vue
index 547bb2e..0dd50d1 100644
--- a/src/views/setting/rules/index.vue
+++ b/src/views/setting/rules/index.vue
@@ -115,7 +115,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="参与考勤人员：" prop="checkList">
-                  <treeselect v-model="form.checkList" :multiple="true" :flat="true" :options="personOptions" :normalizer="normalizer" placeholder="选择部门负责人" @input="handleSelect"/>
+                  <treeselect v-model="form.checkList" :multiple="true" :flat="true" :options="personOptions" :normalizer="normalizer" placeholder="选择部门和人员" @input="handleSelect"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -541,7 +541,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const groupIds = row.groupId || this.ids;
-        this.$modal.confirm('是否确认删除编号为"' + groupIds + '"的数据项？').then(function() {
+        this.$modal.confirm('是否确认删除该数据项？').then(function() {
           return delAttGroup(groupIds);
         }).then(() => {
           this.getList();