更改检查督导，更改首页，更改态势，更改基层，更改人员请假，更改人力资源

src/api/grassrootsregistration/bdgldrill.js

@@ -66,4 +66,19 @@ export function getweekwork(query) {
     method: 'get',
 
   })
-}
+}
+// 删除修改中的列表数据
+export function drillFu(id) {
+  return request({
+    url: '/grassrootsregistration/drillFu/' + id,
+    method: 'delete'
+  })
+}
+
+
+export function treeselects(id) {
+  return request({
+    url: `/grassrootsregistration/type/`+id,
+    method: 'get',
+  })
+}

src/api/system/training.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询态势军事训练月统计情况列表
+export function listTraining(query) {
+  return request({
+    url: '/system/training/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询态势军事训练月统计情况详细
+export function getTraining(id) {
+  return request({
+    url: '/system/training/' + id,
+    method: 'get'
+  })
+}
+
+// 新增态势军事训练月统计情况
+export function addTraining(data) {
+  return request({
+    url: '/system/training',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改态势军事训练月统计情况
+export function updateTraining(data) {
+  return request({
+    url: '/system/training',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除态势军事训练月统计情况
+export function delTraining(id) {
+  return request({
+    url: '/system/training/' + id,
+    method: 'delete'
+  })
+}

src/api/taishi/taishi.js

@@ -107,4 +107,12 @@ export function zaiweipeopleGet() {
     url: "/situation/situationinfo/getBarracks",
     method: "get"
   });
+}
+// 态势军事训练月统计情况列表
+export function listTraining(query) {
+  return request({
+    url: '/system/training/list',
+    method: 'get',
+    params: query
+  })
 }

src/assets/styles/global.css

@@ -566,6 +566,36 @@ color: #fff;
   color: #FFFFFF;
 }
 
+/* 月计划训练确定按钮 */
+/* 按钮特殊审批 */
+.el-button--btq {
+  width: 120px !important;
+  height: 50px;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 18px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1d96ff;
+  margin-bottom: 10px;
+  margin-right: 10px;
+}
+
+.el-button--btq:focus,
+.el-button--btq:hover {
+  background: #41a4fa;
+  border-color: #41a4fa;
+  color: #FFFFFF;
+}
+
+.el-button--btq.is-active,
+.el-button--btq:active {
+  background: #1d96ff;
+  border-color: #1d96ff;
+  color: #FFFFFF;
+}
+
 /* 控制按钮样式颜色 end */
 
 

src/components/FileUpload/index.vue

@@ -168,7 +168,7 @@ export default {
     },
     // 文件个数超出
     handleExceed() {
-      this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
+      this.$message.error(`上传文件数量不能超过 ${this.limit} 个`);
     },
     // 上传失败
     handleUploadError(err) {

src/components/flv/index.vue

@@ -16,26 +16,52 @@
 <script>
 import flvjs from "flv.js";
 export default {
-    name: 'faith',
+  name: "faith",
   props: ["id", "url"],
   data() {
     return {
-        flvPlayer: null,
+      flvPlayer: null,
     };
   },
-  created() {
-    console.log(this.url);
-  },
+  created() {},
   mounted() {
     this.singleplayvideo();
   },
   methods: {
+    // 初始化视频
     singleplayvideo() {
       if (flvjs.isSupported()) {
         var videoElement = document.getElementById(this.id);
-        this.flvPlayer = flvjs.createPlayer({
-          type: "flv",
-          url: this.url,
+        this.flvPlayer = flvjs.createPlayer(
+          {
+            type: "flv",
+            url: this.url,
+          },
+          {
+            enableWorker: false, //不启用分离线程
+            enableStashBuffer: false, //关闭IO隐藏缓冲区
+            reuseRedirectedURL: true, //重用301/302重定向url，用于随后的请求，如查找、重新连接等。
+            autoCleanupSourceBuffer: true, //自动清除缓存
+            fixAudioTimestampGap: false,
+          }
+        );
+        this.$nextTick(() => {
+          // 可以使用回调函数的写法
+          // 这个函数中DOM必定渲染完成
+          // let videoElement1 = document.getElementById("singleplay" + num);
+          // debugger;
+          this.flvPlayer.attachMediaElement(videoElement);
+          // name.load();
+          // name.play();
+          if (this.url !== "" && this.url !== null) {
+          }
+          this.flvPlayer.on(flvjs.Events.ERROR, (errType, errDetail) => {
+            // alert("网络波动,正在尝试连接中...");
+            if (this.flvPlayer) {
+              this.reloadVideo(this.flvPlayer);
+            }
+          });
+          // this.flvPlayerList1.push(this.flvPlayer);
         });
         this.flvPlayer.attachMediaElement(videoElement);
         this.flvPlayer.load();
@@ -52,7 +78,7 @@ export default {
   },
   watch: {
     url(newname) {
-      this.destoryVideo(this.flvPlayer)
+      this.destoryVideo(this.flvPlayer);
       this.singleplayvideo();
     },
   },

src/components/look_word/bdgldrill.vue

@@ -24,7 +24,7 @@
           font-family: 'heiti'
         "
       >
-        <span class="a1">月</span> 日军事训练登记表
+       军事训练登记表
       </p>
       <table
       class="b1"
@@ -87,12 +87,12 @@
           <tr class="JR_tr">
             <td width="101" class="JR_right">
               <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
-                {{ message.project }}
+                {{ message.name}}
                 <!-- <span style="display: none">111</span> -->
               </p>
             </td>
             <td width="113" class="JR_right">
-              <p align="center" style="font-family: 'fangsong'">{{ message.contents }}</p>
+              <p align="center" style="font-family: 'fangsong'">{{ message.common }}</p>
             </td>
             <!--<td width="85"><p align="center">2021-12-15</p></td>-->
             <td width="85" class="JR_right">
@@ -105,24 +105,24 @@
               <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.address }}</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.oughtTo }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.yingxun }}人</p>
             </td>
             <td width="57" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.actual }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.shixun }}人</p>
             </td>
             <td width="68" nowrap="" class="JR_right">
               <p align="center" style="margin: 10px 0;font-family: 'fangsong'">
-                {{ message.probability }}
+                {{ message.participationRate }}
               </p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.result }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.pass }}</p>
             </td>
             <td width="104" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.expend }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.excellent }}</p>
             </td>
             <td width="83" nowrap="" class="JR_right">
-              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.remark }}</p>
+              <p align="center" style="margin: 10px 0;font-family: 'fangsong'">{{ message.fail }}</p>
             </td>
           </tr>
 
