jiancha

src/api/bdglregular/regularcountinfo.js

@@ -26,8 +26,16 @@ export function completeproportion() {
 
 // 查询各营级及机关单位列表
 export function unitproportion() {
-    return request({
-      url: "/bdglregular/regularcountinfo//unitproportion",
-      method: "get"
-    });
-  }
+  return request({
+    url: "/bdglregular/regularcountinfo//unitproportion",
+    method: "get"
+  });
+}
+
+// 查询经常性检查详细
+export function getRegularinfo(id) {
+  return request({
+    url: '/bdglregular/regularinfo/' + id,
+    method: 'get'
+  })
+}

src/api/bdglregular/regularinfo.js

@@ -96,3 +96,12 @@ export function editisfalse(data) {
     data: data
   })
 }
+
+// 带验收数据
+export function bumenlist(id) {
+  return request({
+    url: `/bdglregular/regularinfo/bumenlist?inspectedUnitId=${id}`,
+    method: 'get',
+  })
+}
+

src/api/bdglregular/specialinfo.js

@@ -96,3 +96,11 @@ export function editisfalse(data) {
     data: data
   })
 }
+
+// 带验收数据
+export function bumenlist(id) {
+  return request({
+    url: `/bdglregular/specialinfo/bumenlist?inspectedUnitId=${id}`,
+    method: 'get',
+  })
+}

src/layout/components/Sidebar/index.vue

@@ -14,7 +14,7 @@
         :collapse-transition="false"
         :default-openeds="[routs[0].path]"
         mode="vertical"
-        :default-active="p"
+        :default-active="$route.path"
       >
         <sidebar-item
           v-for="(route, index) in routs"
