档案库

src/assets/styles/global.css

@@ -1144,15 +1144,20 @@ input:-moz-placeholder {
 .el-tree-node:focus>.el-tree-node__content {
   background-color: transparent;
 }
+
+
+
 /* 树形控件滚动条修饰 */
 .userAgrees::-webkit-scrollbar {
   width: 10px;
   background: transparent;
 }
+
 .userAgrees::-webkit-scrollbar {
   width: 14px;
   background: transparent;
 }
+
 .userAgrees::-webkit-scrollbar-thumb {
   background: #114d7a;
 }
@@ -1216,4 +1221,4 @@ input:-moz-placeholder {
   /* height: 1px;
   width: 3px; */
   background: #c1c1c1;
-}
+}

src/components/FileUpload/index.vue

@@ -49,7 +49,7 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 10,
     },
     // 大小限制(MB)
     fileSize: {

src/layout/components/Sidebar/SidebarItem.vue

@@ -1,43 +1,27 @@
 <template>
   <div v-if="!item.hidden">
     <template
-      v-if="
-        hasOneShowingChild(item.children, item) &&
-        (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
-        !item.alwaysShow
-      "
+      v-if="hasOneShowingChild(item.children,item) && (!onlyOneChild.children||onlyOneChild.noShowingChildren)&&!item.alwaysShow"
     >
-      <app-link
-        v-if="onlyOneChild.meta"
-        :to="resolvePath(onlyOneChild.path, onlyOneChild.query)"
-      >
+      <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path, onlyOneChild.query)">
         <el-menu-item
           :index="resolvePath(onlyOneChild.path)"
-          :class="{ 'submenu-title-noDropdown': !isNest }"
+          :class="{'submenu-title-noDropdown':!isNest}"
         >
           <item
-            :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"
+            :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)"
             :title="onlyOneChild.meta.title"
           />
         </el-menu-item>
       </app-link>
     </template>
 
-    <el-submenu
-      v-else
-      ref="subMenu"
-      :index="resolvePath(item.path)"
-      popper-append-to-body
-    >
+    <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
-        <item
-          v-if="item.meta"
-          :icon="item.meta && item.meta.icon"
-          :title="item.meta.title"
-        />
+        <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
       <sidebar-item
-        v-for="child in item.children"
+        v-for="child in item.children" 
         :key="child.path"
         :is-nest="true"
         :item="child"
@@ -64,28 +48,30 @@ export default {
     // route object
     item: {
       type: Object,
-      required: true,
+      required: true
     },
     isNest: {
       type: Boolean,
-      default: false,
+      default: false
     },
     basePath: {
       type: String,
-      default: "",
-    },
+      default: ""
+    }
   },
   data() {
     this.onlyOneChild = null;
     return {};
   },
