更改规章制度

src/api/regulations/fileinfo.js

@@ -61,4 +61,13 @@ export function rankList() {
     url:"/regulations/fileinfo/getReadNumber",
     method:"get"
   })
+}
+
+// 获取一级数据接口
+export function listParents(query) {  
+  return request({
+    url:"/regulations/fileinfo/listParent",
+    method:"get",
+    params: query
+  })
 }

src/views/PrintsLog/printlog/index.vue

@@ -318,7 +318,7 @@
     <el-dialog
       title="导出记录"
       :visible.sync="open1"
-      width="550px"
+      width="680px"
       append-to-body
       :close-on-click-modal="false"
     >
@@ -329,13 +329,28 @@
         :rules="rules"
         label-width="120px"
       >
-        <el-form-item label="" prop="unitId">
-          <treeselect
+        <el-form-item label="" prop="unitIds" style="margin-right:500px">
+          <el-select
+            multiple
+            filterable
+            v-model="queryParams.unitIds"
+            id="execute"
+            placeholder="请选择单位"
+          >
+            <el-option
+              v-for="(item, i) in danWeisList"
+              :label="item.deptName"
+              :value="item.deptId"
+              :key="i"
+              id="execute"
+            />
+          </el-select>
+          <!-- <treeselect
             v-model="queryParams.unitId"
             :options="deptOptions"
             placeholder="请选择单位"
             @select="selectPeos"
-          />
+          /> -->
         </el-form-item>
         <el-form-item prop="levelM">
           <el-select
