更改态势分析

src/api/taishi/taishi.js

@@ -115,4 +115,13 @@ export function listTraining(query) {
     method: 'get',
     params: query
   })
+}
+
+// 态势装备值班情况
+export function selectCount(query) {
+  return request({
+    url: '/combatduty/regisdutyinfo/selectCount',
+    method: 'get',
+    params: query
+  })
 }

src/views/PrintsManage/manage/index.vue

@@ -807,6 +807,7 @@
       width="700px"
       style="padding-top: 100px"
       :close-on-click-modal="false"
+      @close="close"
     >
       <el-form
         ref="dyform"
@@ -831,6 +832,7 @@
             v-model="dyform.isReturn"
             style="width: 200px"
             size="mini"
+            @change="dianji"
           >
             <el-radio label="1">归还</el-radio>
             <el-radio label="0">无需归还</el-radio>
@@ -888,6 +890,15 @@
             class="dyform-textarea"
           />
         </el-form-item>
+        <div class="jiben jiben2" v-if="ramrk">备注</div>
+        <el-form-item label prop="" v-if="ramrk">
+          <el-input
+            v-model="dyform.remark"
+            type="textarea"
+            placeholder="请输入备注"
+            class="dyform-textarea"
+          />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="dysubmitForm">打 印</el-button>
@@ -1131,15 +1142,12 @@ export default {
         isReturn: [
           { required: true, message: "是否归还需要选择", trigger: "change" },
         ],
-        printName : [
+        printName: [
           { required: true, message: "打印文件不能为空", trigger: "change" },
         ],
-        printNumber : [
-          { required: true, message: "打印份数不能为空", trigger: "blur" },
+        printfileName: [
+          { required: true, message: "打印人不能为空", trigger: "change" },
         ],
-        printfileName :[
-          { required: true, message: "打印人不能为空", trigger: "change" }
-        ]
       },
       //级别
       levelMs: [],
@@ -1204,6 +1212,8 @@ export default {
       form1: {},
       open1: false,
       title1: "",
+      // 打印备注
+      ramrk:false
     };
   },
   created() {
@@ -1229,6 +1239,18 @@ export default {
     this.roles = Cookies.get("roles");
   },
   methods: {
+    // 打印点击叉号关闭事件
+    close(){
+      this.ramrk=false
+    },
+    // 点击是否需要归还触发
+    dianji(data){
+     if(data=='1') {
+       this.ramrk =false
+     }else if(data=='0'){
+       this.ramrk=true
+     }
+    },
     // 增加工作登记
     addForms() {
       this.tomList.push({
@@ -1267,6 +1289,7 @@ export default {
     },
     dycancel() {
       this.dyopen = false;
+      this.ramrk=false
       this.dyreset();
     },
     // 表单重置
@@ -1421,12 +1444,29 @@ export default {
             });
           } else {
             this.form.printsManageList = this.tomList;
-
-            addManage(this.form).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            var num = 0;
+            var num1 = this.tomList.length;
+            for (let index = 0; index < this.tomList.length; index++) {
+              if (this.tomList[index].levelM) {
+                num += 1;
+              } else {
+                return this.$modal.msgWarning("请选择级别");
+              }
+            }
+            // this.tomList.forEach((item,i)=>{
+            //   if(item.levelM){
+            //     num+=1
+            //   }else{
+            //      return this.$modal.msgWarning("请选择级别");
+            //   }
+            // })
+            if (num1 == num) {
+              addManage(this.form).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
         }
       });
@@ -1670,6 +1710,7 @@ export default {
                 };
                 xhr.send();
                 this.dyopen = false;
+                this.ramrk=false
                 this.getList();
               } else {
                 let downloadElement = document.createElement("a");
@@ -1682,6 +1723,7 @@ export default {
                 downloadElement.click(); //点击下载
                 document.body.removeChild(downloadElement);
                 this.dyopen = false;
+                this.ramrk=false
                 this.printshow = true;
                 this.getList();
               }

src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -215,7 +215,6 @@
           <el-select
             v-model="form.kind"
             placeholder="请选择种类"
-            @change="zhongLei"
           >
             <el-option
               v-for="(item, i) in ziDian"
@@ -228,7 +227,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入编号" disabled />
+          <el-input v-model="form.number" placeholder="请输入编号" />
         </el-form-item>
         <el-form-item label="型号" prop="version">
           <el-input v-model="form.version" placeholder="请输入型号" />
@@ -454,9 +453,9 @@ export default {
   },
   methods: {
     // 种类选择触发
-    zhongLei() {
-      this.planName();
-    },
+    // zhongLei() {
+    //   this.planName();
+    // },
     // 计划编号
     planName() {
       let date = new Date();

src/views/materialManagement/archives/index.vue

@@ -15,6 +15,15 @@
           size="small"
           @input="handleQuery"
         />
+      </el-form-item>
+        <el-form-item prop="responsibilityUnit">
+        <el-input
+          v-model="queryParams.responsibilityUnit"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
       </el-form-item>
       <!-- <el-form-item label="物品类型" prop="wuPinType">
         <el-select v-model="queryParams.wuPinType" placeholder="请选择物品类型" clearable size="small">

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -183,8 +183,8 @@
         </template>
       </el-table-column>
       <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
-      <el-table-column label="进入时间" align="center" prop="authStime" />
-      <el-table-column label="离开时间" align="center" prop="authEtime" />
+      <el-table-column label="进入时间" align="center" prop="jinrushiajin" />
+      <el-table-column label="离开时间" align="center" prop="likaishitian" />
       <el-table-column
         label="备注"
         align="center"

src/views/militaryvehicleManagement/thebus/index.vue

@@ -291,7 +291,7 @@
         label="所属单位"
         align="center"
         prop="unitName"
-        width="150px"
+        width="200px"
       />
       <el-table-column
         label="联系方式"
@@ -301,7 +301,7 @@
       />
       <el-table-column label="发动机号" align="center" prop="engineNumber" />
       <el-table-column label="车架号" align="center" prop="frameNumber" />
-      <el-table-column label="车辆来源" align="center" prop="source" />
+      <el-table-column label="车辆来源" align="center" prop="source" width="200"/>
       <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
       <el-table-column label="出厂日期" align="center" prop="date1" width="100">
         <template slot-scope="scope">
@@ -335,6 +335,13 @@
         align="center"
         prop="seatCount"
         width="120"
+      />
+       <el-table-column
+        label="备注"
+        align="center"
+        prop="remarks"
+        width="120"
+        show-overflow-tooltip
       />
       <!-- <el-table-column label="创建时间" align="center" prop="createtime" /> -->
       <!-- <el-table-column

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -102,7 +102,7 @@
       <el-table-column
         label="备注"
         align="center"
-        prop="contactnumber"
+        prop="remark"
         show-overflow-tooltip
       />
       <!-- <el-table-column

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -121,34 +121,48 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="人数" align="center" prop="peopleCount" />
+      <!-- <el-table-column label="人数" align="center" prop="peopleCount" /> -->
       <el-table-column
         label="单位"
         align="center"
         prop="unitName"
-        width="150"
+        width="200"
       />
-      <el-table-column label="人员名称" align="center" prop="peopleName" />
-      <el-table-column
+      <el-table-column label="带车人" align="center" prop="peopleName" />
+      <!-- <el-table-column
         label="联系方式"
         align="center"
         prop="contact"
         width="130"
-      />
+      /> -->
       <el-table-column
-        label="外出事由"
+        label="外出路线"
         align="center"
         prop="cause"
         show-overflow-tooltip
       />
       <el-table-column
-        label="申请时间"
+        label="开始时间"
         align="center"
         prop="authStime"
-        width="100"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <span>{{
+            parseTime(scope.row.authStime, "{y}-{m}-{d} {h}:{m}:{s}")
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="authEtime"
+        width="200"
       >
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.authStime, "{y}-{m}-{d}") }}</span>
+          <span>{{
+            parseTime(scope.row.authEtime, "{y}-{m}-{d} {h}:{m}:{s}")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -1145,7 +1159,7 @@ export default {
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
-        this.renYuans = res.rows;
+        this.renYuan = res.rows;
       });
     },
     // 特殊审批通过
@@ -1264,13 +1278,14 @@ export default {
       this.getTreeList();
       this.getYingJi();
       this.getShenPi();
+      this.getSuo();
       const id = row.id || this.ids;
       if (row.shenpijiedian != "1") {
         this.dislable = true;
       }
       getThebusApply(id).then((response) => {
         this.form = response.data;
-        this.getRen(this.form.unitId);
+        // this.getRen(this.form.unitId);
         this.opensTe = true;
         this.title = "审批用车申请";
       });
@@ -1377,7 +1392,8 @@ export default {
       this.dislable = true;
       getThebusApply(id).then((response) => {
         this.form = response.data;
-        this.getRen(this.form.unitId);
+        // this.getRen(this.form.unitId);
+        this.getSuo();
         this.opens = true;
         this.title = "审批用车申请";
       });
@@ -1426,7 +1442,6 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
-      this.getRen(data.id);
       this.getSuozaiRen(data.id);
     },
     getSuozaiRen(id) {
@@ -1512,6 +1527,7 @@ export default {
     handleAdd() {
       this.dislable = false;
       this.reset();
+      this.getSuo();
       this.getYingJi();
       this.getShenPi();
       this.getTreeList();
@@ -1550,13 +1566,14 @@ export default {
       this.getTreeList();
       this.getYingJi();
       this.getShenPi();
+      this.getSuo();
       const id = row.id || this.ids;
       if (row.shenpijiedian != "1") {
         this.dislable = true;
       }
       getThebusApply(id).then((response) => {
         this.form = response.data;
-        this.getRen(this.form.unitId);
+        // this.getRen(this.form.unitId);
         this.open = true;
         this.title = "修改用车申请";
       });

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -87,9 +87,9 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="出车时间" align="center" prop="outtime">
+      <el-table-column label="出车时间" align="center" prop="authStime" width="200">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.outtime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.authStime, "{y}-{m}-{d} {h}:{m}:{s}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="流程" align="center" prop="outtime">

src/views/peopleManage/people/index.vue

@@ -517,7 +517,7 @@
               >删除</el-button
             >
           </el-col>
-          <!-- <el-col :span="1.5">
+          <el-col :span="1.5">
             <el-button
               type="warning"
               plain
@@ -527,7 +527,7 @@
               @click="handleExport"
               v-hasPermi="['peopleManage:people:export']"
             >导出</el-button>
-          </el-col>-->
+          </el-col>
           <!-- <right-toolbar
             :showSearch.sync="showSearch"
             @queryTable="getList"

src/views/pt.vue

@@ -1008,7 +1008,7 @@ export default {
       Cookies.set("shuaxin", "false");
     },
     taishifun() {
-      this.$router.push({ path: "/taishi1" }).catch(() => {});
+      this.$router.push({ path: "/taishi" }).catch(() => {});
       Cookies.set("shuaxin", "false");
       // window.open(`/taishi`,'_self');
     },

src/views/regulations/fileinfo/index.vue

@@ -20,7 +20,10 @@
         >
           <template slot-scope="scope">
             <div style="display: flex; flex-warp: warp; margin-top: 10px">
-              <div style="padding-left: 20px" class="uploadPeople">
+              <div
+                style="padding-right: 12vh; width: 40px; height: 52px"
+                class="uploadPeople"
+              >
                 <!-- 根据后缀名控制图片显示doc还是pdf形式 -->
                 <img
                   v-if="scope.row.parentDirId == '.pdf'"
@@ -38,7 +41,7 @@
               </div>
               <!-- 文件名称 fileName -->
               <div>
-                <div style="text-align: start; width: 100%; margin-left: 30px">
+                <div style="text-align: start; width: 100%">
                   {{ scope.row.fileName }}
                 </div>
                 <!-- 上传人 createUser -->
@@ -46,7 +49,7 @@
                 <!-- 时间 createTime -->
                 <!-- 阅读量 readVolume -->
                 <div style="display: flex">
-                  <span
+                  <!-- <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
@@ -57,7 +60,7 @@
                       text-align: start;
                     "
                     >上传人：{{ scope.row.createUser }}</span
-                  >
+                  > -->
                   <span
                     style="
                       font-size: 14px;
@@ -88,7 +91,7 @@
                     "
                     >阅读量：{{ scope.row.readVolume }}</span
                   >
-                  <span
+                  <!-- <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
@@ -96,7 +99,7 @@
                       display: block;
                     "
                     >分类：{{ scope.row.directoryName }}</span
-                  >
+                  > -->
                 </div>
               </div>
             </div>

src/views/taishi/index.vue

@@ -43,15 +43,15 @@
             <div class="left2-1-main">
               <div class="left2_d">
                 总计
-                <span>0</span>
+                <span>{{ zhuangBei[0] }}</span>
               </div>
               <div class="left2_d">
                 试验
-                <span>0</span>
+                <span>{{ zhuangBei[1] }}</span>
               </div>
               <div class="left2_d">
                 通用
-                <span>0</span>
+                <span>{{ zhuangBei[2] }}</span>
               </div>
             </div>
           </div>
@@ -84,15 +84,15 @@
                   </tr>
                   <tr>
                     <td>合成训练</td>
-                    <td>{{yueJiHua.synthesis}}</td>
+                    <td>{{ yueJiHua.synthesis }}</td>
                   </tr>
                   <tr>
                     <td>专业训练</td>
-                    <td>{{yueJiHua.professional}}</td>
+                    <td>{{ yueJiHua.professional }}</td>
                   </tr>
                   <tr>
                     <td>共同训练</td>
-                    <td>{{yueJiHua.common}}</td>
+                    <td>{{ yueJiHua.common }}</td>
                   </tr>
                 </table>
                 <table class="grade">
@@ -105,7 +105,7 @@
                         font-size: 20px;
                       "
                     >
-                      {{yueJiHua.peopleNumber}}
+                      {{ yueJiHua.peopleNumber }}
                     </td>
                   </tr>
                   <tr>
@@ -117,7 +117,7 @@
                         font-size: 20px;
                       "
                     >
-                        {{yueJiHua.youliang}}
+                      {{ yueJiHua.youliang }}
                     </td>
                   </tr>
                   <tr>
@@ -129,7 +129,7 @@
                         font-size: 20px;
                       "
                     >
-                       {{yueJiHua.jige}}  
+                      {{ yueJiHua.jige }}
                     </td>
                   </tr>
                   <tr>
@@ -141,7 +141,7 @@
                         font-size: 20px;
                       "
                     >
-                      {{yueJiHua.weijige}}  
+                      {{ yueJiHua.weijige }}
                     </td>
                   </tr>
                 </table>
@@ -158,6 +158,87 @@
             <span>车辆在位情况</span>
           </div>
           <div class="left3-main">
+            <div class="center4_l" style="margin-left: 2%">
+              <div
+                style="background-color: #1d79b5; width: 5px; height: 9px"
+              ></div>
+              私家车管理
+            </div>
+            <div class="center4_l" style="margin-left: 16%">
+              <div
+                style="background-color: #1d79b5; width: 5px; height: 9px"
+              ></div>
+              军车管理
+            </div>
+
+            <table class="center4_s">
+              <tr>
+                <td rowspan="2">
+                  <img src="../../assets/images/cheliangz.png" alt />
+                </td>
+                 <td style="width: 88px; color: white;font-size: 1rem">车辆统计</td>
+                <td
+                  style="color: #30fdff; font-family: 'IMPACT'; font-size: 1.6rem"
+                >
+                  119
+                </td>
+              </tr>
+               
+            </table>
+            <table class="center4_s" style="margin-top: 1.3%">
+              <tr>
+                <td rowspan="2">
+                  <img src="../../assets/images/cheliangz.png" alt />
+                </td>
+                <td style="width: 88px; color: white;font-size: 1rem">今日进出</td>
+                <td
+                  style="color: #30fdff; font-family: 'IMPACT'; font-size: 1.6rem"
+                >
+                  107
+                </td>
+              </tr>
+            </table>
+
+            <table class="center4_s" style="margin-top: 1.28%">
+              <tr>
+                <td rowspan="2">
+               <img src="../../assets/images/cheliangq.png" alt />
+                </td>
+                  <td style="width: 88px; color: white;font-size: 1rem">夜间进入</td>
+                <td
+                  style="color: #b4372a; font-family: 'IMPACT'; font-size: 1.6rem"
+                >
+                  12
+                </td>
+                
+              </tr>
+            </table>
+            <div class="center4_b">
+              总计
+              <span style="color: #30fdff; float: right; margin-right: 20px"
+                >71</span
+              >
+            </div>
+            <div class="center4_b">
+              在位
+              <span style="color: #fde17b; float: right; margin-right: 20px"
+                >52</span
+              >
+            </div>
+            <div class="center4_b">
+              外出
+              <span style="color: #f0422a; float: right; margin-right: 20px"
+                >19</span
+              >
+            </div>
+            <div class="center4_b">
+              出车统计
+              <span style="color: #f0422a; float: right; margin-right: 20px"
+                >3</span
+              >
+            </div>
+          </div>
+          <!-- <div class="left3-main">
             <div class="center4_l" style="margin-left: 2%">
               <div
                 style="background-color: #1d79b5; width: 5px; height: 9px"
@@ -265,7 +346,7 @@
                 </td>
               </tr>
             </table>
-          </div>
+          </div> -->
         </div>
       </div>
       <div class="center">
@@ -977,7 +1058,8 @@ import {
   getLeavlNumber,
   zongjinrizhiban,
   zaiweipeopleGet,
-  listTraining
+  listTraining,
+  selectCount,
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
@@ -1066,7 +1148,9 @@ export default {
       // 营房统计
       yingFang: [],
       // 月计划训练统计
-      yueJiHua:{}
+      yueJiHua: {},
+      // 装备统计
+      zhuangBei: [],
     };
   },
   created() {
@@ -1176,7 +1260,9 @@ export default {
     });
     this.startTime();
     // 军事训练月统计
-    this.getJunShiTongJi()
+    this.getJunShiTongJi();
+    // 装备值班统计
+    this.getZhuangBei();
   },
   mounted() {
     this.$forceUpdate();
@@ -1195,12 +1281,19 @@ export default {
     this.center4();
   },
   methods: {
-        // 军事训练月统计情况
-    getJunShiTongJi(){
-      listTraining().then(res=>{
+    // 装备值班情况
+    getZhuangBei() {
+      selectCount().then((res) => {
         console.log(res);
-        this.yueJiHua=res.data
-      })
+        this.zhuangBei = res.data;
+      });
+    },
+    // 军事训练月统计情况
+    getJunShiTongJi() {
+      listTraining().then((res) => {
+        console.log(res);
+        this.yueJiHua = res.data;
+      });
     },
     titlefun() {
       this.$router.push({ path: "/pt" }).catch(() => {});
@@ -2190,37 +2283,52 @@ export default {
   color: #30fdff;
 }
 .center4_b {
-  margin-top: 0.8vh;
+  /* margin-top: 0.8vh;
   margin-left: 2%;
   color: white;
   font-size: 1rem;
   background-color: rgba(3, 58, 93, 0.3);
   border: 0.1px solid #052c41;
-  height: 6vh;
+  height: 4vh;
   width: 35%;
-  line-height: 6vh;
-  text-align: center;
+  line-height: 4vh;
+  text-align: center; */
+  margin-top: 0.8vh;
+  margin-left: 2%;
+  color: white;
+  font-size: 1rem;
+  background-color: rgba(3, 58, 93, 0.3);
+  border: 0.1px solid #052c41;
+  height: 4vh;
+  width: 46%;
+  line-height: 4vh;
+  /* text-align: center; */
+  position: relative;
+  top: -85%;
+  right: -50%;
+  padding-left: 10%;
 }
 
 .center4_b span {
   font-family: "IMPACT";
   font-size: 1.6rem;
-  margin-left: 20px;
+  /* margin-left: 20px; */
 }
 .center4_s {
-  /* transform: scale(0.8); */
-  /* width: 20px; */
-  height: 6.3vh;
-  /* width: ; */
+  /* height: 6.3vh;
   line-height: 2vh;
   position: relative;
-  top: -80%;
-  left: 40%;
   margin-top: -0.5vh;
   margin-left: 4px;
+  margin-bottom: 5px; */
+  height: 6.3vh;
+  line-height: 2vh;
+  /* position: relative; */
+  margin-top: -0.5vh;
+  margin-left: 30px;
   /* line-height: 50px; */
   margin-bottom: 5px;
-  /* margin-top: 10px; */
+  margin-top: 10px;
 }
 .center4_s img {
   width: 45px;

src/views/thought/teacher/index.vue

@@ -206,7 +206,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" align="center" prop="id" />
-      <el-table-column label="目录" align="center" prop="directory">
+      <el-table-column label="目录" align="center" prop="directory" show-overflow-tooltip>
         <template slot-scope="scope">
           <div
             @click="mulus(scope.row)"
@@ -237,7 +237,7 @@
                 top: 2px;
               "
             />
-            <span style="position: relative;right:-20px"> {{ scope.row.directory }}</span>
+            <span style="position: relative;right:-148px"> {{ scope.row.directory }}</span>
           </div>
         </template>
       </el-table-column>

src/views/thought/teacherFile/index.vue

@@ -20,7 +20,7 @@
         >
           <template slot-scope="scope">
             <div style="display: flex; flex-warp: warp; margin-top: 10px">
-              <div style="padding-left: 0px" class="uploadPeople">
+              <div style="padding-right: 12vh; width: 40px; height: 52px" class="uploadPeople">
                 <!-- 根据后缀名控制图片显示doc还是pdf形式 -->
                 <img
                   v-if="scope.row.parentDirId == '.pdf'"
@@ -38,7 +38,7 @@
               </div>
               <!-- 文件名称 fileName -->
               <div>
-                <div style="text-align: start; width: 100%; margin-left: 30px">
+                <div style="text-align: start; width: 100%; ">
                   {{ scope.row.fileName }}
                 </div>
                 <!-- 上传人 createUser -->
@@ -66,7 +66,6 @@
                       width: 180px;
                       display: block;
                       text-align: start;
-                      margin-left: 30px;
                     "
                     >时间：{{ scope.row.createTime }}</span
                   >