-  mounted() {},
+  mounted() {
+    
+  },
   methods: {
     hasOneShowingChild(children = [], parent) {
       if (!children) {
         children = [];
       }
-      const showingChildren = children.filter((item) => {
+      const showingChildren = children.filter(item => {
         if (item.hidden) {
           return false;
         } else {
@@ -110,7 +96,7 @@ export default {
     },
     resolvePath(routePath, routeQuery) {
       // console.log(this.$route.path.lastIndexOf('/'))
-      //  let name=this.$route.path.slice(this.$route.path.lastIndexOf('/')+1,this.$route.path.length);
+    //  let name=this.$route.path.slice(this.$route.path.lastIndexOf('/')+1,this.$route.path.length);
       // console.log(routePath)
       if (isExternal(routePath)) {
         return routePath;
@@ -123,7 +109,13 @@ export default {
         return { path: path.resolve(this.basePath, routePath), query: query };
       }
       return path.resolve(this.basePath, routePath);
-    },
-  },
+    }
+  }
 };
 </script>
+<style scoped>
+/* 左侧文字多余部分不隐藏 */
+#app .sidebar-container .el-menu-item, #app .sidebar-container .el-submenu__title{
+  text-overflow: clip !important;
+}
+</style>

src/layout/components/Sidebar/index.vue

@@ -133,3 +133,4 @@ export default {
   }
 };
 </script>
+

src/views/PrintsLog/printlog/index.vue

@@ -25,6 +25,15 @@
           @input="handleQuery"
         />
       </el-form-item>
+      <el-form-item prop="printCode">
+        <el-input
+          v-model="queryParams.printCode"
+          placeholder="请输入打印编码"
+          clearable
+          size="small"
+          @input="handleQuery"
+        />
+      </el-form-item>
       <!-- <el-form-item label="打印份数" prop="printNumber">
         <el-input
           v-model="queryParams.printNumber"

src/views/PrintsManage/manage/index.vue

@@ -271,8 +271,16 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="250px"
       >
         <template slot-scope="scope">
+          <el-button
+            size="btk"
+            type="text"
+            @click="handlelook(scope.row)"
+            v-hasPermi="['PrintsLog:printlog:edit']"
+            >查看</el-button
+          >
           <el-button
             size="btk"
             type="text"
@@ -576,6 +584,120 @@
     >
       <div ref="file" v-html="tableau" style="width:100%;"></div>
     </el-dialog> -->
+    <!-- 添加预览doc文件弹框 -->
+    <el-dialog
+      style="color: pink"
+      :title="title3"
+      :visible.sync="open33"
+      width="1100px"
+      append-to-body
+      id="fileinfodocx"
+      class="el-dialog__header"
+      :close-on-click-modal="false"
+    >
+      <div ref="file"></div>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm3">关 闭</el-button>
+        <!-- <el-button @click="open33 = false" size="" class="aa1">
+          取 消</el-button
+        > -->
+      </div>
+    </el-dialog>
+    <!-- 预览PDF文件弹框 -->
+    <el-dialog
+      :title="title3"
+      :visible.sync="previewDialog"
+      width="850px"
+      append-to-body
+      id="fileinfopdf"
+      class="el-dialog__header"
+      :close-on-click-modal="false"
+    >
+      <template>
+        <!-- <div style="margin-bottom:20px"> -->
+        <div style="display: flex">
+          <el-button
+            :class="gopage == true ? 'bg' : ''"
+            class="gopage"
+            :theme="'default'"
+            type="submit"
+            :title="'上一页'"
+            @click.native="prePage"
+          >
+            上一页</el-button
+          >
+          <div
+            style="
+              width: 50px;
+              height: 28px;
+              background: #f4f4f4;
+              text-align: center;
+              line-height: 28px;
+            "
+          >
+            {{ pageNum }}/{{ pageTotalNum }}
+          </div>
+          <el-button
+            :class="gopage == false ? 'bg' : ''"
+            :theme="'default'"
+            class="downpage"
+            type="submit"
+            :title="'下一页'"
+            @click.native="nextPage"
+          >
+            下一页</el-button
+          >
+          <!-- <el-button :theme="'default'" type="submit" :title="'顺时针旋转'" @click.native="clock" > 顺时针旋转</el-button>
+            <el-button :theme="'default'" type="submit" :title="'逆时针旋转'" @click.native="counterClock" > 逆时针旋转</el-button>
+           <el-button :theme="'default'" type="submit" :title="'打印'" @click.native="pdfPrintAll"> 打印</el-button> -->
+        </div>
+        <PDF
+          ref="pdf"
+          :src="pdfurl"
+          :page="pageNum"
+          :rotate="pageRotate"
+          @progress="loadedRatio = $event"
+          @page-loaded="pageLoaded($event)"
+          @num-pages="pageTotalNum = $event"
+          @error="pdfError($event)"
+          @link-clicked="page = $event"
+        ></PDF>
+        <!-- </div> -->
+        <!-- <div class="el-dialog__footer"> -->
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="previewDialog = false"
+            >关 闭</el-button
+          >
+          <!-- <el-button @click="previewDialog = false" size="" class="aa1"
+            >取 消</el-button
+          > -->
+        </div>
+        <!-- </div> -->
+      </template>
+    </el-dialog>
+    <el-dialog
+      :title="title3"
+      :visible.sync="open44"
+      width="1100px"
+      append-to-body
+      id="fileinfopdf"
+      class="el-dialog__header"
+      :close-on-click-modal="false"
+    >
+      <template>
+        <div class="home">
+          <div v-html="tableau"></div>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="open44 = false"
+            >关 闭</el-button
+          >
+          <!-- <el-button @click="open44 = false" size="" class="aa1"
+            >取 消</el-button
+          > -->
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -594,10 +716,10 @@ import {
 import { getToken } from "@/utils/auth";
 import Cookies from "js-cookie";
 import axios from "axios";
-const XLSX = require("xlsx");
+var XLSX = require("xlsx");
 const docx = require("docx-preview");
 window.JSZip = require("jszip");
-
+import PDF from "vue-pdf";
 export default {
   name: "Manage",
   dicts: ["level", "print_room"],
@@ -607,7 +729,7 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5,
+      default: 10,
     },
     // 大小限制(MB)
     fileSize: {
@@ -625,6 +747,9 @@ export default {
       default: true,
     },
   },
+  components: {
+    PDF,
+  },
   data() {
     return {
       // 遮罩层
@@ -706,6 +831,25 @@ export default {
       tableau: null,
       yaoqiuflg: false,
       roles: "",
+      // 虚拟字段
+      fid: "",
+      open33: false,
+      title3: "预览文件",
+      // 下载文件路径
+      downurl: process.env.VUE_APP_BASE_API,
+      // pdf文件
+      previewDialog: false,
+      pdfurl: "",
+      pageNum: 1,
+      pageTotalNum: 1,
+      pageRotate: 0,
+      // 加载进度
+      loadedRatio: 0,
+      curPageNum: 0,
+      gopage: true,
+      // excel表格
+      tableau: null,
+      open44: false,
     };
   },
   created() {
@@ -957,6 +1101,7 @@ export default {
       this.dyform.printRoom = row.printRoom;
       this.dyform.type = row.type;
       // this.dyform.isReturn = row.isReturn + "";
+      console.log(this.dyform)
       if (row.isPrintColor == 1) {
         this.yaoqiu = "彩打";
         this.yaoqiuflg = true;
@@ -974,6 +1119,44 @@ export default {
       }
       this.getrylist();
     },
+    // 查看按钮预览
+    handlelook(row) {
+      console.log(row);
+      if (row.type == "docx" || row.type == "doc") {
+        console.log(11);
+        this.open33 = true;
+        axios({
+          method: "get",
+          responseType: "blob", // 设置响应文件格式
+          url: row.file,
+        }).then(({ data }) => {
+          console.log(data);
+          $(".docx").attr("id", "printArea");
+          // console.log($(".docx"));
+          docx.renderAsync(data, this.$refs.file); // 渲染到页面预览
+        });
+      } else if (row.type == "pdf") {
+        this.previewDialog = true;
+        this.pdfurl = row.file;
+      } else if (row.type == "xlsx") {
+        axios
+          .get(row.file, {
+            responseType: "arraybuffer", // 设置响应体类型为arraybuffer
+          })
+          .then(({ data }) => {
+            console.log(data);
+
+            let workbook = XLSX.read(new Uint8Array(data), { type: "array" }); // 解析数据
+            this.open44 = true;
+            var worksheet = workbook.Sheets[workbook.SheetNames[0]]; // workbook.SheetNames 下存的是该文件每个工作表名字,这里取出第一个工作表
+            this.tableau = XLSX.utils.sheet_to_html(worksheet); // 渲染
+          });
+      }
+    },
+    // 预览弹框
+    submitForm3() {
+      this.open33 = false;
+    },
     //获取人员
     getrylist() {
       listPeople().then((res) => {
@@ -1207,4 +1390,60 @@ export default {
 ::v-deep .el-input__inner {
   border: 1px solid white !important;
 }
+/* 预览弹框背景去除 */
+::v-deep .docx-wrapper {
+  padding: 0 !important;
+  background: none !important;
+}
+/* excel表格样式 */
+::v-deep .home table tr td{
+  text-align: right;
+  height: 20px;
+  min-width: 60px;
+  text-align: center;
+  /* margin-left: -5px ; */
+  /* width: 70px !important; */
+  border-right:1px solid black;
+  border-bottom: 1px solid black !important;
+}
+::v-deep .home table{
+  width: 100%;
+  border-spacing:0px !important;
+  border-top: 1px solid black;
+  border-left: 1px solid black;
+  /* border-collapse: collapse !important;
+  border-color:#b6ff00 !important; */
+}
+::v-deep .docx-wrapper table tr td{
+  border-bottom: 1px solid black !important;
+}
+::v-deep .docx{
+  width: 100% !important;
+}
+/* 文件关闭小叉号 */
+::v-deep .el-dialog__headerbtn .el-dialog__close{
+  color: #ccc !important;
+}
+/* 上一页样式 */
+.gopage {
+  width: 60px;
+  height: 28px;
+  background: #f4f4f4;
+  color:#60627d;
+  border-radius: 14px 0px 0px 14px;
+  padding: 6px 9px;
+}
+/* 下一页样式 */
+.downpage {
+  width: 60px;
+  height: 28px;
+  background: #f4f4f4;
+  border-radius: 0px 14px 14px 0px;
+  padding: 6px 9px;
+}
+.bg{
+  background: #1D96FF;
+  color: white;
+}
+
 </style>

src/views/barracksManagement/flats/index.vue

@@ -1165,4 +1165,5 @@ export default {
 ::v-deep .dialog-footer {
   margin-right: 34px;
 }
+
 </style>

src/views/bdglSecret/secret/index.vue

@@ -163,13 +163,13 @@
         fixed="right"
       >
         <template slot-scope="scope">
-          <el-button
+          <!-- <el-button
             size="btk"
             type="text"
             @click="handleChakan(scope.row)"
             v-hasPermi="['grassrootsregistration:bdgldiary:edit']"
             ><span class="chakan">查看</span></el-button
-          >
+          > -->
           <el-button
             size="btu"
             type="text"

src/views/combatduty/RateOfTen/index.vue

@@ -840,11 +840,6 @@ export default {
             radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            // hoverOffset: 5,
-            // transitionDuration: 0,
-            // itemStyle: {
-            //   borderRadius: 8,
-            // },
             label: {
               show: true,
               position: "center",
@@ -1035,22 +1030,14 @@ export default {
             radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            // hoverOffset: 5,
             label: {
               show: true,
               position: "center",
-              // formatter: (params)=> { let str =(`{value|${params.value}}`)+ '\n'+(`{name|${params.name}}`); return str },
-              // borderWidth: 5, borderRadius: 5, // padding: [0, 86], height: 70, fontSize: 20, show: true,
               rich: {
                 value: { fontSize: 28, color: "#fff" },
                 name: { color: "#fff", fontSize: 14 },
               },
               formatter: function (params) {
-                // if(_this.form.bzrs-_this.form.zwrs<=0){
-                //   // console.log(1)
-                //   data2[1].value=9
-                //   console.log(data2[1].value)
-                // }
                 if (_this.form.zwrs == 0 || _this.form.bzrs == 0) {
                   var s =
                     `{value|${(0).toFixed()}%}` + "\n" + "\n" + `{name|在位率}`;
@@ -1075,10 +1062,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
             data: data2,
           },
         ],
@@ -1127,7 +1110,6 @@ export default {
             radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            // hoverOffset: 5,
             label: {
               show: true,
               position: "center",
@@ -1153,10 +1135,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
             data: data3,
           },
         ],
@@ -1213,10 +1191,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
             data: data4,
           },
         ],
@@ -1275,10 +1249,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
             data: data5,
           },
         ],
@@ -1308,10 +1278,9 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "85%"],
+            radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            hoverOffset: 5,
             label: {
               show: true,
               position: "center",
@@ -1338,17 +1307,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
-            // emphasis: {
-            //   label: {
-            //     show: false,
-            //     fontSize: "16",
-            //     fontWeight: "bold",
-            //   },
-            // },
             labelLine: {
               show: true,
             },
@@ -1381,10 +1339,10 @@ export default {
           {
             name: "Access From",
             type: "pie",
-            radius: ["70%", "85%"],
+            radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            hoverOffset: 5,
+            // hoverOffset: 5,
             label: {
               show: true,
               position: "center",
@@ -1411,20 +1369,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
-            // emphasis: {
-            //   label: {
-            //     show: false,
-            //     fontSize: "16",
-            //     fontWeight: "bold",
-            //   },
-            // },
-            // labelLine: {
-            //   show: true,
-            // },
             data: data7,
           },
         ],
@@ -1454,10 +1398,9 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "85%"],
+            radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            hoverOffset: 5,
             label: {
               show: true,
               position: "center",
@@ -1485,20 +1428,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
-            // emphasis: {
-            //   label: {
-            //     show: false,
-            //     fontSize: "16",
-            //     fontWeight: "bold",
-            //   },
-            // },
-            // labelLine: {
-            //   show: true,
-            // },
             data: data8,
           },
         ],
@@ -1544,10 +1473,10 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "85%"],
+            radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            hoverOffset: 5,
+            // hoverOffset: 5,
             label: {
               show: true,
               position: "center",
@@ -1574,20 +1503,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
-            // emphasis: {
-            //   label: {
-            //     show: false,
-            //     fontSize: "16",
-            //     fontWeight: "bold",
-            //   },
-            // },
-            // labelLine: {
-            //   show: true,
-            // },
             data: data9,
           },
         ],
@@ -1617,10 +1532,10 @@ export default {
           {
             name: "",
             type: "pie",
-            radius: ["70%", "85%"],
+            radius: ["70%", "80%"],
             center: ["50%", "50%"],
             avoidLabelOverlap: false,
-            hoverOffset: 5,
+            // hoverOffset: 5,
             label: {
               show: true,
               position: "center",
@@ -1647,20 +1562,6 @@ export default {
                 }
               },
             },
-            // itemStyle: {
-            //   borderRadius: 2,
-            //   borderWidth: 10,
-            // },
-            // emphasis: {
-            //   label: {
-            //     show: false,
-            //     fontSize: "16",
-            //     fontWeight: "bold",
-            //   },
-            // },
-            // labelLine: {
-            //   show: true,
-            // },
             data: data10,
           },
         ],

src/views/regulations/fileinfo/index.vue

@@ -407,7 +407,7 @@
               </el-select>
             </el-form-item>
             <el-form-item style="margin-left: 30px; margin-top: 30px">
-              <FileUpload v-model="form.file" />
+              <FileUpload v-model="moreFile" />
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -489,10 +489,10 @@
       >
         <div ref="file"></div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm3">确 定</el-button>
-          <el-button @click="open33 = false" size="" class="aa1">
-            取 消</el-button
-          >
+          <el-button type="primary" @click="open33 = false">关 闭</el-button>
+          <!-- <el-button type="primary" @click="open33 = false">
+          关 闭</el-button
+          > -->
         </div>
       </el-dialog>
       <!-- 预览PDF文件弹框 -->
@@ -550,11 +550,11 @@
           <!-- <div class="el-dialog__footer"> -->
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="previewDialog = false"
-              >确 定</el-button
+              >关 闭</el-button
             >
-            <el-button @click="previewDialog = false" size="" class="aa1"
+            <!-- <el-button @click="previewDialog = false" size="" class="aa1"
               >取 消</el-button
-            >
+            > -->
           </div>
           <!-- </div> -->
         </template>
@@ -703,7 +703,9 @@ export default {
       // 加载进度
       loadedRatio: 0,
       curPageNum: 0,
-      gopage:true
+      gopage:true,
+      // 多文件上传列表
+      moreFile:[]
     };
   },
 
@@ -941,7 +943,7 @@ export default {
         //   item.parentDirName='http://localhost:8089'+item.parentDirName;
 
         // })
-
+        console.log(this.fileinfoList)
         // console.log(this.fileinfoList);
         this.total = response.total;
         this.loading = false;
@@ -1004,22 +1006,38 @@ export default {
     },
     /** 上传文件提交按钮 */
     submitForm() {
-      console.log(this.form);
+      // console.log(this.form);
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          console.log(this.form.file[0]);
+          // console.log(this.form.file[0]);
           // 文件名
-          this.form.fileName = this.form.file[0].name;
-          // 路径
-          this.form.parentDirName = this.form.file[0].url;
-          // 后缀
-          this.form.parentDirId = this.form.file[0].houZUI;
-          // 页数
-          this.form.theNumberPages = this.form.file[0].pageCount;
-          // 文件大小
-          this.form.fileSize = this.form.file[0].fileLength;
-          // 目录名称
+          // this.form.fileName = this.form.file[0].name;
+          // // 路径
+          // this.form.parentDirName = this.form.file[0].url;
+          // // 后缀
+          // this.form.parentDirId = this.form.file[0].houZUI;
+          // // 页数
+          // this.form.theNumberPages = this.form.file[0].pageCount;
+          // // 文件大小
+          // this.form.fileSize = this.form.file[0].fileLength;
+          // // 目录名称
           this.form.directoryName = this.form.subclassification;
+          this.form.bdglFileInfos=this.moreFile
+          this.form.bdglFileInfos.forEach((item)=>{
+            // 文件大小
+            item.fileSize=item.fileLength
+            // 文件路径
+            item.parentDirName=item.url
+            // 文件后缀
+            item.parentDirId=item.houZUI
+            // 页数
+            item.theNumberPages=item.pageCount
+            // 文件大小
+            item.fileName=item.name
+
+          })
+          // this.form.bdglFileInfo[0].directory=this.form.directoryId
+          // this.form.bdglFileInfo[0].directoryName=this.form.directoryName
           //输出结果
           console.log(this.form);
           // 上传文件接口
@@ -1210,7 +1228,9 @@ export default {
   padding: 0 !important;
   background: none !important;
 }
-
+::v-deep .docx{
+  width: 100% !important;
+}
 ::v-deep .vue-treeselect__placeholder {
   color: #bdbdbd4f !important;
 }

src/views/thought/getready/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
       <div class="box-lfet">
-      <div class="data">
+      <!-- <div class="data">
         <p>单位</p>
         <div class="a1"></div>
         <el-date-picker
@@ -13,7 +13,7 @@
           @change="shiJian"
         >
         </el-date-picker>
-      </div>
+      </div> -->
       <div class="dadui">
         <img src="../../../images/星星.png" alt="" />
         大队
@@ -192,7 +192,7 @@
         >
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -201,7 +201,7 @@
           @click="handleExport"
           v-hasPermi="['thought:getready:export']"
           >导出</el-button
-        >
+        > -->
       </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
@@ -502,6 +502,7 @@
           </el-form-item>
           <el-form-item label="开始时间" prop="startTime">
             <el-date-picker
+              disabled
               editable
               clearable
               size="small"
@@ -519,6 +520,7 @@
          
           >
             <el-date-picker
+            disabled
               editable
               clearable
               size="small"
@@ -586,7 +588,8 @@
           <div class="jiben">教育议题简介</div>
           <el-form-item prop="talkIntroduction">
             <el-input
-            disabled
+              disabled
+              
               v-model="form1.talkIntroduction"
               type="textarea"
               placeholder="请输入内容"
@@ -624,8 +627,8 @@
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="open1=false">确 定</el-button>
-        <el-button @click="open1=false" size="btn">取 消</el-button>
+        <el-button type="primary" @click="open1=false">关 闭</el-button>
+        <!-- <el-button @click="open1=false" size="btn">取 消</el-button> -->
       </div>
     </el-dialog>
     </div>
@@ -732,7 +735,7 @@ export default {
       // 添加列表的人员
       executor: [],
       // 左侧树形
-      deptOptions:"",
+      deptOptions:[],
       //左侧时间选择
       pickerOptions: {
         disabledDate(time) {
@@ -924,8 +927,10 @@ export default {
        getGetready(id).then(response => {
         this.form1 = response.data;
          this.form1.talkPeople = this.form1.talkPeople.split(",").map(Number);
+         this.form1.filePath=process.env.VUE_APP_BASE_API+this.form1.filePath
+         console.log(this.form1)
         this.open1 = true;
-        this.title1 = "查看党委议教会";
+        this.title1 = "查看教育准备会";
       });
     },
     /** 提交按钮 */
@@ -1021,6 +1026,7 @@ export default {
   line-height: 33px;
   text-align: center;
 }
+
 ::v-deep .el-pagination__sizes .el-input__suffix{
   right: 6px;
 }
@@ -1355,5 +1361,7 @@ export default {
 /* ::v-deep .el-select-dropdown__item {
   color: white;
 }  */
-
+::v-deep .el-form-item__content .el-textarea .el-textarea__inner{
+   color: white !important;
+}
 </style>

src/views/thought/parliament/index.vue

@@ -168,7 +168,7 @@
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <!-- <el-button
           type="warning"
           plain
           icon="el-icon-download"
@@ -176,7 +176,7 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['thought:parliament:export']"
-        >导出</el-button>
+        >导出</el-button> -->
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -503,7 +503,7 @@
               class="canjiaren"
               multiple
               filterable
-              
+              disabled
             >
               <el-option
                 v-for="item in executor"
@@ -517,8 +517,8 @@
           </el-form-item>
         <div class="jiben">会议内容</div>
         <el-form-item >
-          <div class="thistext">{{onEditor(form1.talkContent)}}</div>
-          <!-- <quill-editor
+          <!-- <div class="thistext">{{onEditor(form1.talkContent)}}</div> -->
+          <quill-editor
               class="quill-editor"
               ref="myTextEditor"
               v-model="form1.talkContent"
@@ -529,7 +529,7 @@
                 color: white;
                 margin-bottom: 60px;
               "
-            ></quill-editor> -->
+            ></quill-editor>
         </el-form-item>
        <div class="jiben">附件</div>
            <el-form-item>
@@ -547,8 +547,8 @@
            </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="open1=false">确 定</el-button>
-        <el-button @click="open1=false" size="btn">取 消</el-button>
+        <el-button type="primary" @click="open1=false">关 闭</el-button>
+        <!-- <el-button @click="open1=false" size="btn">取 消</el-button> -->
       </div>
     </el-dialog>
   </div>
@@ -810,6 +810,8 @@ export default {
        getParliament(id).then(response => {
         this.form1 = response.data;
         this.form1.participants = this.form1.participants.split(",").map(Number);
+        this.form1.filePath=process.env.VUE_APP_BASE_API+this.form1.filePath
+        console.log(this.form1)
         this.open1 = true;
         this.title1 = "查看党委议教会";
       });

src/views/thought/talk/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="box-lfet">
-      <div class="data">
+      <!-- <div class="data">
         <p>单位</p>
         <div class="a1"></div>
         <el-date-picker
@@ -13,7 +13,7 @@
           @change="shiJian"
         >
         </el-date-picker>
-      </div>
+      </div> -->
       <div class="dadui">
         <img src="../../../images/星星.png" alt="" />
         大队
@@ -207,7 +207,7 @@
           >
         </el-col>
         <el-col :span="1.5">
-          <el-button
+          <!-- <el-button
             type="warning"
             plain
             icon="el-icon-download"
@@ -216,7 +216,7 @@
             @click="handleExport"
             v-hasPermi="['thought:talk:export']"
             >导出</el-button
-          >
+          > -->
         </el-col>
         <right-toolbar
           :showSearch.sync="showSearch"
@@ -511,6 +511,7 @@
           </el-form-item>
           <el-form-item label="谈心开始时间" prop="startTime">
             <el-date-picker
+              disabled
               clearable
               size="small"
               v-model="form1.startTime"
@@ -522,6 +523,7 @@
           </el-form-item>
           <el-form-item label="谈心结束时间" prop="endTime" label-width="125px">
             <el-date-picker
+             disabled
               clearable
               size="small"
               v-model="form1.endTime"
@@ -561,8 +563,8 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="open1=false">确 定</el-button>
-          <el-button @click="open1=false" size="btn">取 消</el-button>
+          <el-button type="primary" @click="open1=false">关 闭</el-button>
+          <!-- <el-button @click="open1=false" size="btn">取 消</el-button> -->
         </div>
       </el-dialog>
     </div>
@@ -654,7 +656,7 @@ export default {
         ],
       },
       // 左侧树形
-      deptOptions: "",
+      deptOptions: [],
       //左侧时间选择
       pickerOptions: {
         disabledDate(time) {
@@ -869,6 +871,7 @@ export default {
       const id = row.id || this.ids
        getTalk(id).then(response => {
         this.form1 = response.data;
+        this.form1.filePath=process.env.VUE_APP_BASE_API+this.form1.filePath
         this.open1 = true;
         this.title1 = "查看谈心记录卡";
       });

src/views/thought/teacher/index.vue

@@ -132,6 +132,7 @@
       <el-col :span="1.5">
         <el-button
           type="primary"
+          v-if="this.level==1"
           plain
           icon="el-icon-plus"
           size="mini"
@@ -151,8 +152,8 @@
           v-hasPermi="['thought:teacher:edit']"
         >修改</el-button>
       </el-col> -->
-      <el-col :span="1.5">
-        <el-button
+      <!-- <el-col :span="1.5"> -->
+        <!-- <el-button
           type="danger"
           plain
           icon="el-icon-delete"
@@ -162,7 +163,7 @@
           v-hasPermi="['thought:teacher:remove']"
           >删除</el-button
         >
-      </el-col>
+      </el-col> -->
       <!-- <el-col :span="1.5">
         <el-button
           type="primary"
@@ -687,8 +688,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      console.log(row)
       const ids = row.id || this.ids;
+      console.log(this.level)
       this.$modal
         .confirm("是否确认删除？")
         .then(function () {
@@ -698,13 +699,14 @@ export default {
           if(row.level==1){
             row.parentDirectory=null
           }
-          console.log(this.level)
-          if(row.pageX){
-            row.parentId=0
-            row.parentDirectory=""
-            row.level=1
-            this.level=1
-          }
+          
+          // if(row.pageX){
+          //   row.parentId=0
+          //   row.parentDirectory=""
+          //   console.log(this.level)
+          //   row.level=this.level
+          //   this.level=this.level
+          // }
           listTeacher({
             parentDirectory: row.parentDirectory,
             level: row.level,

src/views/thought/teacherFile/index.vue

@@ -287,7 +287,7 @@
               </treeselect>
             </el-form-item>
             <el-form-item style="margin-left: 30px; margin-top: 30px">
-              <FileUpload v-model="form.file" />
+              <FileUpload v-model="moreFile" />
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -353,10 +353,10 @@
       >
         <div ref="file"></div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="submitForm3">确 定</el-button>
-          <el-button @click="open33 = false" size="" class="aa1">
+          <el-button type="primary" @click="submitForm3">关 闭</el-button>
+          <!-- <el-button @click="open33 = false" size="" class="aa1">
             取 消</el-button
-          >
+          > -->
         </div>
       </el-dialog>
       <!-- 预览PDF文件弹框 -->
@@ -422,11 +422,11 @@
           <!-- <div class="el-dialog__footer"> -->
           <div slot="footer" class="dialog-footer">
             <el-button type="primary" @click="previewDialog = false"
-              >确 定</el-button
+              >关 闭</el-button
             >
-            <el-button @click="previewDialog = false" size="" class="aa1"
+            <!-- <el-button @click="previewDialog = false" size="" class="aa1"
               >取 消</el-button
-            >
+            > -->
           </div>
           <!-- </div> -->
         </template>
@@ -617,6 +617,8 @@ export default {
       users: [],
 
       dir: "",
+      // 多文件上传
+      moreFile:[]
     };
   },
   created() {
@@ -971,20 +973,24 @@ export default {
     submitForm() {
       this.form.directoryName = this.dir;
       // console.log(this.form);
-      console.log(this.form.directoryName);
+      // console.log(this.form.directoryName);
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          // console.log(this.form.file[0]);
-          // 文件名
-          this.form.fileName = this.form.file[0].name;
-          // 路径
-          this.form.parentDirName = this.form.file[0].url;
-          // 后缀
-          this.form.parentDirId = this.form.file[0].houZUI;
-          // 页数
-          this.form.theNumberPages = this.form.file[0].pageCount;
-          // 文件大小
-          this.form.fileSize = this.form.file[0].fileLength;
+          this.form.thoughtTeacherFiles=this.moreFile
+          console.log(this.form)
+          this.form.thoughtTeacherFiles.forEach((item)=>{
+            // 文件大小
+            item.fileSize=item.fileLength
+            // 文件路径
+            item.parentDirName=item.url
+            // 文件后缀
+            item.parentDirId=item.houZUI
+            // 页数
+            item.theNumberPages=item.pageCount
+            // 文件名称
+            item.fileName=item.name
+          })
+          // console.log(this.form)
           //输出结果
           // 上传文件接口
           addTeacherFile(this.form).then((response) => {
@@ -1643,4 +1649,7 @@ body,
 ::v-deep .vue-treeselect__single-value {
   color: white;
 }
+::v-deep .docx{
+  width: 100% !important;
+}
 </style>

src/views/thought/weekjob/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="box-lfet">
-      <div class="data">
+      <!-- <div class="data">
         <p>单位</p>
         <div class="a1"></div>
         <el-date-picker
@@ -13,14 +13,14 @@
           @change="shiJian"
         >
         </el-date-picker>
-      </div>
+      </div> -->
       <div class="dadui">
         <img src="../../../images/星星.png" alt="" />
         大队
       </div>
       <div class="tree">
         <el-tree
-          class="userAgree"
+          class="userAgrees"
           style="height: 700px; overflow: auto"
           :data="deptOptions"
           :props="defaultProps"
@@ -170,7 +170,6 @@
       <!-- <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form> -->
-
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button
@@ -208,7 +207,7 @@
           >
         </el-col>
         <el-col :span="1.5">
-          <el-button
+          <!-- <el-button
             type="warning"
             plain
             icon="el-icon-download"
@@ -217,7 +216,7 @@
             @click="handleExport"
             v-hasPermi="['thought:weekjob:export']"
             >导出</el-button
-          >
+          > -->
         </el-col>
         <right-toolbar
           :showSearch.sync="showSearch"
@@ -355,7 +354,7 @@
               <treeselect
                 v-model="form.unitId"
                 :options="users"
-                placeholder="请选择到访单位"
+                placeholder="请选择单位"
                 class="threeselects"
                 @select="selectPeo"
               >
@@ -367,7 +366,7 @@
               <el-select
                 filterable
                 v-model="form.dutyLeader"
-                placeholder="请选择人员"
+                placeholder="请选择连值班领导"
                 ref="peoplenames"
               >
                 <el-option
@@ -411,7 +410,7 @@
                 filterable
                 v-model="form.politicalOfficer"
                 ref="militaryOfficer"
-                placeholder="请选择军事长官"
+                placeholder="请选择政治长官"
               >
                 <el-option
                   v-for="item in zhengzhiexecutor"
@@ -730,8 +729,8 @@
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="open1=false">确 定</el-button>
-          <el-button @click="open1=false" size="btn">取 消</el-button>
+          <el-button type="primary" @click="open1=false">关 闭</el-button>
+          <!-- <el-button @click="open1=false" size="btn">取 消</el-button> -->
         </div>
       </el-dialog>
     </div>
@@ -831,7 +830,7 @@ export default {
         ],
       },
       // 左侧树形
-      deptOptions: "",
+      deptOptions: [],
       //左侧时间选择
       pickerOptions: {
         disabledDate(time) {
@@ -897,7 +896,6 @@ export default {
         },
       ],
       getdeptList: [],
-      zhankai: false,
       form1:{},
       open1:false,
       title1:""
@@ -919,9 +917,6 @@ export default {
     });
   },
   methods: {
-    zhankai() {
-      this.zhankai = true;
-    },
     unit2Format(row) {
       var deptName = "";
       this.getdeptList.map((item) => {
@@ -1108,18 +1103,13 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      // console.log(row)
-
-      // this.unitName=row.unitName
-      // console.log
       this.reset();
       const id = row.id || this.ids;
       getWeekjob(id).then((response) => {
         this.form = response.data;
-        console.log(this.form);
         this.form.unitName = this.form.unitName;
         this.tomList = this.form.thoughtWeekjobFuList;
-        // console.log(this.form)
+         console.log(this.form);
         this.open = true;
         this.title = "修改周工作";
       });
@@ -1194,6 +1184,13 @@ export default {
 };
 </script>
 <style scoped>
+/*定义滚动条宽高及背景，宽高分别对应横竖滚动条的尺寸*/
+.userAgree::-webkit-scrollbar {
+  width: 14px;
+  /* height: 2px !important; */
+  background: #3d83b8;
+}
+
 /* 备注 */
 .thistext {
   color: white;