防抖

src/layout/components/Sidebar/index.vue

@@ -64,11 +64,6 @@ export default {
     }
   },
   created() {
-    //   this.routs=this.sidebarRouters
-    console.log(this.$route)
-    // if(this.$route.path){
-      
-    // }
     if (this.$route.query.name) {
       this.sidebarRoutersfun();
       this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;

src/main.js

@@ -115,3 +115,24 @@ new Vue({
   store,
   render: h => h(App)
 })
+
+
+const on = Vue.prototype.$on
+Vue.prototype.$on = function (event, func) {
+  let timer;
+  let flag = true;
+  let newFunc = func
+  if (event == 'click') {
+    newFunc = function () {
+      if(flag) {
+        func.apply(this, arguments)
+        flag = false
+      }
+      clearTimeout(timer)
+      timer = setTimeout(function () {
+        flag = true
+      }, 1000)
+    }
+  }
+  on.call(this, event, newFunc)
+}

src/views/bdglregular/regularcountinfo/index.vue

@@ -49,7 +49,7 @@
               <div style="color:rgb(255 106 0);">{{ scope.row.score }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="事由" align="center" prop="question" />
+          <el-table-column label="事由" show-overflow-tooltip align="center" prop="question" />
           <el-table-column label="整改时间" align="center" prop="rectificationTime" width="180">
             <template slot-scope="scope">
               <span>
@@ -104,7 +104,7 @@ export default {
     return {
       peopleList: [],
       peopleList2: [],
-      peopleList3: [],
+      peopleList3: []
     };
   },
   created() {
@@ -159,7 +159,7 @@ export default {
             },
             series: [
               {
-                name: "整体完成比例",
+                name: "",
                 type: "pie",
                 radius: "80%",
                 label: {
@@ -182,11 +182,6 @@ export default {
                         : res.data[0].daiyanshou,
                     name: "待验收"
                   },
-                  {
-                    value:
-                      res.data[0].yitongguo == 0 ? null : res.data[0].yitongguo,
-                    name: "已通过"
-                  },
                   {
                     value:
                       res.data[0].daichuli == 0 ? null : res.data[0].daichuli,
@@ -198,6 +193,11 @@ export default {
                         ? null
                         : res.data[0].weitongguo,
                     name: "未通过"
+                  },
+                  {
+                    value:
+                      res.data[0].yitongguo == 0 ? null : res.data[0].yitongguo,
+                    name: "已通过"
                   }
                 ],
                 emphasis: {
@@ -254,7 +254,7 @@ export default {
               // },
               series: [
                 {
-                  name: this.peopleList3[i].name,
+                  name: "",
                   type: "pie",
                   radius: "60%",
                   center: ["50%", "50%"],
@@ -273,17 +273,17 @@ export default {
                   data: [
                     {
                       value:
-                        this.peopleList3[i].daichuli == 0
+                        this.peopleList3[i].daiyanshou == 0
                           ? null
-                          : this.peopleList3[i].daichuli,
-                      name: "待处理"
+                          : this.peopleList3[i].daiyanshou,
+                      name: "待验收"
                     },
                     {
                       value:
-                        this.peopleList3[i].daiyanshou == 0
+                        this.peopleList3[i].daichuli == 0
                           ? null
-                          : this.peopleList3[i].daiyanshou,
-                      name: "待验收"
+                          : this.peopleList3[i].daichuli,
+                      name: "待处理"
                     },
                     {
                       value:
@@ -318,10 +318,12 @@ export default {
     rowclick(row) {
       console.log(row.inspectedUnitId);
       this.$router
-        .push({ path: "/bdglregular/regularinfo", query: { id:row.inspectedUnitId  } })
+        .push({
+          path: "/bdglregular/regularinfo",
+          query: { id: row.inspectedUnitId }
+        })
         .catch(() => {});
-      
-    },
+    }
   }
 };
 </script>
@@ -370,15 +372,16 @@ export default {
   height: 30px;
   font-size: 18px;
   color: #fff;
-  background-image: url("../../../assets/images/dtitle.png");
+  background-image: url("../../../assets/images/组 21.png");
   background-repeat: no-repeat;
   margin-top: 9px;
   line-height: 30px;
   position: relative;
+  margin-left:1%;
 }
 .head-left-title span {
   position: absolute;
-  left: 80px;
+  left: 36px;
 }
 
 ::v-deep .el-table__empty-block {
@@ -423,5 +426,4 @@ export default {
   width: 90%;
   height: 380px;
 }
-
 </style>

src/views/bdglregular/regularinfo/index.vue

@@ -171,10 +171,20 @@
     </el-row>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="success" v-if="queryParams.caoZuoType==0" style="background:rgb(255 106 0)" @click="handleAdd">减分录入</el-button>
+        <el-button
+          type="success"
+          v-if="queryParams.caoZuoType==0"
+          style="background:rgb(255 106 0)"
+          @click="handleAdd"
+        >减分录入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" v-if="queryParams.caoZuoType==1" style="background: rgb(2 255 2)" @click="handleAdd">加分录入</el-button>
+        <el-button
+          type="success"
+          v-if="queryParams.caoZuoType==1"
+          style="background: rgb(3 157 3)"
+          @click="handleAdd"
+        >加分录入</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -268,7 +278,7 @@
           >{{scope.row.currentState}}</div>
         </template>
       </el-table-column>
-      <el-table-column label="事由" align="center" prop="question" />
+      <el-table-column label="事由" show-overflow-tooltip align="center" prop="question" />
       <el-table-column
         label="整改时间"
         align="center"
@@ -297,11 +307,7 @@
             @click="shenpifun(scope.row)"
             v-if="queryParams.caoZuoType==0&&scope.row.isShenPi==0&&scope.row.currentState=='待验收'"
           >审批</el-button>
-          <el-button
-            size="btd"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+          <el-button size="btd" type="text" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -491,11 +497,11 @@
           <fileUpload v-model="form.documentProof" />
           <!-- <el-input v-model="form.documentProof" placeholder="请输入文件举证" /> -->
         </el-form-item>
-        <div class="jiben" v-if="btnnum==1">未通过原因</div>
-        <el-form-item label prop="score" v-if="btnnum==1">
+        <div class="jiben" v-if="currentState==1">未通过原因</div>
+        <el-form-item label prop="score" v-if="currentState==1">
           <el-input
             v-model="form.reasonReturn"
-            :disabled="disabled"
+            :disabled="disabled||curr"
             type="textarea"
             placeholder="请输入未通过原因"
           />
@@ -613,7 +619,9 @@ export default {
       //区分减分、增改
       jiannum: null,
       btnnum: null,
-      disabled: false
+      disabled: false,
+      currentState:null,
+      curr:null,
     };
   },
   created() {
@@ -633,15 +641,15 @@ export default {
     this.getDicts("inspectionType").then(response => {
       this.inspectionType = response.data;
     });
-    
+
     if (this.$route.query.id) {
       bumenlist(this.$route.query.id).then(res => {
-        console.log(1)
+        console.log(1);
         this.regularinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
       });
-    }else{
+    } else {
       this.getList();
     }
   },
@@ -723,6 +731,10 @@ export default {
         this.title = "修改经常性检查";
         this.jiannum = 1;
         this.btnnum = null;
+        if (this.form.currentState == "未通过") {
+          this.currentState = 1;
+          this.curr=true
+        }
       });
     },
     /** 审批按钮操作 */
@@ -752,6 +764,9 @@ export default {
     zhenggaifun() {
       this.jiannum = 0;
       this.btnnum = 1;
+      this.disabled = false;
+      this.currentState=1;
+      this.curr=false;
       // this.reset();
       // editissuccess().then(res => {
       //   if (res.code == 200) {
@@ -902,7 +917,7 @@ export default {
   color: #1c86e1;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #000;
 }
 .el-tree {
   background-color: #00365f;

src/views/bdglregular/specialcountinfo/index.vue

@@ -46,11 +46,11 @@
             align="center"
             prop="inspectedUnit"
           />
-          <el-table-column
+          <!-- <el-table-column
             label="检查单位"
             align="center"
             prop="unitCheck"
-          ></el-table-column>
+          ></el-table-column> -->
           <el-table-column
             label="状态"
             align="center"
@@ -61,7 +61,7 @@
               <div style="color:rgb(255 106 0);">{{ scope.row.score }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="事由" align="center" prop="question" />
+          <el-table-column label="事由" show-overflow-tooltip align="center" prop="question" />
           <el-table-column
             label="整改时间"
             align="center"
@@ -173,7 +173,7 @@ export default {
             },
             series: [
               {
-                name: "整体完成比例",
+                name: "",
                 type: "pie",
                 radius: "80%",
                 label: {
@@ -193,18 +193,20 @@ export default {
                     value: res.data[0].daiyanshou==0?null:res.data[0].daiyanshou,
                     name: "待验收"
                   },
-                  {
-                    value: res.data[0].yitongguo==0?null:res.data[0].yitongguo,
-                    name: "已通过"
-                  },
-                  {
+                   {
                     value: res.data[0].daichuli==0?null:res.data[0].daichuli,
                     name: "待处理"
                   },
                   {
                     value: res.data[0].weitongguo==0?null:res.data[0].weitongguo,
                     name: "未通过"
-                  }
+                  },
+                  {
+                    value: res.data[0].yitongguo==0?null:res.data[0].yitongguo,
+                    name: "已通过"
+                  },
+                 
+                  
                 ],
                 emphasis: {
                   itemStyle: {
@@ -277,14 +279,14 @@ export default {
                     }
                   },
                   data: [
-                    {
-                      value: this.peopleList3[i].daichuli==0?null:this.peopleList3[i].daichuli,
-                      name: "待处理"
-                    },
                     {
                       value: this.peopleList3[i].daiyanshou==0?null:this.peopleList3[i].daiyanshou,
                       name: "待验收"
                     },
+                    {
+                      value: this.peopleList3[i].daichuli==0?null:this.peopleList3[i].daichuli,
+                      name: "待处理"
+                    },
                     {
                       value: this.peopleList3[i].weitonguo==0?null:this.peopleList3[i].weitonguo,
                       name: "未通过"
@@ -364,15 +366,16 @@ export default {
   height: 30px;
   font-size: 18px;
   color: #fff;
-  background-image: url("../../../assets/images/dtitle.png");
+  background-image: url("../../../assets/images/组 21.png");
   background-repeat: no-repeat;
   margin-top: 9px;
   line-height: 30px;
   position: relative;
+  margin-left: 1%;
 }
 .head-left-title span {
   position: absolute;
-  left: 80px;
+  left: 36px;
 }
 
 ::v-deep .el-table__empty-block {

src/views/bdglregular/specialinfo/index.vue

@@ -142,7 +142,7 @@
           type="success"
           v-if="queryParams.caoZuoType==1"
           @click="handleAdd"
-          style="background: rgb(2 255 2)"
+          style="background: rgb(3 157 3)"
         >加分录入</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
@@ -216,7 +216,7 @@
         </template>
       </el-table-column>
       <el-table-column label="检查时间" align="center" prop="inspectionTime" />
-      <el-table-column label="事由" align="center" prop="question" />
+      <el-table-column label="事由" align="center" show-overflow-tooltip prop="question" />
       <!-- <el-table-column
         label="当前状态"
         align="center"
@@ -303,7 +303,6 @@
           >审批</el-button>
           <el-button
             size="btd"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
         </template>
@@ -428,9 +427,9 @@
           <fileUpload v-model="form.documentProof" />
           <!-- <el-input v-model="form.documentProof" placeholder="请输入文件举证" /> -->
         </el-form-item>
-        <div class="jiben" v-if="btnnum==1">未通过原因</div>
-        <el-form-item label prop="score" v-if="btnnum==1">
-          <el-input v-model="form.reasonReturn" :disabled="disabled" type="textarea" placeholder="请输入未通过原因" />
+        <div class="jiben" v-if="currentState==1">未通过原因</div>
+        <el-form-item label prop="score" v-if="currentState==1" >
+          <el-input v-model="form.reasonReturn" :disabled="disabled||curr" type="textarea" placeholder="请输入未通过原因" />
         </el-form-item>
         <!-- <el-form-item label="创建人ID" prop="createUserId">
           <el-input v-model="form.createUserId" placeholder="请输入创建人ID" />
@@ -463,7 +462,7 @@ import {
   editquestion,
   editissuccess,
   editisfalse,
-  bumenlist
+  bumenlist,
 } from "@/api/bdglregular/specialinfo";
 
 export default {
@@ -535,6 +534,8 @@ export default {
       jiannum: null,
       btnnum: null,
       disabled:false,
+      currentState:null,
+      curr:null,
     };
   },
   created() {
@@ -632,14 +633,19 @@ export default {
         this.open = true;
         this.title = "修改专项检查";
         this.jiannum = 1;
-        this.btnnum = null;
+        this.btnnum = null;    
+        this.disabled=false;
+        if(this.form.currentState=="未通过"){
+           this.currentState=1;
+           this.curr=true
+        }
       });
     },
     /** 审批按钮操作 */
     shenpifun(row) {
       this.reset();
       const id = row.id || this.ids;
-      getRegularinfo(id).then(response => {
+      getSpecialinfo(id).then(response => {
         this.disabled=true;
         this.form = response.data;
         this.open = true;
@@ -662,6 +668,9 @@ export default {
     zhenggaifun() {
       this.jiannum = 0;
       this.btnnum = 1;
+      this.disabled=false;
+      this.currentState=1;
+      this.curr=false;
     },
     //未通过提交
     weitongguofun() {
@@ -806,7 +815,7 @@ export default {
   color: #1c86e1;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #000;
 }
 .el-tree {
   background-color: #00365f;

src/views/combatduty/taskdutyinfo/index.vue

@@ -180,8 +180,8 @@
         </template>
       </el-table-column>
       <el-table-column label="所在位置" align="center" prop="adress" />
-      <el-table-column label="是由" align="center" prop="question" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="是由" show-overflow-tooltip align="center" prop="question" />
+      <el-table-column label="备注" show-overflow-tooltip align="center" prop="remarks" />
       <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -352,7 +352,6 @@ export default {
         commanderName: null,
         commanderId: null,
         commanderPhone: null,
-        participantsName: null,
         participantsId: null,
         participantsIds: null,
         startTime: null,
@@ -388,7 +387,6 @@ export default {
     },
     gettreeselect() {
       getDept().then(res => {
-        console.log(res);
         if (res.code == 200) {
           this.deptOptions = res.data;
         }
@@ -439,7 +437,6 @@ export default {
         commanderName: null,
         commanderId: null,
         commanderPhone: null,
-        participantsName: [],
         participantsId: null,
         participantsIds: null,
         startTime: null,
@@ -478,7 +475,6 @@ export default {
       const id = row.id || this.ids;
       getTaskdutyinfo(id).then(response => {
         this.form = response.data;
-        this.form.participantsName = this.form.participantsName.split(",");
         this.open = true;
         this.title = "修改执行任务";
       });
@@ -487,7 +483,6 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.participantsName = this.form.participantsName.join(",");
           if (this.form.id != null) {
             updateTaskdutyinfo(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");

src/views/peopleManage/examination/index.vue

@@ -206,16 +206,14 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['peopleManage:examination:edit']"
           >修改</el-button>
           <el-button
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['peopleManage:examination:remove']"
           >删除</el-button>

src/views/peopleManage/transfer/index.vue

@@ -281,16 +281,12 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
+            size="btu"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['peopleManage:transfer:edit']"
           >修改</el-button>
           <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
+            size="btd"
             @click="handleDelete(scope.row)"
             v-hasPermi="['peopleManage:transfer:remove']"
           >删除</el-button>

src/views/pt.vue

@@ -261,7 +261,7 @@
               <img src="../assets/images/通知公告.png" alt />
               <span>通知公告</span>
             </div>
-            <span class="addspan" @click="tiaddfun">+</span>
+            <!-- <span class="addspan" @click="tiaddfun">+</span> -->
             <div class="num1-box">
               <div class="num1-box-div">
                 <div class="num1-box-l">通知公告通知公告通知公告</div>
@@ -630,7 +630,7 @@ hr {
   height: 41.5vh;
   background: url("../images/rd.png") no-repeat;
   margin-bottom: 20px;
-  padding: 22px 20px 0px 20px;
+  padding: 30px 20px 0px 20px;
   background-size: 100% 100%;
 }
 .num1 img {
@@ -702,6 +702,7 @@ hr {
   height: 100%;
   text-align: right;
   margin-right: 10px;
+  line-height: 30px;
 }
 .num1-ul {
   width: 100%;