@@ -261,6 +261,9 @@ export default {
         ".b1{width:860px !important};.JR_tr {height: 40px;};.JR_left{font-size: 1.121em; font-family: '楷体_GB2312';};.JR_right{ font-size: 1.311em; font-family: 仿宋_GB2312;};.JR_bottom{ font-size: 1.331em; font-family: 仿宋_GB2312; text-align: right},",
     };
   },
+  created(){
+    console.log(this.message);
+  },
   methods: {
     daochu() {
       lookWord(this.title, "#contents", this.style, true);

src/views/PrintsManage/manage/index.vue

@@ -1135,7 +1135,7 @@ export default {
           { required: true, message: "打印文件不能为空", trigger: "change" },
         ],
         printNumber : [
-          { required: true, message: "打印份数不能为空", trigger: "change" },
+          { required: true, message: "打印份数不能为空", trigger: "blur" },
         ],
         printfileName :[
           { required: true, message: "打印人不能为空", trigger: "change" }

src/views/bdglregular/regularcountinfo/index.vue

@@ -265,6 +265,7 @@ export default {
             option.series[0].data = [{ value: 0, name: "无" }];
           }
           myChart.setOption(option);
+          myChart.on("click", this.eConsole1);
         }
       });
     },
@@ -404,14 +405,27 @@ export default {
     },
     //饼状图点击事件
     eConsole(param) {
-      this.$router
+    if(param.data.id )
+    {
+        this.$router
         .push({
           path: "/bdglregular/regularinfo",
           query: { obj: param.data },
         })
         .catch(() => {});
+    }
+    },
+    // 整体情况跳转
+    eConsole1() {
+      this.$router
+        .push({
+          path: "/bdglregular/regularinfo",
+          query: {},
+        })
+        .catch(() => {});
     },
   },
+  
 };
 </script>
 

src/views/bdglregular/regularinfo/index.vue

