ltao 3 năm trước cách đây
mục cha
commit
5e528a730e

+ 31 - 17
src/views/bdglregular/regularinfo/index.vue

@@ -180,6 +180,7 @@
           v-if="queryParams.caoZuoType == 0"
           style="background: #1d96ff"
           @click="handleAdd"
+           v-hasPermi="['bdglregular:regularinfo:jian']"
           >减分录入</el-button
         >
       </el-col>
@@ -188,6 +189,7 @@
           type="success"
           v-if="queryParams.caoZuoType == 1"
           style="background: #1d96ff"
+            v-hasPermi="['bdglregular:regularinfo:jia']"
           @click="handleAdd"
           >加分录入</el-button
         >
@@ -251,14 +253,14 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="单位检查_id" align="center" prop="unitCheckId" /> -->
-      <el-table-column label="检查单位" align="center" prop="unitCheck" />
+      <el-table-column label="检查单位" align="center" prop="unitCheck" width="150" />
       <el-table-column
         label="检查时间"
         align="center"
         prop="inspectionTime"
         width="150px"
       />
-      <el-table-column label="检查地点" align="center" prop="inspectionSite" />
+      <el-table-column width="250"  show-overflow-tooltip  label="检查地点" align="center" prop="inspectionSite" />
       <el-table-column
         label="分值"
         align="center"
@@ -330,6 +332,8 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="250"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -355,8 +359,10 @@
             "
             >审批</el-button
           >
+          <!-- v-if="scope.row.unitCheckId==this.danWies" -->
+          <!-- bdglregular:regularinfo:query -->
           <el-button
-            v-if=""
+            v-if="scope.row.currentState=='待处理'&&scope.row.isShenPi==0"
             size="btu"
             type="text"
             @click="handleAdds(scope.row)"
@@ -809,7 +815,7 @@ export default {
       },
       // 用户
       user:{},
-      danWie:"",
+      // danWies:0,
       yongHu:"",
       // 表单参数
       form: {},