@@ -393,6 +408,8 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 import { getDept } from "@/api/grassrootsregistration/bdglmeeting";
+import { listDept } from "@/api/system/dept";
+import { getUserProfile } from "@/api/system/user";
 
 export default {
   name: "Printlog",
@@ -457,6 +474,12 @@ export default {
       //级别
       levelMs: [],
       open1: false,
+      //获取单位所有不是树形结构
+      danWeisList: [],
+      // 用户信息
+      user: {},
+      deptId: null,
+      yongHu: "",
     };
   },
   created() {
@@ -470,8 +493,24 @@ export default {
     this.getDicts("level").then((response) => {
       this.levelMs = response.data;
     });
+    this.getUser()
   },
   methods: {
+    // 获取登录信息
+    getUser() {
+      getUserProfile().then((response) => {
+        this.user = response.data;
+        this.deptId = response.data.deptId;
+        this.yongHu = response.data.nickName;
+        console.log( response);
+      });
+    },
+    //获取所有单位
+    danWeis() {
+      listDept().then((res) => {
+        this.danWeisList = res.data;
+      });
+    },
     Alfred(row) {
       var name = "";
       this.levelMs.map((item) => {
@@ -515,7 +554,7 @@ export default {
     },
     cancels() {
       this.queryParams.levelM = "";
-      this.queryParams.unitId = null;
+      this.queryParams.unitIds = null;
       this.queryParams.startt = null;
       this.queryParams.endt = null;
       this.open1 = false;
@@ -668,6 +707,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.open1 = true;
+      this.danWeis();
     },
     // 获取默认时间
     daty() {
@@ -682,7 +722,12 @@ export default {
     },
     // 导出操作
     submitForms() {
+      this.queryParams.unitId=this.deptId
       const queryParams = this.queryParams;
+      if (queryParams.unitIds.length > 0) {
+        queryParams.unitIds = queryParams.unitIds.join(",");
+      }
+      console.log(queryParams);
       if (queryParams.startt) {
         this.daty();
       }
@@ -912,4 +957,9 @@ export default {
 ::v-deep .el-form-item__content {
   width: 200px;
 }
+/* 执行 */
+  ::v-deep  .el-input--suffix  #execute{
+    width: 620px;
+  /* width: auto; */
+}
 </style>

src/views/PrintsManage/manage/index.vue

@@ -97,8 +97,7 @@
         <template slot-scope="scope">
           <el-tooltip :content="scope.row.name" placement="top">
             <div
-              style="
-                overflow: hidden;
+              style="  overflow: hidden;
                 display: -webkit-box;
                 text-overflow: ellipsis;
                 -webkit-line-clamp: 2;
@@ -112,18 +111,33 @@
         </template>
       </el-table-column>
       <!-- <el-table-column label="路径" align="center" prop="file" /> -->
-      <el-table-column label="类型" align="center" prop="type" width="50"/>
-      <el-table-column label="是否彩打" align="center" prop="isPrintColor" width="100">
+      <el-table-column label="类型" align="center" prop="type" width="50" />
+      <el-table-column
+        label="是否彩打"
+        align="center"
+        prop="isPrintColor"
+        width="100"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.isPrintColor == 0 ? "否" : "是" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="是否双面打" align="center" prop="isPrintTwo" width="100">
+      <el-table-column
+        label="是否双面打"
+        align="center"
+        prop="isPrintTwo"
+        width="100"
+      >
         <template slot-scope="scope">
           <span>{{ scope.row.isPrintTwo == 0 ? "否" : "是" }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="打印状态" align="center" prop="printStatus" width="100">
+      <el-table-column
+        label="打印状态"
+        align="center"
+        prop="printStatus"
+        width="100"
+      >
         <template slot-scope="scope">
           <span
             style="color: #90da90"
@@ -157,7 +171,12 @@
           <dict-tag :options="dict.type.level" :value="scope.row.levelM" />
         </template>
       </el-table-column>
-      <el-table-column label="发送人" align="center" prop="sendName" width="80"/>
+      <el-table-column
+        label="发送人"
+        align="center"
+        prop="sendName"
+        width="80"
+      />
       <el-table-column
         label="发送时间"
         align="center"
@@ -243,14 +262,14 @@
           style="margin-left: 34px"
         >
           <div class="jiben">发送人信息</div>
-          <el-form-item label="发送人" prop="sendName">
+          <el-form-item label="发送人" prop="sendName" class="box1">
             <el-input
               v-model="form.sendName"
               disabled
               placeholder="请输入发送人"
             />
           </el-form-item>
-          <el-form-item label="文印室" prop="printRoom">
+          <el-form-item label="文印室" prop="printRoom" class="box1">
             <el-select
               v-model="form.printRoom"
               clearable
@@ -264,6 +283,14 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="归还时间" prop="returnTime" class="box1">
+            <el-date-picker
+              v-model="form.returnTime"
+              type="date"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
           <div class="jiben">打印说明</div>
           <el-form-item label prop="explainInfo">
             <el-input
@@ -556,7 +583,7 @@
     <el-dialog
       :title="title1"
       :visible.sync="open1"
-      width="940px"
+      width="1010px"
       append-to-body
       :close-on-click-modal="false"
     >
@@ -569,14 +596,14 @@
         style="margin-left: 37px"
       >
         <div class="jiben">发送人信息</div>
-        <el-form-item label="发送人" prop="sendName">
+        <el-form-item label="发送人" prop="sendName" class="box1">
           <el-input
             v-model="form1.sendName"
             disabled
             placeholder="请输入发送人"
           />
         </el-form-item>
-        <el-form-item label="文印室" prop="printRoom">
+        <el-form-item label="文印室" prop="printRoom" class="box1">
           <el-select
             v-model="form1.printRoom"
             clearable
@@ -590,6 +617,10 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="归还时间" prop="returnTime" class="box1">
+          <el-date-picker v-model="form.returnTime" type="date" placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
         <div class="jiben">打印说明</div>
         <el-form-item label prop="explainInfo">
           <el-input
@@ -600,132 +631,134 @@
           />
         </el-form-item>
         <div class="jiben">文件信息</div>
-        <el-form-item prop="type">
-          <el-input
-            class="forEach"
-            disabled
-            v-model="form1.type"
-            placeholder="请输入文件类型"
-          />
-          <!-- <el-select v-model="form.type" placeholder="请选择类型">
-            <el-option label="请选择字典生成" value />
-          </el-select>-->
-        </el-form-item>
-        <el-form-item prop="size">
-          <el-input
-            class="forEach"
-            disabled
-            v-model="form1.size"
-            placeholder="请输入文件大小"
-          />
-        </el-form-item>
-        <el-form-item prop="levelM">
-          <el-select
-            v-model="form1.levelM"
-            clearable
-            class="forEach"
-            placeholder="请选择级别"
-          >
-            <el-option
-              v-for="dict in levelMs"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="parseInt(dict.dictValue)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item prop="printNumber">
-          <el-input
-            class="forEach"
-            v-model="form1.printNumber"
-            :min="0"
-            placeholder="请输入打印份数"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-input
-            class="fileName"
-            suffix-icon="el-icon-document"
-            disabled
-            v-model="form1.name"
-            placeholder="请输入文件名称"
-          />
-        </el-form-item>
-        <el-form-item
-          label="是否为彩打"
-          label-width="120px"
-          prop="isPrintColor"
-        >
-          <el-switch
-            v-model="form1.isPrintColor"
-            active-color="#13ce66"
-            inactive-color="#ccc"
-            active-value="1"
-            inactive-value="0"
-          >
-          </el-switch>
-          <span class="greed" v-if="form1.isPrintColor == '1'"></span>
-          <span class="CCC" v-if="form1.isPrintColor == '0'"></span>
-        </el-form-item>
-        <el-form-item
-          label="是否为双面打"
-          label-width="120px"
-          prop="isPrintTwo"
-        >
-          <!-- <el-radio-group
-                v-model="item.isPrintTwo"
-                style="width: 200px"
-                size="mini"
-              >
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group> -->
-          <el-switch
-            v-model="form1.isPrintTwo"
-            active-color="#13ce66"
-            inactive-color="#ccc"
-            active-value="1"
-            inactive-value="0"
-          >
-          </el-switch>
-          <span class="greed" v-if="form1.isPrintTwo == '1'"></span>
-          <span class="CCC" v-if="form1.isPrintTwo == '0'"></span>
-        </el-form-item>
-        <el-form-item label="是否需归还" label-width="120px" prop="isReturns">
-          <el-switch
-            v-model="form1.isReturn"
-            active-color="#13ce66"
-            inactive-color="#ccc"
-            :active-value="1"
-            :inactive-value="0"
+        <div style="margin-left: 20px">
+          <el-form-item prop="type" style="margin-right: 23px">
+            <el-input
+              class="forEach"
+              disabled
+              v-model="form1.type"
+              placeholder="请输入文件类型"
+            />
+            <!-- <el-select v-model="form.type" placeholder="请选择类型">
+          <el-option label="请选择字典生成" value />
+        </el-select>-->
+          </el-form-item>
+          <el-form-item prop="size" style="margin-right: 23px;">
+            <el-input
+              class="forEach"
+              disabled
+              v-model="form1.size"
+              placeholder="请输入文件大小"
+            />
+          </el-form-item>
+          <el-form-item prop="levelM" style="margin-right: 23px;">
+            <el-select
+              v-model="form1.levelM"
+              clearable
+              class="forEach"
+              placeholder="请选择级别"
+            >
+              <el-option
+                v-for="dict in levelMs"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="printNumber" >
+            <el-input
+              class="forEach"
+              v-model="form1.printNumber"
+              :min="0"
+              placeholder="请输入打印份数"
+            />
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              class="fileName"
+              suffix-icon="el-icon-document"
+              disabled
+              v-model="form1.name"
+              placeholder="请输入文件名称"
+            />
+          </el-form-item>
+          <el-form-item
+            label="是否为彩打"
+            label-width="120px"
+            prop="isPrintColor"
           >
-          </el-switch>
-          <span class="greed" v-if="form1.isReturn == 1"></span>
-          <span class="CCC" v-if="form1.isReturn == 0"></span>
-        </el-form-item>
-        <el-form-item prop="name">
-          <!-- <fileUpload v-model="form.file" /> -->
-          <el-upload
-            :action="uploadFileUrl"
-            :before-upload="handleBeforeUpload"
-            :file-list="fileList"
-            :limit="limit"
-            :on-error="handleUploadError"
-            :on-exceed="handleExceed"
-            :on-success="handleUploadSuccess"
-            :show-file-list="false"
-            :headers="headers"
-            class="upload-file-uploader"
-            ref="upload"
-            style="width: 200px"
-            name="pfile"
+            <el-switch
+              v-model="form1.isPrintColor"
+              active-color="#13ce66"
+              inactive-color="#ccc"
+              active-value="1"
+              inactive-value="0"
+            >
+            </el-switch>
+            <span class="greed" v-if="form1.isPrintColor == '1'"></span>
+            <span class="CCC" v-if="form1.isPrintColor == '0'"></span>
+          </el-form-item>
+          <el-form-item
+            label="是否为双面打"
+            label-width="120px"
+            prop="isPrintTwo"
           >
-            <!-- 上传按钮 -->
-            <el-button size="mini" type="primary" class="select_file"
-              >选取文件</el-button
+            <!-- <el-radio-group
+              v-model="item.isPrintTwo"
+              style="width: 200px"
+              size="mini"
             >
-          </el-upload>
-        </el-form-item>
+              <el-radio label="1">是</el-radio>
+              <el-radio label="0">否</el-radio>
+            </el-radio-group> -->
+            <el-switch
+              v-model="form1.isPrintTwo"
+              active-color="#13ce66"
+              inactive-color="#ccc"
+              active-value="1"
+              inactive-value="0"
+            >
+            </el-switch>
+            <span class="greed" v-if="form1.isPrintTwo == '1'"></span>
+            <span class="CCC" v-if="form1.isPrintTwo == '0'"></span>
+          </el-form-item>
+          <el-form-item label="是否需归还" label-width="120px" prop="isReturns">
+            <el-switch
+              v-model="form1.isReturn"
+              active-color="#13ce66"
+              inactive-color="#ccc"
+              :active-value="1"
+              :inactive-value="0"
+            >
+            </el-switch>
+            <span class="greed" v-if="form1.isReturn == 1"></span>
+            <span class="CCC" v-if="form1.isReturn == 0"></span>
+          </el-form-item>
+          <el-form-item prop="name">
+            <!-- <fileUpload v-model="form.file" /> -->
+            <el-upload
+              :action="uploadFileUrl"
+              :before-upload="handleBeforeUpload"
+              :file-list="fileList"
+              :limit="limit"
+              :on-error="handleUploadError"
+              :on-exceed="handleExceed"
+              :on-success="handleUploadSuccess"
+              :show-file-list="false"
+              :headers="headers"
+              class="upload-file-uploader"
+              ref="upload"
+              style="width: 200px"
+              name="pfile"
+            >
+              <!-- 上传按钮 -->
+              <el-button size="mini" type="primary" class="select_file"
+                >选取文件</el-button
+              >
+            </el-upload>
+          </el-form-item>
+        </div>
       </el-form>
 
       <div slot="footer" class="dialog-footer" style="margin-right: 18px">
@@ -1076,6 +1109,9 @@ export default {
         printRoom: [
           { required: true, message: "打印室不能为空", trigger: "change" },
         ],
+        sendName: [
+          { required: true, message: "发送人不能为空", trigger: "change" },
+        ],
         isReturn: [
           { required: true, message: "是否归还需要选择", trigger: "change" },
         ],
@@ -1085,6 +1121,9 @@ export default {
         printfileName: [
           { required: true, message: "打印人不能为空", trigger: "change" },
         ],
+        returnTime:[
+          { required: true, message: "归还时间不能为空", trigger: "change" },
+        ]
       },
       //级别
       levelMs: [],
@@ -1816,8 +1855,8 @@ export default {
   height: 104px;
 }
 ::v-deep .textarea-explainInfo1 .el-textarea__inner {
-  /* margin-left: 20px; */
-  width: 833px;
+  margin-left: 20px;
+  width: 880px;
   height: 104px;
 }
 ::v-deep .dyform-textarea .el-textarea__inner {
@@ -2036,4 +2075,7 @@ export default {
 ::v-deep .fileName .el-input__suffix {
   left: -280px;
 }
+::v-deep .box1 .el-form-item__label {
+  width: 93px !important;
+}
 </style>

src/views/bdglregular/specialinfo/index.vue

@@ -420,6 +420,7 @@
       width="500px"
       append-to-body
       :close-on-click-modal="false"
+      custom-class="box5"
     >
       <el-form
         ref="form"
@@ -982,11 +983,10 @@ export default {
         question: [
           {
             required: true,
-            message: "加分事由或存在问题不能为空",
+            message: "存在问题或加分事由不能为空",
             trigger: "change",
           },
         ],
-        score: [{ required: true, message: "分值不能为空", trigger: "change" }],
         correctiveAction: [
           { required: true, message: "整改措施不能为空", trigger: "change" },
         ],
@@ -1194,9 +1194,7 @@ export default {
       this.open = true;
       this.title = "专项检查";
       this.jiannum = 0;
-      this.btnnum = 4;
-      this.disabled = false;
-      this.zg=3;
+      this.btnnum = null;
       var today = new Date();
       var y = today.getFullYear();
       var M = today.getMonth() + 1;
@@ -1558,8 +1556,10 @@ hr {
   width: 600px !important;
   height: 33px;
 }
-
-::v-deep .el-link.el-link--default {
-  color: #fff;
+::v-deep img {
+  object-fit: cover;
 }
+ ::v-deep  .box5 .el-form-item__content{
+  width: 200px;
+ }
 </style>

src/views/grassrootsregistration/bdglarmaments/index.vue

@@ -191,7 +191,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 </style>

src/views/grassrootsregistration/bdgldrills/index.vue

@@ -187,7 +187,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 </style>

src/views/grassrootsregistration/bdglequips/index.vue

@@ -188,7 +188,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 38px;
+  height: 36px;
   line-height: 37px;
 }
 </style>

src/views/grassrootsregistration/bdgleven/index.vue

@@ -206,6 +206,17 @@
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
+          <el-form-item label="会议形式" prop="meetingForm">
+            <el-select v-model="form.meetingForm" placeholder="请选择会议形式">
+              <el-option
+                v-for="(item, i) in huiYiList"
+                :key="i"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="主持人" prop="compereId">
             <el-select
               ref="headerSearchSelect"
@@ -318,6 +329,9 @@
         id="chakan"
         :close-on-click-modal="false"
       >
+        <div style="margin-bottom: 20px; margin-left: 28%;font-size:16px;  font-weight: 700;">
+          会议形式:<span style="margin-right:30px">{{ names }}</span> 会议时间：<span >{{ tiemse }}</span>
+        </div>
         <div v-for="item in arr" :key="item" class="divbox">
           <img :src="baseUrl + item" alt="" />
         </div>
@@ -361,6 +375,7 @@ export default {
     quillEditor,
     bdgleven,
   },
+  dicts: ["sys_huiyi"],
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -431,6 +446,9 @@ export default {
         title: [
           { required: true, message: "会议议题不能为空", trigger: "blur" },
         ],
+        meetingForm:[
+          { required: true, message: "会议形式不能为空", trigger: "blur" },
+        ]
       },
       //  是否为查看
       opens: true,
@@ -452,6 +470,10 @@ export default {
       // 文本显示数字
       str: "",
       arr: [],
+      // 会议形式
+      huiYiList: [],
+      names: null,
+      tiemse: null,
     };
   },
   created() {
@@ -459,6 +481,10 @@ export default {
     this.getBuMen();
     this.getSuo();
     // this.onEditor();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
   },
   methods: {
     // 获取搜索所有人
@@ -649,8 +675,15 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看连务会记录本";
             this.menuRoleVisible = true;
+            return this.name;
           }
         }
       });

src/views/grassrootsregistration/bdglevens/index.vue

@@ -131,6 +131,17 @@
       :close-on-click-modal="false"
       :before-close="closes"
     >
+      <div
+        style="
+          margin-bottom: 20px;
+          margin-left: 28%;
+          font-size: 16px;
+          font-weight: 700;
+        "
+      >
+        会议形式:<span style="margin-right: 30px">{{ names }}</span>
+        会议时间：<span>{{ tiemse }}</span>
+      </div>
       <div v-for="item in arr" :key="item" class="divbox">
         <img :src="baseUrl + item" alt="" />
       </div>
@@ -146,6 +157,7 @@ import {
 } from "@/api/grassrootsregistration/bdgleven";
 import bdgleven from "@/components/look_word/bdgleven.vue";
 export default {
+  dicts: ["sys_huiyi"],
   data() {
     return {
       lieList: [],
@@ -167,62 +179,18 @@ export default {
       status: null,
       arr: [],
       baseUrl: process.env.VUE_APP_BASE_API,
+      // 会议形式
+      huiYiList: [],
+      names: null,
+      tiemse: null,
     };
   },
 
   created() {
     this.getSoulist();
-     //性别
-     this.getDicts("sys_user_sex").then((response) => {
-      this.sexList = response.data;
-    });
-    //血型
-    this.getDicts("bloodType").then((response) => {
-      this.bloodType = response.data;
-    });
-    //政治面貌
-    this.getDicts("Caucus").then((response) => {
-      this.partyIds = response.data;
-    });
-    //健康情况
-    this.getDicts("healthy").then((response) => {
-      this.healthy = response.data;
-    });
-    //婚姻情况
-    this.getDicts("marryList").then((response) => {
-      this.marryList = response.data;
-    });
-    //学历
-    this.getDicts("Degree_level").then((response) => {
-      this.educationId = response.data;
-    });
-    //婚姻情况
-    this.getDicts("degree").then((response) => {
-      this.degree = response.data;
-    });
-    //是否编制
-    this.getDicts("sys_yes_no").then((response) => {
-      this.authorizedStrength = response.data;
-    });
-    //子女情况
-    this.getDicts("sys_yw").then((response) => {
-      this.childrenList = response.data;
-    });
-    //人员类别
-    this.getDicts("personnel_type").then((response) => {
-      this.classId = response.data;
-    });
-    //职务层级
-    this.getDicts("post_Level").then((response) => {
-      this.postIds = response.data;
-    });
-    //军衔
-    this.getDicts("sys_user_rank").then((response) => {
-      this.rankIds = response.data;
-    });
-    //民族
-    this.getDicts("sys_familyName").then((response) => {
-      this.nationIds = response.data;
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
     });
   },
   methods: {
@@ -276,11 +244,18 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看连务会记录本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
+            return this.name;
           }
-        } 
+        }
       });
     },
     // 转义视图不加标签
@@ -425,7 +400,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 #chakan ::v-deep .el-dialog {

src/views/grassrootsregistration/bdglfilemanagements/index.vue

@@ -189,7 +189,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 </style>

src/views/grassrootsregistration/bdglmeeting/index.vue

@@ -224,6 +224,17 @@
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
+          <el-form-item label="会议形式" prop="meetingForm">
+            <el-select v-model="form.meetingForm" placeholder="请选择会议形式">
+              <el-option
+                v-for="(item, i) in huiYiList"
+                :key="i"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="主持人" prop="compereId">
             <el-select
               v-model="form.compereId"
@@ -376,6 +387,17 @@
       id="chakan"
       :close-on-click-modal="false"
     >
+      <div
+        style="
+          margin-bottom: 20px;
+          margin-left: 28%;
+          font-size: 16px;
+          font-weight: 700;
+        "
+      >
+        会议形式:<span style="margin-right: 30px">{{ names }}</span>
+        会议时间：<span>{{ tiemse }}</span>
+      </div>
       <div v-for="item in arr" :key="item" class="divbox">
         <img :src="baseUrl + item" alt="" />
       </div>
@@ -415,6 +437,7 @@ export default {
     Treeselect,
     bdglmeeting,
   },
+  dicts: ["sys_huiyi"],
   data() {
     return {
       //查看页面
@@ -491,6 +514,9 @@ export default {
         absentIds: [
           { required: true, message: "缺席人不能为空", trigger: "blur" },
         ],
+        meetingForm: [
+          { required: true, message: "会议形式不能为空", trigger: "blur" },
+        ],
       },
       //下拉菜单
       options: [],
@@ -520,6 +546,10 @@ export default {
       },
       baseUrl: process.env.VUE_APP_BASE_API,
       arr: [],
+      // 会议形式
+      huiYiList: [],
+      names: null,
+      tiemse: null,
     };
   },
   created() {
@@ -527,6 +557,10 @@ export default {
     this.getBuMen();
     this.getSuo();
     this.onEditor();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
   },
   methods: {
     //change方法
@@ -760,9 +794,16 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看团支部会议登记本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
+            return this.names
           }
         }
         // this.wordInfo = response.data;
@@ -932,11 +973,11 @@ export default {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #196299;
-  color: #fff;
+  color: #111;
 }
 
 .el-select-dropdown__item {
-  color: #fff;
+  color: #111;
 }
 
 /* 刷新图标 */

src/views/grassrootsregistration/bdglmeetings/index.vue

@@ -146,18 +146,29 @@
         :message="wordInfo"
       ></bdglmeeting>
     </el-dialog> -->
-     <el-dialog
-     :visible.sync="menuRoleVisible"
-     :title="title"
-     append-to-body
-     id="chakan"
-     :close-on-click-modal="false"
-     :before-close="closes"
-   >
-   <div v-for="item in arr" :key="item" class="divbox">
-    <img :src="baseUrl + item" alt="" />
-  </div>
-   </el-dialog>
+    <el-dialog
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+      <div
+        style="
+          margin-bottom: 20px;
+          margin-left: 28%;
+          font-size: 16px;
+          font-weight: 700;
+        "
+      >
+        会议形式:<span style="margin-right: 30px">{{ names }}</span>
+        会议时间：<span>{{ tiemse }}</span>
+      </div>
+      <div v-for="item in arr" :key="item" class="divbox">
+        <img :src="baseUrl + item" alt="" />
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -170,6 +181,7 @@ import {
 //引入查看表格
 import bdglmeeting from "@/components/look_word/bdglmeeting.vue";
 export default {
+  dicts: ["sys_huiyi"],
   data() {
     return {
       lieList: [],
@@ -191,11 +203,19 @@ export default {
       status: null,
       baseUrl: process.env.VUE_APP_BASE_API,
       arr: [],
+      // 会议形式
+      huiYiList: [],
+      names: null,
+      tiemse: null,
     };
   },
 
   created() {
     this.getSoulist();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
   },
   methods: {
     resetQuery() {
@@ -248,9 +268,16 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看团支部会议登记本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
+            return this.names;
           }
         }
         // this.wordInfo = response.data;
@@ -394,10 +421,10 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
-#chakan ::v-deep  .el-dialog{
+#chakan ::v-deep .el-dialog {
   min-height: 700px;
   background: #fff !important;
 }

src/views/grassrootsregistration/bdglparty/index.vue

@@ -201,6 +201,17 @@
           <el-form-item label="召开地点" prop="address" class="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
+          <el-form-item label="会议形式" prop="meetingForm">
+            <el-select v-model="form.meetingForm" placeholder="请选择会议形式">
+              <el-option
+                v-for="(item, i) in huiYiList"
+                :key="i"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="主持人" prop="compereId">
             <el-select
               ref="headerSearchSelect"
@@ -356,6 +367,9 @@
       id="chakan"
       :close-on-click-modal="false"
     >
+    <div style="margin-bottom: 20px; margin-left: 28%;font-size:16px;  font-weight: 700;">
+      会议形式:<span style="margin-right:30px">{{ names }}</span> 会议时间：<span >{{ tiemse }}</span>
+    </div>
       <div v-for="item in arr" :key="item" class="divbox">
         <img :src="baseUrl + item" alt="" />
       </div>
@@ -396,6 +410,7 @@ export default {
     quillEditor,
     bdglparty,
   },
+  dicts: ["sys_huiyi"],
   data() {
     return {
       baseUrl: process.env.VUE_APP_BASE_API,
@@ -479,6 +494,9 @@ export default {
         absentIds: [
           { required: true, message: "缺席人不能为空", trigger: "blur" },
         ],
+        meetingForm:[
+          { required: true, message: "会议形式不能为空", trigger: "blur" },
+        ]
       },
       // 人员
       renYuan: [],
@@ -496,6 +514,10 @@ export default {
       // 修改拿到的数据
       result: {},
       changeArr: [], //存放选中选项的数组
+      // 会议形式
+      huiYiList: [],
+      names: null,
+      tiemse: null,
     };
   },
   created() {
@@ -503,6 +525,10 @@ export default {
     this.getBuMen();
     this.getSuo();
     this.onEditor();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
   },
   methods: {
     //change方法
@@ -721,8 +747,15 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看党支部会议登记本";
             this.menuRoleVisible = true;
+            return this.name;
           }
         }
       });

src/views/grassrootsregistration/bdglpartys/index.vue

@@ -132,9 +132,20 @@
       :close-on-click-modal="false"
       :before-close="closes"
     >
-    <div v-for="item in arr" :key="item" class="divbox">
-      <img :src="baseUrl + item" alt="" />
-    </div>
+      <div
+        style="
+          margin-bottom: 20px;
+          margin-left: 28%;
+          font-size: 16px;
+          font-weight: 700;
+        "
+      >
+        会议形式:<span style="margin-right: 30px">{{ names }}</span>
+        会议时间：<span>{{ tiemse }}</span>
+      </div>
+      <div v-for="item in arr" :key="item" class="divbox">
+        <img :src="baseUrl + item" alt="" />
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -148,6 +159,7 @@ import {
 //引入查看表格
 import bdglparty from "@/components/look_word/bdglparty.vue";
 export default {
+  dicts: ["sys_huiyi"],
   data() {
     return {
       lieList: [],
@@ -169,11 +181,19 @@ export default {
       status: null,
       baseUrl: process.env.VUE_APP_BASE_API,
       arr: [],
+      // 会议形式
+      huiYiList: [],
+      names: null,
+      tiemse: null,
     };
   },
 
   created() {
     this.getSoulist();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
   },
   methods: {
     resetQuery() {
@@ -227,9 +247,16 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看党支部记录本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
+            return names;
           }
         }
         // this.wordInfo = response.data;
@@ -373,10 +400,10 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
-#chakan ::v-deep  .el-dialog{
+#chakan ::v-deep .el-dialog {
   min-height: 700px;
   background: #fff !important;
 }

src/views/grassrootsregistration/bdglpublicpropertys/index.vue

@@ -189,7 +189,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 </style>

src/views/grassrootsregistration/bdglsecrecys/index.vue

@@ -193,7 +193,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 </style>

src/views/grassrootsregistration/bdglsoldier/index.vue

@@ -108,9 +108,24 @@
       </el-table-column>
       <el-table-column label="记录人" align="center" prop="peopleJiLu" />
       <el-table-column label="主持人" align="center" prop="compereRen" />
-      <el-table-column label="列席人" align="center" prop="peopleIds" show-overflow-tooltip/>
-      <el-table-column label="缺席人" align="center" prop="absentIds" show-overflow-tooltip/>
-      <el-table-column label="参加人" align="center" prop="joinId" show-overflow-tooltip/>
+      <el-table-column
+        label="列席人"
+        align="center"
+        prop="peopleIds"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="缺席人"
+        align="center"
+        prop="absentIds"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="参加人"
+        align="center"
+        prop="joinId"
+        show-overflow-tooltip
+      />
       <el-table-column label="召开地点" align="center" prop="address" />
       <el-table-column
         label="操作"
@@ -144,8 +159,6 @@
       </el-table-column>
     </el-table>
 
-    
-
     <pagination
       v-show="total > 0"
       :total="total"
@@ -195,6 +208,17 @@
           <el-form-item label="召开地点" prop="address">
             <el-input v-model="form.address" placeholder="请输入召开地点" />
           </el-form-item>
+          <el-form-item label="会议形式" prop="meetingForm">
+            <el-select v-model="form.meetingForm" placeholder="请选择会议形式">
+              <el-option
+                v-for="(item, i) in huiYiList"
+                :key="i"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="主持人" prop="compereId">
             <el-select
               ref="aa"
@@ -329,6 +353,17 @@
       id="chakan"
       :close-on-click-modal="false"
     >
+    <div
+    style="
+      margin-bottom: 20px;
+      margin-left: 28%;
+      font-size: 16px;
+      font-weight: 700;
+    "
+  >
+    会议形式:<span style="margin-right: 30px">{{ names }}</span>
+    会议时间：<span>{{ tiemse }}</span>
+  </div>
       <!-- <bdglsoldier v-show="menuRoleVisible" :message="wordInfo"></bdglsoldier> -->
       <div v-for="item in arr" :key="item" class="divbox">
         <img :src="baseUrl + item" alt="" />
@@ -364,6 +399,7 @@ export default {
     Treeselect,
     bdglsoldier,
   },
+  dicts: ["sys_huiyi"],
   data() {
     return {
       //查看页面
@@ -440,6 +476,9 @@ export default {
         absentIds: [
           { required: true, message: "缺席人不能为空", trigger: "blur" },
         ],
+        meetingForm: [
+          { required: true, message: "会议形式不能为空", trigger: "blur" },
+        ],
       },
       // 树形配置对象
       defaultProps: {
@@ -464,6 +503,10 @@ export default {
       changeArr: [], //存放选中选项的数组
       baseUrl: process.env.VUE_APP_BASE_API,
       arr: [],
+      // 会议形式
+      huiYiList: [],
+      names : null,
+      tiemse: null,
     };
   },
   created() {
@@ -471,6 +514,10 @@ export default {
     this.getBuMen();
     this.getSuo();
     this.onEditor();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
   },
   methods: {
     //change方法
@@ -675,7 +722,7 @@ export default {
         if (this.result.absentIds !== "" && this.result.absentIds != null) {
           this.form1.absentIds = response.data.absentIds.split(",");
         }
-        this.changeSelect()
+        this.changeSelect();
         this.form = this.result;
         this.open = true;
         this.title = "修改军人委员会会议登记本";
@@ -690,10 +737,18 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看军人委员会会议登记本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
-          }}
+            return this.names
+          }
+        }
         // this.wordInfo = response.data;
       });
     },
@@ -849,10 +904,10 @@ export default {
 .el-select-dropdown__item.hover,
 .el-select-dropdown__item:hover {
   background-color: #196299;
-  color: #fff;
+  color: #111;
 }
 .el-select-dropdown__item {
-  color: #fff;
+  color: #111;
 }
 
 /* 时间选择 */
@@ -970,7 +1025,7 @@ export default {
 #chakan /deep/ .el-dialog__body {
   padding: 30px 30px 30px 112px;
 }
-#chakan ::v-deep  .el-dialog{
+#chakan ::v-deep .el-dialog {
   min-height: 700px;
   background: #fff !important;
 }

src/views/grassrootsregistration/bdglsoldiers/index.vue

@@ -138,17 +138,28 @@
       ></bdglsoldier>
     </el-dialog> -->
     <el-dialog
-    :visible.sync="menuRoleVisible"
-    :title="title"
-    append-to-body
-    id="chakan"
-    :close-on-click-modal="false"
-    :before-close="closes"
-  >
-  <div v-for="item in arr" :key="item" class="divbox">
-    <img :src="baseUrl + item" alt="" />
-  </div>
-  </el-dialog>
+      :visible.sync="menuRoleVisible"
+      :title="title"
+      append-to-body
+      id="chakan"
+      :close-on-click-modal="false"
+      :before-close="closes"
+    >
+      <div
+        style="
+          margin-bottom: 20px;
+          margin-left: 28%;
+          font-size: 16px;
+          font-weight: 700;
+        "
+      >
+        会议形式:<span style="margin-right: 30px">{{ names }}</span>
+        会议时间：<span>{{ tiemse }}</span>
+      </div>
+      <div v-for="item in arr" :key="item" class="divbox">
+        <img :src="baseUrl + item" alt="" />
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -162,6 +173,7 @@ import {
 import bdglsoldier from "@/components/look_word/bdglsoldier.vue";
 export default {
   name: "bdglsoldiers",
+  dicts: ["sys_huiyi"],
   data() {
     return {
       lieList: [],
@@ -183,11 +195,19 @@ export default {
       status: null,
       baseUrl: process.env.VUE_APP_BASE_API,
       arr: [],
+      // 会议形式
+      huiYiList: [],
+      names: null,
+      tiemse: null,
     };
   },
 
   created() {
     this.getSoulist();
+    //会议形式
+    this.getDicts("sys_huiyi").then((response) => {
+      this.huiYiList = response.data;
+    });
   },
   methods: {
     resetQuery() {
@@ -200,19 +220,19 @@ export default {
       });
     },
     getSoulist() {
-      if (this.form.year == null||this.form.year=="") {
+      if (this.form.year == null || this.form.year == "") {
         getSoldierList().then((res) => {
           res.rows.forEach((item) => {
-          this.status = 0;
-        });
-        this.lieList = res.rows;
+            this.status = 0;
+          });
+          this.lieList = res.rows;
         });
       } else {
         getSoldierList(this.form.year).then((res) => {
           res.rows.forEach((item) => {
-          this.status = 1;
-        });
-        this.lieList = res.rows;
+            this.status = 1;
+          });
+          this.lieList = res.rows;
         });
       }
     },
@@ -248,9 +268,16 @@ export default {
         if (response.data.fileUrl != null) {
           if (response.data.fileUrl != "") {
             this.arr = response.data.fileUrl.split(",");
+            this.tiemse = response.data.convokeTime;
+            this.huiYiList.map((item) => {
+              if (item.dictValue == response.data.meetingForm) {
+                this.names = item.dictLabel;
+              }
+            });
             this.title = "查看军人委员会会议登记本";
             this.menuRoleVisible = true;
             this.tableStatus = false;
+            return this.names;
           }
         }
       });
@@ -393,11 +420,11 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 
-#chakan ::v-deep  .el-dialog{
+#chakan ::v-deep .el-dialog {
   min-height: 700px;
   background: #fff !important;
 }

src/views/grassrootsregistration/personnelRoster/index.vue

@@ -331,6 +331,58 @@ export default {
         this.deptOptions = res.data;
       }
     });
+    //性别
+    this.getDicts("sys_user_sex").then((response) => {
+      this.sexList = response.data;
+    });
+    //血型
+    this.getDicts("bloodType").then((response) => {
+      this.bloodType = response.data;
+    });
+    //政治面貌
+    this.getDicts("Caucus").then((response) => {
+      this.partyIds = response.data;
+    });
+    //健康情况
+    this.getDicts("healthy").then((response) => {
+      this.healthy = response.data;
+    });
+    //婚姻情况
+    this.getDicts("marryList").then((response) => {
+      this.marryList = response.data;
+    });
+    //学历
+    this.getDicts("Degree_level").then((response) => {
+      this.educationId = response.data;
+    });
+    //婚姻情况
+    this.getDicts("degree").then((response) => {
+      this.degree = response.data;
+    });
+    //是否编制
+    this.getDicts("sys_yes_no").then((response) => {
+      this.authorizedStrength = response.data;
+    });
+    //子女情况
+    this.getDicts("sys_yw").then((response) => {
+      this.childrenList = response.data;
+    });
+    //人员类别
+    this.getDicts("personnel_type").then((response) => {
+      this.classId = response.data;
+    });
+    //职务层级
+    this.getDicts("post_Level").then((response) => {
+      this.postIds = response.data;
+    });
+    //军衔
+    this.getDicts("sys_user_rank").then((response) => {
+      this.rankIds = response.data;
+    });
+    //民族
+    this.getDicts("sys_familyName").then((response) => {
+      this.nationIds = response.data;
+    });
   },
   methods: {
     chaKan(row) {
@@ -801,7 +853,7 @@ li {
 }
 
 ::v-deep .el-input--medium .el-input__inner {
-  height: 28px;
+  height: 36px;
   line-height: 37px;
 }
 #chakan ::v-deep .el-dialog {
@@ -824,4 +876,24 @@ li {
 img {
   object-fit: cover;
 }
+/* 添加内部滚动条 */
+::v-deep .el-dialog__body {
+  overflow: auto;
+  overflow-x: hidden;
+}
+
+/*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
+::v-deep .el-dialog__body ::-webkit-scrollbar {
+  width: 14px;
+  /* height: 2px !important; */
+  background: #3d83b8;
+}
+
+/*定义滑块，内阴影及圆角*/
+::v-deep .el-dialog__body ::-webkit-scrollbar-thumb {
+  /* border-radius: 20px; */
+  /* height: 1px;
+  width: 3px; */
+  background: rgba(144, 206, 252, 1);
+}
 </style>

src/views/peopleManage/people/index.vue

@@ -1323,6 +1323,7 @@ export default {
         //   }
         // ],
         // unitName: [{ required: true, message: "单位不能为空", trigger: "blur" }]
+        
       },
       //性别数组
       sexList: [],

src/views/pt.vue

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

src/views/regulations/fileinfo/index.vue

@@ -38,6 +38,14 @@
                   src="../../../images/doc.png"
                   alt=""
                 />
+                <img
+                v-else-if="
+                  scope.row.parentDirId == '.ppt' ||
+                  scope.row.parentDirId == '.pptx'
+                "
+                src="../../../images/ppt.png"
+                alt=""
+              />
               </div>
               <!-- 文件名称 fileName -->
               <div>
@@ -345,7 +353,7 @@
           <template slot-scope="scope">
             <div style="position:relative"> -->
         <!-- 阅读量增长箭头 -->
-        <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:5px;right:130px" > 
+        <!-- <img src="../../../images/upRow.png" alt="" style="position:absolute;top:5px;right:130px" >
             阅读量下降箭头
             <img src="../../../images/downRow.png" alt=""  style="position:absolute;top:5px;right:130px"> -->
         <!-- 本周阅读量
@@ -600,6 +608,7 @@ import {
   exportFileinfo,
   // 获取排行接口
   rankList,
+  listParents,
 } from "@/api/regulations/fileinfo";
 import {
   // 查询目录列表接口
@@ -870,32 +879,51 @@ export default {
       this.queryParams1.common = "1";
       listDirectoryinfo(this.queryParams1).then((res) => {
         this.directory = res.rows;
-
         this.total1 = res.total;
         this.loading = false;
       });
     },
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
-      console.log(row);
       if (row.parentId == 0) {
         this.parentId = row.id;
       } else {
         this.parentId = row.parentId;
       }
+      console.log(row.parentId );
+      if (row.parentId == 0) {
+        listParents({
+          parentid: row.id,
+          pageNum: this.queryParams.pageNum,
+          pageSize: this.queryParams.pageSize,
+        }).then(res=>{
+          console.log(res,1);
+          this.fileinfoList = res.rows;
+          this.total = res.total;
+        })
+      } else {
+        // if(this.parentId)
+        this.form.directoryId = row.id;
+        // 文件
+        listFileinfo({
+          directoryId: this.form.directoryId,
+          pageNum: this.queryParams.pageNum,
+          pageSize: this.queryParams.pageSize,
+        }).then((res) => {
+          console.log(res,2);
+          this.fileinfoList = res.rows;
+          // this.fileinfoList.map(item=>{
+          //   item.parentDirName='http://localhost:8089'+item.parentDirName;
 
-      // if(this.parentId)
-      this.form.directoryId = row.id;
-      // 文件
-      listFileinfo({
-        parentId: this.form.directoryId,
-        pageNum: this.queryParams.pageNum,
-        pageSize: this.queryParams.pageSize,
-      }).then((res) => {
-        console.log(res.rows);
-        this.fileinfoList = res.rows;
-        this.total = res.total;
-      });
+          // })
+          this.total = res.total;
+        });
+      }
+      // if (row.subclassification == 0) {
+      //   this.parentId = "";
+      //   return;
+      // }
+      // this.queryParams1.pageNum=1;
       // 目录
       listDirectoryinfo({
         parentId: this.parentId,
@@ -1163,7 +1191,6 @@ export default {
     },
     // 阅读按钮操作
     ViewRead(row) {
-      console.log(row);
       if (row.parentDirId == ".docx" || row.parentDirId == ".doc") {
         this.open33 = true;
         axios({
@@ -1179,6 +1206,8 @@ export default {
         this.previewDialog = true;
         this.pdfurl = process.env.VUE_APP_BASE_API + row.parentDirName;
         this.pageNum = 1;
+      }else{
+        this.$message.error('只能阅读Word跟pdf文件')
       }
       row.common = "1";
       updateFileinfo(row).then((res) => {

src/views/thought/teacherFile/index.vue

@@ -38,6 +38,21 @@
                   src="../../../images/doc.png"
                   alt=""
                 />
+                <img
+                  v-else-if="
+                    scope.row.parentDirId == '.ppt' ||
+                    scope.row.parentDirId == '.pptx'
+                  "
+                  src="../../../images/ppt.png"
+                  alt=""
+                />
+                <img
+                  v-else-if="
+                    scope.row.parentDirId == '.mp4'
+                  "
+                  src="../../../images/MP4.png"
+                  alt=""
+                />
               </div>
               <!-- 文件名称 fileName -->
               <div>
@@ -462,12 +477,10 @@
         @close="vueVideo"
       >
         <video width="700" height="500" controls ref="vueref">
-          <source :src="downurl+videoUrl" type="video/mp4" />
+          <source :src="downurl + videoUrl" type="video/mp4" />
         </video>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="videoi"
-            >关 闭</el-button
-          >
+          <el-button type="primary" @click="videoi">关 闭</el-button>
         </div>
       </el-dialog>
     </div>
@@ -660,7 +673,7 @@ export default {
       moreFile: [],
       // 视频播放
       vivdeos: false,
-      videoUrl:null
+      videoUrl: null,
     };
   },
   created() {
@@ -688,18 +701,18 @@ export default {
     Treeselect,
   },
   methods: {
-    vueVideo(){
-      if(this.$refs.vueref.paused==false){
-        this.$refs.vueref.pause()
+    vueVideo() {
+      if (this.$refs.vueref.paused == false) {
+        this.$refs.vueref.pause();
       }
     },
-    videoi(){
-      this.videoUrl=null;
+    videoi() {
+      this.videoUrl = null;
       this.vivdeos = false;
     },
     // 视频播放
     vivdeo(row) {
-      this.videoUrl=row.parentDirName
+      this.videoUrl = row.parentDirName;
       this.vivdeos = true;
       this.title = "播放视频";
     },
@@ -1708,7 +1721,7 @@ body,
   display: none !important;
 }
 
-::v-deep .video .el-dialog__body{
+::v-deep .video .el-dialog__body {
   padding: 30px 78px;
 }
 </style>

src/views/workingArrangements/planTask/index.vue

@@ -1308,8 +1308,9 @@ export default {
         this.moreTable.file =
           process.env.VUE_APP_BASE_API + this.moreTable.file;
         this.moreTable.planProgresses.forEach((item) => {
-          this.comstatus +=
-           parseInt(item.schedule / this.moreTable.planProgresses.length);
+          this.comstatus += parseInt(
+            item.schedule / this.moreTable.planProgresses.length
+          );
         });
       });
     },