@@ -1094,9 +1094,9 @@ export default {
     this.getDicts("inspectionType").then((response) => {
       this.inspectionType = response.data;
     });
-
-    if (this.$route.query.id) {
-      bumenlist(this.$route.query.id).then((res) => {
+    if (this.$route.query.obj) {
+      this.queryParams.inspectedUnitId =this.$route.query.obj.id
+      listRegularinfos( this.queryParams).then((res) => {
         this.regularinfoList = res.rows;
         this.total = res.total;
         this.loading = false;
@@ -1106,7 +1106,7 @@ export default {
     }
   },
   watch: {
-    $route(to, from) {
+      $route(to, from) {
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
@@ -1130,16 +1130,9 @@ export default {
         documentProof: null,
         caoZuoType: 0,
       };
-      if (to.query.id) {
-        bumenlist(to.query.id).then((res) => {
-          this.regularinfoList = res.rows;
-          this.total = res.total;
-          this.loading = false;
-        });
-      } else if (to.query.obj) {
-        this.queryParams.inspectedUnitId = to.query.obj.id + "";
-        this.queryParams.currentState = to.query.obj.name + "";
-
+       if (to.query.obj) {
+        this.queryParams.inspectedUnitId = to.query.obj.id ;
+        this.queryParams.currentState = to.query.obj.name;
         listRegularinfos(this.queryParams).then((res) => {
           this.regularinfoList = res.rows;
           this.total = res.total;
@@ -1148,7 +1141,6 @@ export default {
       } else {
         this.getList();
       }
-
       // listRegularinfos
     },
   },

src/views/bdglregular/specialcountinfo/index.vue

@@ -259,6 +259,7 @@ export default {
             option.series[0].data = [{ value: 0, name: "无" }];
           }
           myChart.setOption(option);
+           myChart.on("click", this.eConsole1);
         }
       });
     },
@@ -397,7 +398,7 @@ export default {
     },
     //饼状图点击事件
     eConsole(param) {
-      if (param.data) {
+      if (param.data.id) {
         this.$router
           .push({
             path: "/bdglregular/specialinfo",
@@ -405,6 +406,17 @@ export default {
           })
           .catch(() => {});
       }
+    },
+      //全部饼状图点击事件
+    eConsole1(param) {
+      if (param.data) {
+        this.$router
+          .push({
+            path: "/bdglregular/specialinfo",
+            query: {}
+          })
+          .catch(() => {});
+      }
     }
   }
 };

src/views/bdglregular/specialinfo/index.vue

@@ -221,14 +221,6 @@
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" key="index" type="index" />
       <!-- <el-table-column label="受检单位_id" align="center" prop="inspectedUnitId" /> -->
-      <el-table-column
-        label="检查单位"
-        align="center"
-        prop="unitCheckName"
-        width="150"
-        key="unitCheck"
-        v-if="queryParams.caoZuoType == 0"
-      />
       <el-table-column
         :label="queryParams.caoZuoType == 0 ? '受检单位' : '单位'"
         align="center"
@@ -996,8 +988,6 @@ export default {
       });
     } else if (this.$route.query.obj) {
       this.queryParams.inspectedUnitId = this.$route.query.obj.id;
-      this.queryParams.currentState = this.$route.query.obj.name + "";
-
       listSpecialinfos(this.queryParams).then((res) => {
         this.specialinfoList = res.rows;
         this.total = res.total;
@@ -1036,8 +1026,6 @@ export default {
         });
       } else if (to.query.obj) {
         this.queryParams.inspectedUnitId = to.query.obj.id;
-        this.queryParams.currentState = to.query.obj.name + "";
-
         listSpecialinfos(this.queryParams).then((res) => {
           this.specialinfoList = res.rows;
           this.total = res.total;

src/views/combatduty/grassdutyinfo/index.vue

@@ -15,7 +15,7 @@
           <p>日期</p>
           <div class="a1"></div>
           <el-date-picker
-            v-model="tiem"
+            v-model="queryParams.attendedTime"
             type="date"
             :editable="false"
             placeholder="选择日期"
@@ -707,8 +707,6 @@ export default {
       },
       danWie: "",
       deptId: null,
-      // 外面时间选择
-      tiem: "",
     };
   },
   created() {
@@ -721,7 +719,7 @@ export default {
   methods: {
     // 点击外面时间触发
     tiemes() {
-      this.queryParams.attendedTime = this.tiem;
+      this.queryParams.type=null
       this.getList();
     },
     // 获取登录信息
@@ -925,6 +923,7 @@ export default {
     //值班分类
     caoZuoTypefun() {
       this.queryParams.unitId = null;
+      this.queryParams.attendedTime=null
       this.getList();
     },
     //首长电话

src/views/grassrootsregistration/bdgldrill/index.vue

@@ -190,7 +190,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -201,74 +201,78 @@
           v-hasPermi="['grassrootsregistration:bdgldrill:export']"
           >导出</el-button
         >
-      </el-col>
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      </el-col> -->
     </el-row>
 
     <el-table
-      v-loading="loading"
       :data="bdgldrillList"
       @selection-change="handleSelectionChange"
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column label="创建人id" align="center" prop="id" /> -->
-      <el-table-column label="训练项目" align="center" prop="project" />
+      <el-table-column label="序号" align="center" prop="id">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="训练类别"
+        align="center"
+        prop="trainingCategory"
+      />
+      <el-table-column label="训练地点" align="center" prop="address" />
       <el-table-column
         label="训练时间"
         align="center"
         prop="drillTime"
-        width="180"
+        width="150"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.drillTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="训练地点" align="center" prop="address" />
-      <el-table-column label="应训" align="center" prop="oughtTo" />
-      <el-table-column label="文件名称" align="center" prop="filename" />
-      <el-table-column label="文件路径" align="center" prop="filepath" />
-      <el-table-column label="装备" align="center" prop="equipment" />
-      <el-table-column label="弹药" align="center" prop="ammunition" />
-      <el-table-column label="摩托时间" align="center" prop="mototime" />
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="训练结束时间"
         align="center"
         prop="drillEndtime"
-        width="180"
+        width="150"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.drillEndtime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitId" />
+      <el-table-column label="单位" align="center" prop="unitname" />
+      <!-- <el-table-column label="应训" align="center" prop="oughtTo" /> -->
       <el-table-column
-        label="训练类别"
+        label="文件名称"
         align="center"
-        prop="trainingCategory"
+        prop="filename"
+        show-overflow-tooltip
       />
+      <el-table-column label="装备" align="center" prop="equipment" />
+      <el-table-column label="弹药" align="center" prop="ammunition" />
+      <el-table-column label="摩托时间" align="center" prop="mototime" />
       <el-table-column
-        label="创建时间"
+        label="备注"
         align="center"
-        prop="createtime"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
+        prop="fail"
+        show-overflow-tooltip
+      />
+
       <!-- <el-table-column label="创建人id" align="center" prop="createId" /> -->
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
         width="200"
+        fixed="right"
       >
         <template slot-scope="scope">
+          <el-button size="btk" type="text" @click="handleChakan(scope.row)"
+            ><span class="chakan">查看</span></el-button
+          >
           <el-button
             size="btu"
             type="text"
@@ -276,9 +280,6 @@
             v-hasPermi="['grassrootsregistration:bdgldrill:edit']"
             >修改</el-button
           >
-          <el-button size="btk" type="text" @click="handleChakan(scope.row)"
-            ><span class="chakan">查看</span></el-button
-          >
           <el-button
             size="btd"
             type="text"
@@ -298,12 +299,13 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改军事训练登记簿对话框 -->
+    <!-- 添加军事训练登记簿对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
       width="1060px"
       append-to-body
+      :close-on-click-modal="false"
     >
       <el-form
         ref="form"
@@ -322,7 +324,7 @@
             v-model="form.trainingCategory"
             :options="treeselects"
             :normalizer="defaultProps"
-            placeholder="请选择单位"
+            placeholder="请选择训练类别"
             @select="trainingCategoryselectPeo"
           />
         </el-form-item>
@@ -351,6 +353,7 @@
             style="display: inline-block"
             :show-file-list="false"
             class="m-l-20"
+            :limit="1"
           />
         </el-form-item>
         <el-form-item label="训练开始时间" prop="drillTime">
@@ -447,33 +450,286 @@
         <el-form-item label="装备" prop="equipment">
           <el-input v-model="form.equipment" placeholder="请输入装备" />
         </el-form-item>
-        <!-- <el-form-item label="训练地点" prop="address">
-          <el-input v-model="form.address" placeholder="请输入训练地点" />
+        <el-row>
+          <el-checkbox
+            v-model="form.assessment"
+            @change="checkboxs"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >是否参加考核</el-checkbox
+          >
+        </el-row>
+        <el-form-item label="应训(人数)" prop="yingxun">
+          <el-input
+            v-model.number="form.yingxun"
+            placeholder="请输入应训人数"
+            @change="yingxun"
+          />
         </el-form-item>
-        <el-form-item label="应训" prop="oughtTo">
-          <el-input v-model="form.oughtTo" placeholder="请输入应训" />
+        <el-form-item label="实训(人数)" prop="shixun">
+          <el-input
+            v-model.number="form.shixun"
+            placeholder="请输入实训人数"
+            @change="shixun"
+          />
         </el-form-item>
-        <el-form-item label="文件名称" prop="filename">
-          <el-input v-model="form.filename" placeholder="请输入文件名称" />
-        </el-form-item> -->
-        <!-- <el-form-item label="文件路径" prop="filepath">
-          <el-input v-model="form.filepath" placeholder="请输入文件路径" />
+        <el-form-item label="参训率" prop="participationRate">
+          <el-input v-model="form.participationRate" placeholder="" disabled />
         </el-form-item>
-
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label="效果(成绩)" prop="pass">
+          <el-input
+            v-model="form.pass"
+            placeholder="请输入效果成绩"
+            :disabled="dilabled"
+          />
         </el-form-item>
+        <el-form-item label="消耗" prop="excellent">
+          <el-input v-model="form.excellent" placeholder="请输入消耗" />
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item label="" prop="fail">
+          <el-input
+            v-model="form.fail"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <el-row>
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="adddrillFus"
+            style="margin-left: 0px; width: 100px; margin-bottom: 20px"
+            >添加人员</el-button
+          >
+        </el-row>
+        <el-form-item label="单位" prop="unitId" style="margin-left: -60px">
+          <treeselect
+            @select="selectPeo"
+            v-model="form.unitId"
+            :options="rese"
+            placeholder="请选择单位"
+          />
+        </el-form-item>
+        <el-table
+          :data="drillFus"
+          :header-cell-style="{ background: '#003C69', color: 'white' }"
+        >
+          <el-table-column label="姓名" align="center" prop="peopleName">
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.peopleId"
+                placeholder="请选择姓名"
+                filterable
+              >
+                <el-option
+                  :label="item.name"
+                  v-for="(item, i) in renYuan"
+                  :key="i"
+                  :value="item.id"
+                  class="input_xiala"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="参训状态"
+            align="center"
+            prop="trainingStatus"
+          >
+            <template slot-scope="scope">
+              <el-select
+                v-model="scope.row.trainingStatus"
+                placeholder="请选择参训状态"
+                filterable
+              >
+                <el-option
+                  v-for="dict in dict.type.military_training"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.label"
+                  class="input_xiala"
+                ></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" prop="state">
+            <template slot-scope="scope">
+              <el-button size="btd" type="text" @click="deldeitem(scope.$index)"
+                ><span class="delete">删除</span></el-button
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
+      </div>
+    </el-dialog>
 
-        <el-form-item label="单位" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位" />
-        </el-form-item> -->
-
-        <!-- <el-form-item label="创建人id" prop="createId">
-          <el-input v-model="form.createId" placeholder="请输入创建人id" />
+    <!-- 修改军事训练登记薄 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open1"
+      width="1060px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        :inline="true"
+        label-width="120px"
+      >
+        <div class="jiben">基本信息</div>
+        <el-form-item label="训练类别" prop="trainingCategory">
+          <!-- <el-input
+            v-model="form.trainingCategory"
+            placeholder="请输入训练类别"
+          /> -->
+          <treeselect
+            v-model="form.trainingCategory"
+            :options="treeselects"
+            :normalizer="defaultProps"
+            placeholder="请选择训练类别"
+            @select="trainingCategoryselectPeo"
+          />
+        </el-form-item>
+        <!-- <el-form-item label="训练项目" prop="project">
+          <el-input v-model="form.project" placeholder="请输入训练项目" />
         </el-form-item> -->
+        <el-form-item
+          label="证明材料"
+          prop="project2"
+          style="display: inline-block; width: 550px"
+        >
+          <!-- <input
+            type="text"
+            v-model="form.filename"
+            style="
+              width: 280px;
+              height: 36px;
+              background: transparent;
+              color: #fff;
+              border: 1px solid #fff !important;
+              display: inline-block;
+            "
+          /> -->
+          <fileUpload
+            v-model="form.filepath"
+            style="display: inline-block"
+            :show-file-list="false"
+            class="m-l-20"
+            :limit="1"
+          />
+        </el-form-item>
+        <el-form-item label="训练开始时间" prop="drillTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.drillTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择训练开始时间"
+            @change="drillTimechange"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item
+          label="训练结束时间"
+          prop="drillEndtime"
+          style="margin-left: 130px"
+        >
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.drillEndtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择训练结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="周工作内容">
+          <input
+            v-model="nr"
+            placeholder=""
+            style="
+              width: 810px;
+              height: 36px;
+              background: transparent;
+              color: #fff;
+              border: 1px solid #fff !important;
+            "
+            disabled
+          />
+        </el-form-item>
+        <el-row>
+          <el-checkbox
+            v-model="form.safety"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >安全训练</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.chiefOfficial"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >主官训练</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.targeted"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >针对性训练</el-checkbox
+          >
+          <el-checkbox
+            v-model="form.system"
+            style="
+              margin-right: 80px;
+              height: 40px;
+              margin-left: 70px;
+              color: #fff;
+            "
+            >系统性训练</el-checkbox
+          >
+        </el-row>
+        <el-form-item label="地点" prop="address">
+          <el-input v-model="form.address" placeholder="请输入训练地点" />
+        </el-form-item>
+        <el-form-item label="弹药" prop="ammunition">
+          <el-input v-model="form.ammunition" placeholder="请输入弹药" />
+        </el-form-item>
+        <el-form-item label="摩托时间" prop="mototime">
+          <el-input v-model="form.mototime" placeholder="请输入摩托时间" />
+        </el-form-item>
+        <el-form-item label="装备" prop="equipment">
+          <el-input v-model="form.equipment" placeholder="请输入装备" />
+        </el-form-item>
         <el-row>
           <el-checkbox
             v-model="form.assessment"
+            @change="checkboxs"
             style="
               margin-right: 80px;
               height: 40px;
@@ -483,14 +739,40 @@
             >是否参加考核</el-checkbox
           >
         </el-row>
-        <el-form-item label="优良(人数)" prop="excellent">
-          <el-input v-model="form.excellent" placeholder="请输入优良(人数)" />
+        <el-form-item label="应训(人数)" prop="yingxun">
+          <el-input
+            v-model.number="form.yingxun"
+            placeholder="请输入应训人数"
+            @change="yingxun"
+          />
+        </el-form-item>
+        <el-form-item label="实训(人数)" prop="shixun">
+          <el-input
+            v-model.number="form.shixun"
+            placeholder="请输入实训人数"
+            @change="shixun"
+          />
+        </el-form-item>
+        <el-form-item label="参训率" prop="participationRate">
+          <el-input v-model="form.participationRate" placeholder="" disabled />
+        </el-form-item>
+        <el-form-item label="效果(成绩)" prop="pass">
+          <el-input
+            v-model="form.pass"
+            placeholder="请输入效果成绩"
+            :disabled="dilabled"
+          />
         </el-form-item>
-        <el-form-item label="及格(人数)" prop="pass">
-          <el-input v-model="form.pass" placeholder="请输入及格(人数)" />
+        <el-form-item label="消耗" prop="excellent">
+          <el-input v-model="form.excellent" placeholder="请输入消耗" />
         </el-form-item>
-        <el-form-item label="不及格(人数)" prop="fail">
-          <el-input v-model="form.fail" placeholder="请输入不及格(人数)" />
+        <div class="jiben">备注</div>
+        <el-form-item label="" prop="fail">
+          <el-input
+            v-model="form.fail"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
         <el-row>
           <el-button
@@ -509,25 +791,25 @@
             v-model="form.unitId"
             :options="rese"
             placeholder="请选择单位"
+            disabled
           />
         </el-form-item>
         <el-table
-          v-loading="loading"
           :data="drillFus"
           :header-cell-style="{ background: '#003C69', color: 'white' }"
         >
           <el-table-column label="姓名" align="center" prop="peopleName">
             <template slot-scope="scope">
               <el-select
-                v-model="scope.row.peopleName"
-                placeholder="请输入单位"
+                v-model="scope.row.peopleId"
+                placeholder="请选择姓名"
                 filterable
               >
                 <el-option
                   :label="item.name"
                   v-for="(item, i) in renYuan"
                   :key="i"
-                  :value="item.name"
+                  :value="item.id"
                   class="input_xiala"
                 ></el-option>
               </el-select>
@@ -539,21 +821,40 @@
             prop="trainingStatus"
           >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.trainingStatus" placeholder="" />
+              <el-select
+                v-model="scope.row.trainingStatus"
+                placeholder="请选择参训状态"
+                filterable
+              >
+                <el-option
+                  v-for="dict in dict.type.military_training"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.label"
+                  class="input_xiala"
+                ></el-option>
+              </el-select>
             </template>
           </el-table-column>
           <el-table-column label="状态" align="center" prop="state">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.state" placeholder="" />
+              <el-button
+                size="btd"
+                type="text"
+                @click="deldeitem1(scope.$index, scope.row)"
+                ><span class="delete">删除</span></el-button
+              >
             </template>
           </el-table-column>
         </el-table>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 查看表格 -->
     <div class="fff">
       <el-dialog
         :visible.sync="menuRoleVisible"
@@ -561,6 +862,7 @@
         append-to-body
         id="chakan"
         :close-on-click-modal="false"
+        width="1060px"
       >
         <bdgldrill
           v-if="menuRoleVisible"
@@ -582,6 +884,8 @@ import {
   exportBdgldrill,
   treeselect,
   getweekwork,
+  drillFu,
+  treeselects
 } from "@/api/grassrootsregistration/bdgldrill";
 import bdgldrill from "@/components/look_word/bdgldrill.vue";
 // 导入树形结构
@@ -590,11 +894,13 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {
   getDept,
   getZhuChiRen,
+  getDept2,
 } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "Bdgldrill",
   components: { Treeselect, bdgldrill },
+  dicts: ["military_training"],
   data() {
     return {
       // 遮罩层
@@ -672,18 +978,60 @@ export default {
         };
       },
       menuRoleVisible: false,
-      nr: "",
+      nr: null,
+      fiel: [],
+      // 修改弹出层的显示与隐藏
+      open1: false,
+      // 是否禁用效果成绩输入框
+      dilabled: true,
     };
   },
   created() {
     this.getList();
-    this.getTreeselect();
     treeselect().then((res) => {
-      console.log(res);
       this.treeselects = res.rows;
     });
   },
   methods: {
+    // 应训人数触发
+    yingxun() {
+      if (this.form.yingxun && this.form.shixun) {
+        var num = (this.form.shixun / this.form.yingxun) * 100;
+        num = num.toFixed(2) + "%";
+        this.$set(this.form, "participationRate", num);
+      }
+    },
+    // 实训人数触发
+    shixun() {
+      if (this.form.yingxun && this.form.shixun) {
+        var num = (this.form.shixun / this.form.yingxun) * 100;
+        num = num.toFixed(2) + "%";
+        this.$set(this.form, "participationRate", num);
+      }
+    },
+    // 是否参加考核触发
+    checkboxs(data) {
+      this.dilabled = !data;
+      if (!data) {
+        this.form.pass = null;
+      }
+    },
+    // 获取全部单位树形
+    getQuanShu() {
+      getDept2().then((res) => {
+        this.rese = res.data;
+      });
+    },
+    // 点击删除删除循环出来的当前数据
+    deldeitem(row) {
+      this.drillFus.splice(row.ids, 1);
+    },
+    // 修改中的删除循环数据
+    deldeitem1(row, rows) {
+      this.drillFus.splice(row.ids, 1);
+      drillFu(rows.id).then((res) => {});
+    },
+
     /** 查询军事训练登记簿列表 */
     getList() {
       this.loading = true;
@@ -697,6 +1045,7 @@ export default {
     cancel() {
       this.open = false;
       this.open2 = false;
+      this.open1 = false;
       this.reset();
     },
     // 表单重置
@@ -723,6 +1072,7 @@ export default {
         peopleName: null,
         state: null,
         trainingStatus: null,
+        ids: null,
       };
       this.resetForm("form");
     },
@@ -746,6 +1096,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
+      this.getTreeselect();
       this.title = "添加军事训练登记簿";
       this.drillFus = [];
     },
@@ -756,17 +1107,25 @@ export default {
       const id = row.id || this.ids;
       getBdgldrill(id).then((response) => {
         this.wordInfo = response.data;
-        this.title = "月 日军事训练登记表";
+        this.title = "军事训练登记表";
         this.menuRoleVisible = true;
       });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.nr = null;
       this.reset();
+      this.getQuanShu();
       const id = row.id || this.ids;
       getBdgldrill(id).then((response) => {
+        this.fiel = [
+          {
+            name: response.data.filename,
+            url: response.data.filepath,
+          },
+        ];
         this.form = response.data;
-
+        this.form.filepath = this.fiel;
         if (this.form.safety == 1) {
           this.form.safety = true;
         } else {
@@ -792,8 +1151,10 @@ export default {
         } else {
           this.form.assessment = false;
         }
-
-        this.open = true;
+        this.nr = response.data.common;
+        this.drillFus = response.data.drillFus;
+        this.getRen(response.data.unitId);
+        this.open1 = true;
         this.title = "修改军事训练登记簿";
       });
     },
@@ -808,7 +1169,6 @@ export default {
               this.form.filename = documentProofs[0].name;
             }
           }
-          console.log(this.drillFus);
           this.form.drillFus = this.drillFus;
           if (this.form.safety) {
             this.form.safety = 1;
@@ -839,7 +1199,7 @@ export default {
           if (this.form.id != null) {
             updateBdgldrill(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.open1 = false;
               this.getList();
             });
           } else {
@@ -856,7 +1216,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$modal
-        .confirm('是否确认删除军事训练登记簿编号为"' + ids + '"的数据项？')
+        .confirm("是否确认删除军事训练登记簿的数据项？")
         .then(function () {
           return delBdgldrill(ids);
         })
@@ -882,7 +1242,6 @@ export default {
         .catch(() => {});
     },
     adddrillFus() {
-      // this.getTreeselect();
       this.drillFus.push({
         peopleName: "",
         state: "",
@@ -907,24 +1266,29 @@ export default {
     getTreeselect() {
       getDept().then((response) => {
         this.rese = response.data;
-        console.log(this.rese);
       });
     },
     // 单位选择触发
     selectPeo(data) {
-      console.log(data);
-      getZhuChiRen(data.id).then((res) => {
+      this.form.unitName = data.label;
+      this.getRen(data.id);
+    },
+    // 获取人员
+    getRen(id) {
+      getZhuChiRen(id).then((res) => {
         this.renYuan = res.data;
       });
     },
     trainingCategoryselectPeo(val) {
       console.log(val);
     },
+    // 训练开始时间触发
     drillTimechange() {
       if (this.form.drillTime) {
         getweekwork(this.form.drillTime).then((res) => {
-          console.log(res);
+          this.nr = "";
           res.data.map((item) => {
+            console.log(item);
             this.nr += item.contents + ",";
           });
         });
@@ -967,7 +1331,7 @@ export default {
   color: #fff !important;
 }
 ::v-deep .vue-treeselect__control {
-  width: 350px;
+  width: 250px;
   color: #fff !important;
 }
 /* ::v-deep .el-textarea__inner {
@@ -1013,4 +1377,22 @@ export default {
 ::v-deep .vue-treeselect__single-value {
   color: #fff !important;
 }
+::v-deep .el-link--inner .el-icon-document {
+  color: #fff !important;
+}
+::v-deep .el-input--medium .el-input__inner {
+  background: transparent;
+  color: #fff;
+}
+::v-deep .vue-treeselect--single .vue-treeselect__input {
+  color: #fff;
+}
+::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
+  margin: auto;
+}
+#chakan /deep/ .el-dialog__body {
+  padding: 30px 64px;
+}
 </style>

src/views/medicalhealth/recuperate/index.vue

@@ -16,9 +16,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item> -->
-      <el-form-item prop="peopleId">
+      <el-form-item prop="peopleName">
         <el-input
-          v-model="queryParams.peopleId"
+          v-model="queryParams.peopleName"
           placeholder="请输入疗养人"
           clearable
           size="small"

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -7,7 +7,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="privateCarId">
         <!-- <el-input
           v-model="queryParams.privateCarId"
           placeholder="请输入车牌号"
@@ -15,32 +14,16 @@
           size="small"
           @input="handleQuery"
         /> -->
-        <el-select
-          v-model="queryParams.peopleId"
-          placeholder="请选择用车人姓名"
-          @change="handleQuery"
-          filterable
-          class="input_xiala"
-        >
-          <el-option
-            v-for="item in renYuans"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item label="车牌号" prop="vehiclenumber">
+      <el-form-item label="" prop="vehiclenumber">
         <el-input
           v-model="queryParams.vehiclenumber"
           placeholder="请输入车牌号"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
+      <!-- 
       <el-form-item label="车辆型号" prop="vehiclemodel">
         <el-input
           v-model="queryParams.vehiclemodel"
@@ -134,7 +117,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -169,8 +152,8 @@
           v-hasPermi="['militaryvehicleManagement:privateAccessLog:remove']"
           >删除</el-button
         >
-      </el-col>
-      <!-- <el-col :span="1.5">
+      </el-col> -->
+    <!-- <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -183,11 +166,7 @@
           >导出</el-button
         >
       </el-col> -->
-      <!-- <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar> -->
-    </el-row>
+    <!-- </el-row> -->
 
     <el-table
       v-loading="loading"
@@ -197,26 +176,22 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="">
-          <template scope="scope">
+        <template scope="scope">
           <span>{{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="车牌号" align="center" prop="privateCarId" />
+      <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="车辆类别"
+        label="备注"
         align="center"
-        prop="vehiclecategory"
-        :formatter="carLei"
+        prop="remark"
+        show-overflow-tooltip
       />
-      <el-table-column label="车辆型号" align="center" prop="vehiclemodel" />
-      <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
-      <el-table-column label="车辆所有人" align="center" prop="peopleName" />
-      <el-table-column label="联系方式" align="center" prop="contactnumber" />
-      <el-table-column label="进入时间" align="center" prop="jinrushiajin" />
-      <el-table-column label="离开时间" align="center" prop="likaishitian" />
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -237,7 +212,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -7,13 +7,13 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item prop="thebusId">
+      <el-form-item prop="vehiclenumber">
         <el-input
-          v-model="queryParams.thebusId"
+          v-model="queryParams.vehiclenumber"
           placeholder="请输入车牌号"
           clearable
           size="small"
-          @keyup.enter.native="handleQuery"
+          @input="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -27,7 +27,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -62,8 +62,8 @@
           v-hasPermi="['militaryvehicleManagement:thebusAccessLog:remove']"
           >删除</el-button
         >
-      </el-col>
-      <!-- <el-col :span="1.5">
+      </el-col> -->
+    <!-- <el-col :span="1.5">
         <el-button
           class="box"
           type="warning"
@@ -76,11 +76,11 @@
           >导出</el-button
         >
       </el-col> -->
-      <!-- <right-toolbar
+    <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar> -->
-    </el-row>
+    <!-- </el-row> -->
 
     <el-table
       v-loading="loading"
@@ -89,32 +89,23 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="" >
-          <template scope="scope">
+      <el-table-column label="序号" align="center" prop="">
+        <template scope="scope">
           <span>{{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
           }}</span>
         </template>
       </el-table-column>
       <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
-      <el-table-column
-        label="车辆型号"
-        align="center"
-        prop="vehiclemodel"
-        :formatter="carXingHao"
-      />
-      <el-table-column
-        label="车位号"
-        align="center"
-        prop="parkingspacenumber"
-      />
-      <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
-      <el-table-column label="人员单位" align="center" prop="unitName" />
-      <el-table-column label="人员姓名" align="center" prop="driverName" />
-      <el-table-column label="联系方式" align="center" prop="contactnumber" />
       <el-table-column label="外出时间" align="center" prop="waichushijian" />
       <el-table-column label="返回时间" align="center" prop="fanhuishijian" />
       <el-table-column
+        label="备注"
+        align="center"
+        prop="contactnumber"
+        show-overflow-tooltip
+      />
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -135,7 +126,7 @@
             >删除</el-button
           >
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

src/views/peopleChuRu/bdglLeave/index.vue

@@ -262,13 +262,13 @@
         </template>
         <!-- :title="scope.row.bdglLeaveFus[2].specialApproval" -->
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         label="四级审批人"
         align="center"
         prop="peopleName4"
         width="100"
-      />
-      <el-table-column
+      /> -->
+      <!-- <el-table-column
         label="四级审批状态"
         align="center"
         prop="status4"
@@ -304,9 +304,8 @@
             "
             >特殊审批</el-col
           >
-          <!-- :title="scope.row.bdglLeaveFus[3].specialApproval" -->
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="总审批状态"
         align="center"
@@ -464,7 +463,7 @@
             ref="abcdef"
           >
             <el-option
-              v-for="(item, i) in yingJiRen"
+              v-for="(item, i) in lianJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -483,7 +482,7 @@
             ref="abcde"
           >
             <el-option
-              v-for="(item, i) in lianJiRen"
+              v-for="(item, i) in yingJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -664,7 +663,7 @@
             :disabled="xiugai"
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in lianJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -684,7 +683,7 @@
             :disabled="xiugai"
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in yingJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -704,7 +703,7 @@
             :disabled="xiugai"
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in zhengZhiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -875,7 +874,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in lianJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -895,7 +894,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in yingJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -915,7 +914,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in zhengZhiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1087,7 +1086,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in lianJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1105,7 +1104,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in yingJiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"
@@ -1123,7 +1122,7 @@
             disabled
           >
             <el-option
-              v-for="(item, i) in yongHu"
+              v-for="(item, i) in zhengZhiRen"
               :key="i"
               :label="item.nickName"
               :value="item.userId"

src/views/peopleChuRu/leaveOne/index.vue

@@ -1192,4 +1192,7 @@ export default {
 ::v-deep .vue-treeselect__control {
   background-color: transparent !important;
 }
+::v-deep .el-table__row .el-table_4_column_41  .el-input__inner{
+  background: transparent !important;
+}
 </style>

src/views/peopleManage/transfer/index.vue

@@ -309,7 +309,7 @@
       <el-table-column label="调动原因" align="center" prop="reason" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="预留字段" align="center" prop="field1" />-->
-      <el-table-column label="操作时间" align="center" prop="createtime" />
+      <!-- <el-table-column label="操作时间" align="center" prop="createtime" /> -->
       <!-- <el-table-column label="操作时间" align="center" prop="updatetime" /> -->
       <el-table-column
         label="操作"
@@ -447,7 +447,7 @@
               v-for="dict in postIds"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
+              :value="dict.dictValue"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -461,7 +461,7 @@
               v-for="dict in postIds"
               :key="dict.dictValue"
               :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
+              :value="dict.dictValue"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -697,6 +697,15 @@ export default {
     });
   },
   methods: {
+    // 获取部门列表
+    getBuMen() {
+      //部门数据
+      getDept().then((res) => {
+        if (res.code == 200) {
+          this.unitId = res.data;
+        }
+      });
+    },
     /** 查询调动管理列表 */
     getList() {
       this.loading = true;
@@ -772,6 +781,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.getBuMen();
       const id = row.id || this.ids;
       getTransfer(id).then((response) => {
         this.form = response.data;
@@ -836,7 +846,7 @@ export default {
       getPeople(this.form.peopleId).then((res) => {
         if (res.code == 200) {
           this.form.militaryRank1 = res.data.nowMilitaryRank;
-          this.form.post1 = res.data.postId;
+          this.form.post1 = res.data.postId+"";
           this.form.unit1 = res.data.deptId;
         }
       });

src/views/pt.vue

@@ -784,6 +784,7 @@ export default {
     this.xianShang();
     getNone().then((res) => {
       this.str = res.msg;
+      // console.log(res);
     });
     noReminder().then((res) => {
       if (res.data[0] != 0) {

src/views/system/training/index.vue

@@ -0,0 +1,496 @@
+<template>
+  <div class="app-container" style="height: 88vh">
+    <div class="form-box">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="合成训练" prop="synthesis">
+          <el-input v-model="form.synthesis" placeholder="" />
+        </el-form-item>
+        <el-form-item label="专业训练" prop="professional">
+          <el-input v-model="form.professional" placeholder="" />
+        </el-form-item>
+        <el-form-item label="共同训练" prop="common">
+          <el-input v-model="form.common" placeholder="" />
+        </el-form-item>
+        <el-form-item label="考核人次" prop="peopleNumber">
+          <el-input v-model="form.peopleNumber" placeholder="" />
+        </el-form-item>
+        <el-form-item label="优良人数" prop="youliang">
+          <el-input v-model="form.youliang" placeholder="" />
+        </el-form-item>
+        <el-form-item label="及格人数" prop="jige">
+          <el-input v-model="form.jige" placeholder="" />
+        </el-form-item>
+        <el-form-item label="未及格人数" prop="weijige">
+          <el-input v-model="form.weijige" placeholder="" />
+        </el-form-item>
+        <!-- <el-form-item label="参训率" prop="canxunlv">
+          <el-input
+            v-model="form.canxunlv"
+            placeholder=""
+            clearable
+            disabled
+          />
+        </el-form-item> -->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" size="btq"
+          >确 定</el-button
+        >
+        <!-- <el-button @click="cancel" size="btn">取 消</el-button> -->
+      </div>
+    </div>
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:training:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:training:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:training:remove']"
+          >删除</el-button
+        >
+      </el-col> -->
+    <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:training:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+    <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
+    <!-- </el-row> -->
+
+    <!-- <el-table
+      v-loading="loading"
+      :data="trainingList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" prop="">
+        <template scope="scope">
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="合成训练" align="center" prop="synthesis" />
+      <el-table-column label="专业训练" align="center" prop="professional" />
+      <el-table-column label="共同训练" align="center" prop="common" />
+      <el-table-column label="考核人次" align="center" prop="peopleNumber" />
+      <el-table-column label="优良人数" align="center" prop="youliang" />
+      <el-table-column label="及格人数" align="center" prop="jige" />
+      <el-table-column label="未及格人数" align="center" prop="weijige" />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:training:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:training:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table> -->
+
+    <!-- <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    /> -->
+
+    <!-- 添加或修改态势军事训练月统计情况对话框 -->
+    <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> -->
+    <!-- </el-dialog> -->
+  </div>
+</template>
+
+<script>
+import {
+  listTraining,
+  getTraining,
+  delTraining,
+  addTraining,
+  updateTraining,
+} from "@/api/system/training";
+
+export default {
+  name: "Training",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 态势军事训练月统计情况表格数据
+      trainingList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        synthesis: null,
+        professional: null,
+        common: null,
+        peopleNumber: null,
+        youliang: null,
+        jige: null,
+        weijige: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        synthesis: [],
+      },
+    };
+  },
+  created() {
+    // this.getList();
+  },
+  methods: {
+    /** 查询态势军事训练月统计情况列表 */
+    getList() {
+      this.loading = true;
+      listTraining(this.queryParams).then((response) => {
+        this.trainingList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        synthesis: null,
+        professional: null,
+        common: null,
+        peopleNumber: null,
+        youliang: null,
+        jige: null,
+        weijige: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加态势军事训练月统计情况";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getTraining(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改态势军事训练月统计情况";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateTraining(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTraining(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.reset();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm(
+          '是否确认删除态势军事训练月统计情况编号为"' + ids + '"的数据项？'
+        )
+        .then(function () {
+          return delTraining(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download(
+        "system/training/export",
+        {
+          ...this.queryParams,
+        },
+        `training_${new Date().getTime()}.xlsx`
+      );
+    },
+  },
+};
+</script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+  width: 820px !important;
+}
+::v-deep .el-textarea__inner {
+  width: 610px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 60px;
+}
+::v-deep .el-dialog__body {
+  margin: 22px 28px -14px 28px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px;
+  margin-right: 76px;
+}
+::v-deep .el-dialog__body {
+  padding: 30px 60px;
+}
+/* 小手样式 */
+::v-deep .el-table__cell {
+  cursor: pointer;
+}
+.el-button--mini {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
+}
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep .el-input__inner {
+  border: 1px solid white !important;
+}
+.box {
+  background-color: #ffba00 !important;
+}
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent !important;
+  color: #fff;
+}
+::v-deep .el-form {
+  margin-top: 40px;
+}
+::v-deep .dialog-footer {
+  margin-left: 44%;
+}
+::v-deep .el-form-item__label {
+  margin-bottom: 30px;
+}
+.form-box {
+  width: 658px;
+  margin: auto;
+  margin-top: 50px;
+}
+</style>

src/views/taishi/index.vue

@@ -67,12 +67,6 @@
                   ></div>
                   <span style="line-height: 15px">参训时</span>间
                 </div>
-                <div class="center4_l-1">
-                  <div
-                    style="background-color: #1d79b5; width: 5px; height: 9px"
-                  ></div>
-                  兵力
-                </div>
                 <div class="center4_l-1" style="margin-right: 2%">
                   <div
                     style="background-color: #1d79b5; width: 5px; height: 9px"
@@ -90,80 +84,17 @@
                   </tr>
                   <tr>
                     <td>合成训练</td>
-                    <td>30小时</td>
+                    <td>{{yueJiHua.synthesis}}</td>
                   </tr>
                   <tr>
                     <td>专业训练</td>
-                    <td>50小时</td>
+                    <td>{{yueJiHua.professional}}</td>
                   </tr>
                   <tr>
                     <td>共同训练</td>
-                    <td>45小时</td>
-                  </tr>
-                </table>
-
-                <table class="people">
-                  <tr>
-                    <td>实有人数</td>
-                    <td
-                      style="
-                        font-family: 'IMPACT';
-                        color: #30fdff;
-                        font-size: 20px;
-                      "
-                    >
-                      547
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>参训人数</td>
-                    <td
-                      style="
-                        font-family: 'IMPACT';
-                        color: #30fdff;
-                        font-size: 20px;
-                      "
-                    >
-                      492
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
-                      <p
-                        style="
-                          font-size: 9px;
-                          color: white;
-                          text-align: center;
-                          transform: scale(0.9);
-                        "
-                      >
-                        未参训人数
-                      </p>
-                    </td>
-                    <td
-                      style="
-                        font-family: 'IMPACT';
-                        color: #30fdff;
-                        font-size: 20px;
-                      "
-                    >
-                      115
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>参训率</td>
-                    <td
-                      style="
-                        font-family: 'IMPACT';
-                        color: #30fdff;
-                        font-size: 20px;
-                      "
-                    >
-                      90%
-                    </td>
+                    <td>{{yueJiHua.common}}</td>
                   </tr>
                 </table>
-
                 <table class="grade">
                   <tr>
                     <td>考核人次</td>
@@ -174,7 +105,7 @@
                         font-size: 20px;
                       "
                     >
-                      547
+                      {{yueJiHua.peopleNumber}}
                     </td>
                   </tr>
                   <tr>
@@ -186,7 +117,7 @@
                         font-size: 20px;
                       "
                     >
-                      247
+                        {{yueJiHua.youliang}}
                     </td>
                   </tr>
                   <tr>
@@ -198,7 +129,7 @@
                         font-size: 20px;
                       "
                     >
-                      195
+                       {{yueJiHua.jige}}  
                     </td>
                   </tr>
                   <tr>
@@ -210,7 +141,7 @@
                         font-size: 20px;
                       "
                     >
-                      5
+                      {{yueJiHua.weijige}}  
                     </td>
                   </tr>
                 </table>
@@ -1046,6 +977,7 @@ import {
   getLeavlNumber,
   zongjinrizhiban,
   zaiweipeopleGet,
+  listTraining
 } from "@/api/taishi/taishi";
 import * as echarts from "echarts";
 import vueSeamlessScroll from "vue-seamless-scroll";
@@ -1133,6 +1065,8 @@ export default {
       jianCanScore: [],
       // 营房统计
       yingFang: [],
+      // 月计划训练统计
+      yueJiHua:{}
     };
   },
   created() {
@@ -1241,6 +1175,8 @@ export default {
       this.qjlist = res.data;
     });
     this.startTime();
+    // 军事训练月统计
+    this.getJunShiTongJi()
   },
   mounted() {
     this.$forceUpdate();
@@ -1259,6 +1195,13 @@ export default {
     this.center4();
   },
   methods: {
+        // 军事训练月统计情况
+    getJunShiTongJi(){
+      listTraining().then(res=>{
+        console.log(res);
+        this.yueJiHua=res.data
+      })
+    },
     titlefun() {
       this.$router.push({ path: "/pt" }).catch(() => {});
     },
@@ -2358,7 +2301,7 @@ export default {
   font-size: 9px;
   color: white;
   text-align: center;
-  display: inline-block;
+  /* display: inline-block; */
   transform: scale(0.9);
 }
 

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: 20px" class="uploadPeople">
+              <div style="padding-left: 0px" class="uploadPeople">
                 <!-- 根据后缀名控制图片显示doc还是pdf形式 -->
                 <img
                   v-if="scope.row.parentDirId == '.pdf'"
@@ -46,7 +46,7 @@
                 <!-- 时间 createTime -->
                 <!-- 阅读量 readVolume -->
                 <div style="display: flex">
-                  <span
+                  <!-- <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
@@ -57,38 +57,40 @@
                       text-align: start;
                     "
                     >上传人：{{ scope.row.createUser }}</span
-                  >
+                  > -->
+
                   <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
-
-                      width: 80px;
+                      width: 180px;
                       display: block;
                       text-align: start;
+                      margin-left: 30px;
                     "
-                    >页数：{{ scope.row.theNumberPages }}</span
+                    >时间：{{ scope.row.createTime }}</span
                   >
                   <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
-                      width: 180px;
+                      width: 80px;
                       display: block;
-                      text-align: start;
                     "
-                    >时间：{{ scope.row.createTime }}</span
+                    >阅读量：{{ scope.row.readVolume }}</span
                   >
                   <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
+
                       width: 80px;
                       display: block;
+                      text-align: start;
                     "
-                    >阅读量：{{ scope.row.readVolume }}</span
+                    >页数：{{ scope.row.theNumberPages }}</span
                   >
-                  <span
+                  <!-- <span
                     style="
                       font-size: 14px;
                       color: rgba(204, 204, 204, 1);
@@ -96,7 +98,7 @@
                       display: block;
                     "
                     >分类：{{ scope.row.directoryName }}</span
-                  >
+                  > -->
                 </div>
               </div>
             </div>
@@ -1649,4 +1651,10 @@ body,
 ::v-deep .el-upload-list__item {
   width: 350px;
 }
+::v-deep .el-pagination .el-pagination__sizes .el-select .el-input__inner {
+  display: none !important;
+}
+::v-deep .el-input__suffix  {
+  display: none !important;
+}
 </style>