@@ -855,6 +861,7 @@ export default {
     };
   },
   created() {
+    // this.danWiess()
     this.queryParams = {
       pageNum: 1,
       pageSize: 10,
@@ -878,11 +885,7 @@ export default {
       documentProof: null,
       caoZuoType: 0,
     };
-    getUserProfile().then((response) => {
-      this.user = response.data;
-      this.danWie = response.data.dept.deptName;
-      this.yongHu = response.data.nickName;
-    });
+    // this.danWiess()
     //部门数据
     getDept().then((res) => {
       if (res.code == 200) {
@@ -957,13 +960,24 @@ export default {
       }
 
       // listRegularinfos
-      console.log(to.query.obj);
+      // console.log(to.query.obj);
     },
   },
   mounted() {
     console.log(0);
+    // this.danWiess()
   },
   methods: {
+  danWiess(){
+      // 获取当前用户接口
+    getUserProfile().then((response) => {
+      this.user = response.data;
+      console.log(this.user)
+      // console.log(response.data.dept.deptId+"这是")
+      // if(response)
+      this.danWies = response.data.dept.deptId;
+    });
+    },
     /** 查询经常性检查列表 */
     getList() {
       this.loading = true;
@@ -1093,12 +1107,12 @@ export default {
         this.form = response.data;
         this.open1 = true;
         this.title = "修改经常性检查";
-        this.jiannum = 1;
-        this.btnnum = null;
-        if (this.form.currentState == "未通过") {
-          this.currentState = 1;
-          this.curr = true;
-        }
+        // this.jiannum = 1;
+        // this.btnnum = null;
+        // if (this.form.currentState == "未通过") {
+        //   this.currentState = 1;
+        //   this.curr = true;
+        // }
       });
     },
     /** 审批按钮操作 */
@@ -1157,7 +1171,7 @@ export default {
 
           if (this.form.id != null) {
             this.form.caoZuoType = this.queryParams.caoZuoType;
-            editquestion(this.form).then((response) => {
+            updateRegularinfo(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.open1 = false;

+ 2 - 0
src/views/bdglregular/specialinfo/index.vue

@@ -136,6 +136,7 @@
           v-if="queryParams.caoZuoType == 0"
           @click="handleAdd"
           style="background: #1d96ff"
+            v-hasPermi="['bdglregular:specialinfo:jian']"
           >减分录入</el-button
         >
       </el-col>
@@ -145,6 +146,7 @@
           v-if="queryParams.caoZuoType == 1"
           @click="handleAdd"
           style="background: #1d96ff"
+            v-hasPermi="['bdglregular:specialinfo:jia']"
           >加分录入</el-button
         >
       </el-col>

+ 12 - 7
src/views/pt.vue

@@ -379,7 +379,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"
@@ -1268,6 +1268,7 @@ hr {
   height: 100%;
   text-align: right;
   margin-right: 10px;
+  margin-top: -4px;
   line-height: 30px;
 }
 .num1-ul {
@@ -1379,18 +1380,22 @@ hr {
   position: relative;
 }
 .num1 .addspan {
-  width: 50px;
-  height: 25px;
+  width: 59px;
+  height: 14px;
   display: inline-block;
-  background-color: #1c86e1;
+  /* background-color: #1c86e1; */
   line-height: 25px;
   text-align: center;
-  font-size: 16px;
+  font-size: 14px;
   cursor: pointer;
+  color: #dcdcdc;
+  background-image: url("../images/查看更多箭头.png");
+  background-repeat: no-repeat;
   /* margin-left: 3.5px; */
+  /* background-position: 50px 10px; */
   position: absolute;
-  right: 3.5%;
-  top: 9%;
+  right: 6%;
+  top: 4%;
 }
 ::v-deep .el-dialog {
   background-color: #004d86;

+ 23 - 11
src/views/taishi/index.vue

@@ -263,7 +263,7 @@
                 </td>
               </tr>
               <tr>
-                <td style="font-size: 15px; color: white">车辆统计</td>
+                <td style="font-size: 13px; color: white">车辆统计</td>
               </tr>
             </table>
 
@@ -279,11 +279,11 @@
                 </td>
               </tr>
               <tr>
-                <td style="font-size: 15px; color: white">车辆在位</td>
+                <td style="font-size: 13px; color: white">车辆在位</td>
               </tr>
             </table>
 
-            <table class="center4_s" style="margin-top: 1.3%">
+            <table class="center4_s" style="margin-top: 1.28%">
               <tr>
                 <td rowspan="2">
                   <img src="../../assets/images/cheliangz.png" alt />
@@ -295,7 +295,7 @@
                 </td>
               </tr>
               <tr>
-                <td style="font-size: 15px; color: white">车辆出场</td>
+                <td style="font-size: 13px; color: white">车辆出场</td>
               </tr>
             </table>
 
@@ -311,7 +311,7 @@
                 </td>
               </tr>
               <tr>
-                <td colspan="2" style="letter-spacing: 7px">夜间进入</td>
+                <td colspan="2" style="letter-spacing: 7px;font-size:13px">夜间进入</td>
               </tr>
             </table>
 
@@ -327,7 +327,7 @@
                 </td>
               </tr>
               <tr>
-                <td colspan="2" style="letter-spacing: 7px">外来车辆</td>
+                <td colspan="2" style="letter-spacing: 7px;font-size:13px">外来车辆</td>
               </tr>
             </table>
           </div>
@@ -1120,7 +1120,7 @@ export default {
         { name: "政治工作部值班员", value: "" },
         { name: "保障部值班员", value: "" },
         { name: "值班通信员", value: "" },
-        { name: "值班分队", value: "" },
+        { name: "值班总人数", value: "" },
       ],
       // 检查督导
       jianCanName: [],
@@ -1171,7 +1171,7 @@ export default {
               value: res.data[i],
             });
           } else if (i == "detachmentName") {
-            this.jrzblist.push({ name: "值班分队", value: res.data[i] });
+            this.jrzblist.push({ name: "值班总人数", value: res.data[i] });
           }
         }
       }
@@ -2234,7 +2234,7 @@ export default {
   border: 0.1px solid #052c41;
   height: 6vh;
   width: 35%;
-  line-height: 50px;
+  line-height: 6vh;
   text-align: center;
 }
 
@@ -2245,9 +2245,16 @@ export default {
 }
 .center4_s {
   /* transform: scale(0.8); */
+  /* width: 20px; */
+  height: 6.3vh;
+  /* width: ; */
+  line-height: 2vh;
   position: relative;
   top: -80%;
   left: 40%;
+  margin-top: -0.5vh;
+  margin-left: 4px;
+  /* line-height: 50px; */
   margin-bottom: 5px;
   /* margin-top: 10px; */
 }
@@ -2261,14 +2268,19 @@ export default {
   color: white;
   font-size: 12px;
   position: absolute;
-  top: 15%;
+  top: 12%;
   left: 75%;
+  height: 8.2vh;
+  margin-top: -1vh;
+  line-height: 2.2vh;
   margin-bottom: 20px;
 }
 .center4_y2 {
   position: absolute;
-  top: 60%;
+  top: 57%;
   left: 75%;
+  height: 9vh;
+  line-height: 1.9vh;
   margin-bottom: 20px;
 }
 .center4_y img {