@@ -65,6 +65,10 @@ export default {
   },
   created() {
     //   this.routs=this.sidebarRouters
+    console.log(this.$route)
+    if(this.$route.path){
+       this.p=this.$route.path
+    }
     if (this.$route.query.name) {
       this.sidebarRoutersfun();
       this.p = this.routs[0].path + "/" + this.routs[0].children[0].path;

src/store/modules/tagsView.js

@@ -6,7 +6,7 @@ const state = {
 const mutations = {
   ADD_VISITED_VIEW: (state, view) => {
     if (state.visitedViews.some(v => v.path === view.path)) return
-    if (view.meta.title != '首页'&&view.meta.title!=undefined) {
+    if (view.meta.title != '主控台'&&view.meta.title!=undefined) {
       state.visitedViews.push(
         Object.assign({}, view, {
           title: view.meta.title

src/views/PrintsLog/printlog/index.vue

@@ -176,11 +176,11 @@
         <template slot-scope="scope">
           <!-- <dict-tag :options="dict.type.sys_statusG" :value="scope.row.statusG" /> -->
           <div
-            style="color:#E6A23C;"
+            style="color: #00FF00;"
             v-if="scope.row.statusG=='0'"
           >未归还</div>
           <div
-            style="color:#57b764;"
+            style="color:#90da90;"
             v-if="scope.row.statusG=='1'"
           >已归还</div>
         </template>

src/views/PrintsManage/manage/index.vue

@@ -208,7 +208,8 @@
       </el-table-column>
       <el-table-column label="打印状态" align="center" prop="printStatus">
         <template slot-scope="scope">
-          <span>{{scope.row.printStatus==1?'打印中':'已打印'}}</span>
+          <span style="color: #90da90;" v-if="scope.row.printStatus==1">打印中</span>
+          <span style="color:  #00FF00;" v-if="scope.row.printStatus==2">已打印</span>
         </template>
       </el-table-column>
       <!-- <el-table-column label="大小" align="center" prop="size" /> -->
@@ -842,33 +843,33 @@ export default {
           //   "http://192.168.5.188:8080/profile/print/" + res.printFileName;
           var url =
             "http://192.168.5.188:8080/profile/print/" + res.printFileName;
-          this.dyopen2 = true;
-          console.log(this.dyform.type);
-          if (this.dyform.type == "docx") {
-            console.log(1);
-            axios({
-              method: "get",
-              responseType: "blob", // 设置响应文件格式
-              url: url
-            }).then(({ data }) => {
-              console.log(this.$refs.file);
+          // this.dyopen2 = true;
+          // console.log(this.dyform.type);
+          // if (this.dyform.type == "docx") {
+          //   console.log(1);
+          //   axios({
+          //     method: "get",
+          //     responseType: "blob", // 设置响应文件格式
+          //     url: url
+          //   }).then(({ data }) => {
+          //     console.log(this.$refs.file);
 
-              docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
-            });
-          } else if (this.dyform.type == "xlsx") {
-            console.log(2);
-            axios
-              .get(url, {
-                responseType: "arraybuffer" // 设置响应体类型为arraybuffer
-              })
-              .then(({ data }) => {
-                let workbook = XLSX.read(new Uint8Array(data), {
-                  type: "array"
-                }); // 解析数据
-                var worksheet = workbook.Sheets[workbook.SheetNames[0]]; // workbook.SheetNames 下存的是该文件每个工作表名字,这里取出第一个工作表
-                this.tableau = XLSX.utils.sheet_to_html(worksheet); // 渲染
-              });
-          }
+          //     docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+          //   });
+          // } else if (this.dyform.type == "xlsx") {
+          //   console.log(2);
+          //   axios
+          //     .get(url, {
+          //       responseType: "arraybuffer" // 设置响应体类型为arraybuffer
+          //     })
+          //     .then(({ data }) => {
+          //       let workbook = XLSX.read(new Uint8Array(data), {
+          //         type: "array"
+          //       }); // 解析数据
+          //       var worksheet = workbook.Sheets[workbook.SheetNames[0]]; // workbook.SheetNames 下存的是该文件每个工作表名字,这里取出第一个工作表
+          //       this.tableau = XLSX.utils.sheet_to_html(worksheet); // 渲染
+          //     });
+          // }
         }
       });
       // open.location.href="http://192.168.5.188:8080/priofile/print/202203211244.docx";

src/views/bdglregular/regularcountinfo/index.vue

@@ -17,12 +17,12 @@
           <el-table-column label="单位" align="center" prop="name" />
           <el-table-column label="加分" align="center" prop="addscore">
             <template slot-scope="scope">
-              <div style="color:#008000;">{{ scope.row.addscore }}</div>
+              <div style="color:rgb(2 255 2);">{{ scope.row.addscore }}</div>
             </template>
           </el-table-column>
           <el-table-column label="减分" align="center" prop="subscore">
             <template slot-scope="scope">
-              <div style="color:#f00;">{{ scope.row.subscore }}</div>
+              <div style="color:rgb(255 106 0)">{{ scope.row.subscore }}</div>
             </template>
           </el-table-column>
           <el-table-column label="总分" align="center" prop="zongfen" />
@@ -46,7 +46,7 @@
           <el-table-column label="状态" align="center" prop="currentState"></el-table-column>
           <el-table-column label="减分" align="center" prop="score">
             <template slot-scope="scope">
-              <div style="color:#f00;">{{ scope.row.score }}</div>
+              <div style="color:rgb(255 106 0);">{{ scope.row.score }}</div>
             </template>
           </el-table-column>
           <el-table-column label="事由" align="center" prop="question" />
@@ -95,7 +95,8 @@ import {
   unitrank,
   pendingacceptance,
   completeproportion,
-  unitproportion
+  unitproportion,
+  getRegularinfo
 } from "@/api/bdglregular/regularcountinfo";
 import * as echarts from "echarts";
 export default {
@@ -103,7 +104,7 @@ export default {
     return {
       peopleList: [],
       peopleList2: [],
-      peopleList3: []
+      peopleList3: [],
     };
   },
   created() {
@@ -175,19 +176,27 @@ export default {
                 },
                 data: [
                   {
-                    value: res.data[0].daiyanshou==0?null:res.data[0].daiyanshou,
+                    value:
+                      res.data[0].daiyanshou == 0
+                        ? null
+                        : res.data[0].daiyanshou,
                     name: "待验收"
                   },
                   {
-                    value: res.data[0].yitongguo==0?null:res.data[0].yitongguo,
+                    value:
+                      res.data[0].yitongguo == 0 ? null : res.data[0].yitongguo,
                     name: "已通过"
                   },
                   {
-                    value: res.data[0].daichuli==0?null:res.data[0].daichuli,
+                    value:
+                      res.data[0].daichuli == 0 ? null : res.data[0].daichuli,
                     name: "待处理"
                   },
                   {
-                    value: res.data[0].weitongguo==0?null:res.data[0].weitongguo,
+                    value:
+                      res.data[0].weitongguo == 0
+                        ? null
+                        : res.data[0].weitongguo,
                     name: "未通过"
                   }
                 ],
@@ -263,19 +272,31 @@ export default {
                   },
                   data: [
                     {
-                      value: this.peopleList3[i].daichuli==0?null:this.peopleList3[i].daichuli, 
+                      value:
+                        this.peopleList3[i].daichuli == 0
+                          ? null
+                          : this.peopleList3[i].daichuli,
                       name: "待处理"
                     },
                     {
-                      value: this.peopleList3[i].daiyanshou==0?null:this.peopleList3[i].daiyanshou,
+                      value:
+                        this.peopleList3[i].daiyanshou == 0
+                          ? null
+                          : this.peopleList3[i].daiyanshou,
                       name: "待验收"
                     },
                     {
-                      value: this.peopleList3[i].weitongguo==0?null:this.peopleList3[i].weitongguo,
+                      value:
+                        this.peopleList3[i].weitongguo == 0
+                          ? null
+                          : this.peopleList3[i].weitongguo,
                       name: "未通过"
                     },
                     {
-                      value: this.peopleList3[i].yitongguo==0?null:this.peopleList3[i].yitongguo,
+                      value:
+                        this.peopleList3[i].yitongguo == 0
+                          ? null
+                          : this.peopleList3[i].yitongguo,
                       name: "已通过"
                     }
                   ],
@@ -294,9 +315,13 @@ export default {
         }
       });
     },
-    rowclick(row){
-       console.log(row.id)
-    }
+    rowclick(row) {
+      console.log(row.inspectedUnitId);
+      this.$router
+        .push({ path: "/bdglregular/regularinfo", query: { id:row.inspectedUnitId  } })
+        .catch(() => {});
+      
+    },
   }
 };
 </script>
@@ -398,4 +423,5 @@ export default {
   width: 90%;
   height: 380px;
 }
+
 </style>

src/views/bdglregular/regularinfo/index.vue

@@ -171,10 +171,10 @@
     </el-row>
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="success" v-if="queryParams.caoZuoType==0" @click="handleAdd">减分</el-button>
+        <el-button type="success" v-if="queryParams.caoZuoType==0" @click="handleAdd">减分录入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button type="success" v-if="queryParams.caoZuoType==1" @click="handleAdd">加分</el-button>
+        <el-button type="success" v-if="queryParams.caoZuoType==1" @click="handleAdd">加分录入</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -256,7 +256,7 @@
           >{{scope.row.currentState}}</div>
           <div
             style="color:#3498db;"
-            v-if="scope.row.currentState=='待验收'"  
+            v-if="scope.row.currentState=='待验收'"
           >{{scope.row.currentState}}</div>
           <div
             style="color:#38d764;"
@@ -374,7 +374,12 @@
           </el-select>
         </el-form-item>-->
         <el-form-item label="类型" prop="inspectionType">
-          <el-select v-model="form.inspectionType" :disabled="disabled" clearable placeholder="请选择类型">
+          <el-select
+            v-model="form.inspectionType"
+            :disabled="disabled"
+            clearable
+            placeholder="请选择类型"
+          >
             <el-option
               v-for="dict in inspectionType"
               :key="dict.dictValue"
@@ -402,11 +407,7 @@
         </el-form-item>
         <el-form-item label="分值" prop="score" v-if="jiannum==0">
           <!-- <el-input v-model="form.score" type="number" @blur="scoreblur" :disabled="disabled" placeholder="请输入分值" /> -->
-          <el-input-number
-              v-model="form.score"
-              controls-position="right"
-              :min="0"
-            ></el-input-number>
+          <el-input-number v-model="form.score" controls-position="right" :min="0"></el-input-number>
         </el-form-item>
         <el-form-item label="整改时间" prop="rectificationTime" v-if="queryParams.caoZuoType==0">
           <el-date-picker
@@ -467,11 +468,21 @@
         <div class="jiben" v-if="queryParams.caoZuoType==0">存在问题</div>
         <div class="jiben" v-if="queryParams.caoZuoType==1">加分事由</div>
         <el-form-item label prop="question">
-          <el-input v-model="form.question" :disabled="disabled" type="textarea" placeholder="请输入内容" />
+          <el-input
+            v-model="form.question"
+            :disabled="disabled"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <div class="jiben" v-if="jiannum!=0">整改措施</div>
         <el-form-item label prop="correctiveAction" v-if="jiannum!=0">
-          <el-input v-model="form.correctiveAction" :disabled="disabled" type="textarea" placeholder="请输入内容" />
+          <el-input
+            v-model="form.correctiveAction"
+            :disabled="disabled"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <div class="jiben" v-if="jiannum!=0">图片举证</div>
         <el-form-item label prop="pictureProof" v-if="jiannum!=0">
@@ -485,7 +496,12 @@
         </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="请输入未通过原因" />
+          <el-input
+            v-model="form.reasonReturn"
+            :disabled="disabled"
+            type="textarea"
+            placeholder="请输入未通过原因"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -511,7 +527,8 @@ import {
   listPeople,
   editquestion,
   editissuccess,
-  editisfalse
+  editisfalse,
+  bumenlist
 } from "@/api/bdglregular/regularinfo";
 
 export default {
@@ -599,12 +616,10 @@ export default {
       //区分减分、增改
       jiannum: null,
       btnnum: null,
-      disabled:false,
-
+      disabled: false
     };
   },
   created() {
-    this.getList();
     //部门数据
     getDept().then(res => {
       if (res.code == 200) {
@@ -621,6 +636,17 @@ 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)
+        this.regularinfoList = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      });
+    }else{
+      this.getList();
+    }
   },
   methods: {
     /** 查询经常性检查列表 */
@@ -707,7 +733,7 @@ export default {
       this.reset();
       const id = row.id || this.ids;
       getRegularinfo(id).then(response => {
-        this.disabled=true;
+        this.disabled = true;
         this.form = response.data;
         this.open = true;
         this.title = "修改经常性检查";
@@ -814,10 +840,10 @@ export default {
     caoZuoTypefun() {
       this.getList();
     },
-    scoreblur(){
-       if(this.form.score<0){
-          this.form.score=null;
-       }
+    scoreblur() {
+      if (this.form.score < 0) {
+        this.form.score = null;
+      }
     }
   }
 };

src/views/bdglregular/specialcountinfo/index.vue

@@ -17,12 +17,12 @@
           <el-table-column label="单位" align="center" prop="name" />
           <el-table-column label="加分" align="center" prop="addscore">
             <template slot-scope="scope">
-              <div style="color:#008000;">{{ scope.row.addscore }}</div>
+              <div style="color: rgb(2 255 2) ;">{{ scope.row.addscore }}</div>
             </template>
           </el-table-column>
           <el-table-column label="减分" align="center" prop="subscore">
             <template slot-scope="scope">
-              <div style="color:#f00;">{{ scope.row.subscore }}</div>
+              <div style="color:rgb(255 106 0);">{{ scope.row.subscore }}</div>
             </template>
           </el-table-column>
           <el-table-column label="总分" align="center" prop="zongfen" />
@@ -37,6 +37,7 @@
           :header-cell-style="{ background: '#0c2c50', color: 'white' }"
           style="width:98%;background:#0c2c50;margin-left:1%;"
           height="88%"
+          @row-click="rowclick"
         >
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="序号" align="center" type="index" />
@@ -57,7 +58,7 @@
           ></el-table-column>
           <el-table-column label="减分" align="center" prop="score">
             <template slot-scope="scope">
-              <div style="color:#f00;">{{ scope.row.score }}</div>
+              <div style="color:rgb(255 106 0);">{{ scope.row.score }}</div>
             </template>
           </el-table-column>
           <el-table-column label="事由" align="center" prop="question" />
@@ -226,7 +227,6 @@ export default {
           this.peopleList3 = res.data;
           var roseCharts = document.getElementsByClassName("block");
           for (var i = 0; i < this.peopleList3.length; i++) {
-            console.log(this.peopleList3);
             var myChart = echarts.init(roseCharts[i]);
             var option = {
               title: {
@@ -308,7 +308,14 @@ export default {
           }
         }
       });
-    }
+    },
+    rowclick(row) {
+      console.log(row.inspectedUnitId);
+      this.$router
+        .push({ path: "/bdglregular/specialinfo", query: { id:row.inspectedUnitId  } })
+        .catch(() => {});
+      
+    },
   }
 };
 </script>

src/views/bdglregular/specialinfo/index.vue

@@ -215,6 +215,32 @@
       </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"
+        prop="currentState"
+        :key="Math.random()"
+        v-if="queryParams.caoZuoType==0"
+      >
+        <template slot-scope="scope">
+          <div
+            style="color:#ff0000;"
+            v-if="scope.row.currentState=='未通过'"
+          >{{scope.row.currentState}}</div>
+          <div
+            style="color:#ffa500;"
+            v-if="scope.row.currentState=='待处理'"
+          >{{scope.row.currentState}}</div>
+          <div
+            style="color:#3498db;"
+            v-if="scope.row.currentState=='待验收'"
+          >{{scope.row.currentState}}</div>
+          <div
+            style="color:#38d764;"
+            v-if="scope.row.currentState=='已通过'"
+          >{{scope.row.currentState}}</div>
+        </template>
+      </el-table-column> -->
       <el-table-column
         label="当前状态"
         align="center"
@@ -239,6 +265,10 @@
             style="color:#38d764;"
             v-if="scope.row.currentState=='已通过'"
           >{{scope.row.currentState}}</div>
+          <div
+            style="color:#909399;"
+            v-if="scope.row.currentState=='过期未整改'"
+          >{{scope.row.currentState}}</div>
         </template>
       </el-table-column>
       <el-table-column
@@ -433,7 +463,8 @@ import {
   listPeople,
   editquestion,
   editissuccess,
-  editisfalse
+  editisfalse,
+  bumenlist
 } from "@/api/bdglregular/specialinfo";
 
 export default {
@@ -508,7 +539,6 @@ export default {
     };
   },
   created() {
-    this.getList();
     //部门数据
     getDept().then(res => {
       if (res.code == 200) {
@@ -521,6 +551,16 @@ export default {
         this.peopleIds = res.rows;
       }
     });
+    if (this.$route.query.id) {
+      bumenlist(this.$route.query.id).then(res => {
+        console.log(1)
+        this.specialinfoList = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      });
+    }else{
+      this.getList();
+    }
   },
   methods: {
     /** 查询专项检查列表 */

src/views/taishi/index.vue

@@ -137,15 +137,15 @@
             </div>
             <div class="center4_b">
               总计
-              <span style="color: #30fdff;">66</span>
+              <span style="color: #30fdff;">{{jclist.zongji}}</span>
             </div>
             <div class="center4_b">
               在位
-              <span style="color: #fde17b;">99</span>
+              <span style="color: #fde17b;">{{jclist.waichu}}</span>
             </div>
             <div class="center4_b">
               外出
-              <span style="color: #f0422a;">33</span>
+              <span style="color: #f0422a;">{{jclist.waichu}}</span>
             </div>
             <table class="center4_s">
               <tr>
@@ -612,7 +612,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">总打印数量</div>
                   <div class="s2">
-                    <b style="color:#30FDFF">23</b>台
+                    <b style="color:#30FDFF">{{this.wylist.mouthprints}}</b>台
                   </div>
                 </div>
               </div>
@@ -623,7 +623,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">归还数量</div>
                   <div class="s2">
-                    <b style="color:#2BF1B2">1</b>台
+                    <b style="color:#2BF1B2">{{this.wylist[1]}}</b>台
                   </div>
                 </div>
               </div>
@@ -634,7 +634,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">未归还数量</div>
                   <div class="s2">
-                    <b style="color:#30AAFF">1</b>台
+                    <b style="color:#30AAFF">{{this.wylist[0]}}</b>台
                   </div>
                 </div>
               </div>
@@ -645,7 +645,7 @@
                 <div class="right3-r-main-item-r">
                   <div class="s1">无需归还数量</div>
                   <div class="s2">
-                    <b style="color:#9D83FF ">3</b>台
+                    <b style="color:#9D83FF ">{{this.wylist.notreturns}}</b>台
                   </div>
                 </div>
               </div>
@@ -716,7 +716,8 @@ import {
   jinrizhiban,
   tongjiluoshi,
   rizongwenyin,
-  getNumber
+  getNumber,
+  juncheguanli
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
@@ -732,10 +733,12 @@ export default {
       jrzblist: [],
       //登记落实
       djlslist: [],
+      jclist:[],
       //定时器
       timer: null,
       //外出人员占比
       wclist: [],
+      wylist:[],
       config: {
         header: ["单位", "防疫名称", "现有数量"],
         data: [
@@ -830,8 +833,15 @@ export default {
     });
     //集中文印
     rizongwenyin().then(res=>{
-        console.log(res)
+        // console.log(res.data[0])
+        this.wylist=res.data;
+    })
+    //军车
+    juncheguanli().then(res=>{
+        // console.log(res)
+        this.jclist=res.data;
     })
+    //涉密移动载体
     getNumber().then(res=>{
       cconsole.log(res)
     })
@@ -1907,7 +1917,7 @@ export default {
   display: flex;
 }
 .right3-r-main-item-r .s1 {
-  width: 50%;
+  width: 70%;
   color: #fff;
   font-size: 14px;
   display: flex;
@@ -1916,7 +1926,7 @@ export default {
   margin-left: 3%;
 }
 .right3-r-main-item-r .s2 {
-  width: 50%;
+  width: 30%;
   font-size: 14px;
   color: #fff;
   display: flex;