sasp-admin 0.2.62 → 0.2.64

package/src/components/public/upload/preview/OfdPreview.vue

@@ -0,0 +1,223 @@
+<template>
+  <a-modal :title="title" :visible="visible" @cancel="handleCancel" width="100%" :footer="null">
+    <a-spin :spinning="loading" tip="加载中">
+<!--      <div class="page-box">-->
+<!--        <div class="option-list" v-if="ofdObj">-->
+<!--          <div class="scale-icon" style="margin-left: 10px" @click="plus">-->
+<!--            &lt;!&ndash; 放大 &ndash;&gt;-->
+<!--            <a-icon type="plus-circle"/>-->
+<!--          </div>-->
+<!--          <div class="scale-icon" @click="minus">-->
+<!--            &lt;!&ndash; 缩小 &ndash;&gt;-->
+<!--            <a-icon type="minus-circle"/>-->
+<!--          </div>-->
+<!--          <div class="scale-icon">-->
+<!--            &lt;!&ndash; 第一页 &ndash;&gt;-->
+<!--            <a-icon type="step-backward" @click="firstPage"/>-->
+<!--          </div>-->
+<!--          <div class="scale-icon" @click="prePage">-->
+<!--            &lt;!&ndash; 上一页 &ndash;&gt;-->
+<!--            <a-icon type="caret-left"/>-->
+<!--          </div>-->
+<!--&lt;!&ndash;          <div class="scale-icon">&ndash;&gt;-->
+<!--&lt;!&ndash;            &lt;!&ndash; 当前页码和总页数 &ndash;&gt;&ndash;&gt;-->
+<!--&lt;!&ndash;            {{ pageIndex }}/{{ pageCount }}&ndash;&gt;-->
+<!--&lt;!&ndash;          </div>&ndash;&gt;-->
+<!--          <div class="scale-icon" @click="nextPage">-->
+<!--            &lt;!&ndash; 下一页 &ndash;&gt;-->
+<!--            <a-icon type="caret-right"/>-->
+<!--          </div>-->
+<!--          <div class="scale-icon" @click="lastPage">-->
+<!--            &lt;!&ndash; 最后一页 &ndash;&gt;-->
+<!--            <a-icon type="step-forward"/>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+      <div class="modal-box" id="ofd-preview-box">
+        <!-- 文件区域 -->
+        <div class="main-section" :class="{ 'background-shadow': loadOverFlag }" id="content" ref="contentDiv"></div>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+import {parseOfdDocument, renderOfd, renderOfdByScale, getPageScale, setPageScale} from 'ofd.js'
+
+export default {
+  name: 'OfdPreview',
+  components: {},
+  props: {
+    title: {
+      type: String,
+      default: 'OFD文件预览',
+    },
+    fileUrl: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      ofdObj: null,
+      pageIndex: 1,
+      pageCount: 0,
+      scale: 0,
+      loading: false,
+      visible: false,
+      loadOverFlag: false,
+      screenWidth: 1000,
+    }
+  },
+  watch: {},
+  computed: {},
+  methods: {
+    showModal() {
+      this.visible = true
+      this.$nextTick(() => {
+        this.screenWidth = document.getElementById('ofd-preview-box').getBoundingClientRect().width - 30
+        this.getOfdDocumentObj(this.fileUrl, this.screenWidth)
+      })
+    },
+    handleCancel(e) {
+      this.visible = false
+    },
+    getOfdDocumentObj(file, screenWidth) {
+      let that = this
+      this.loading = true
+      parseOfdDocument({
+        ofd: file,
+        success(res) {
+          that.ofdObj = res[0]
+          that.pageCount = res[0].pages.length
+          const divs = renderOfd(screenWidth, res[0])
+          that.displayOfdDiv(divs)
+          that.loadOverFlag = true
+          that.loading = false
+        },
+        fail(error) {
+          that.loading = false
+          console.log('OFD打开失败')
+        },
+      })
+    },
+    displayOfdDiv(divs) {
+      this.scale = getPageScale()
+      let contentDiv = document.getElementById('content')
+      contentDiv.innerHTML = ''
+      for (const div of divs) {
+        contentDiv.appendChild(div)
+      }
+    },
+    plus() {
+      setPageScale(++this.scale)
+      const divs = renderOfdByScale(this.ofdObj)
+      this.displayOfdDiv(divs)
+    },
+    minus() {
+      setPageScale(--this.scale)
+      const divs = renderOfdByScale(this.ofdObj)
+      this.displayOfdDiv(divs)
+    },
+    prePage() {
+      let contentDiv = document.getElementById('content')
+      let ele = contentDiv.children.item(this.pageIndex - 2)
+      if (ele) {
+        ele.scrollIntoView(true)
+        this.pageIndex = this.pageIndex - 1
+      }
+    },
+    firstPage() {
+      let contentDiv = document.getElementById('content')
+      let ele = contentDiv.firstElementChild
+      if (ele) {
+        ele.scrollIntoView(true)
+        this.pageIndex = 1
+      }
+    },
+    nextPage() {
+      let contentDiv = document.getElementById('content')
+      let ele = contentDiv.children.item(this.pageIndex)
+      if (ele) {
+        ele.scrollIntoView(true)
+        ++this.pageIndex
+      }
+    },
+    lastPage() {
+      let contentDiv = document.getElementById('content')
+      let ele = contentDiv.lastElementChild
+      if (ele) {
+        ele.scrollIntoView(true)
+        this.pageIndex = contentDiv.childElementCount
+      }
+    },
+  },
+  created() {
+    this.showModal();
+  },
+  mounted() {
+  },
+}
+</script>
+<style lang="scss" scoped>
+.wrapper {
+}
+
+.modal-box {
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+}
+
+.main-section {
+  width: 100%;
+  //padding-top: 20px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  overflow: hidden;
+  position: relative;
+}
+
+.background-shadow {
+  background: #808080;
+}
+
+.page-box {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 50px;
+  margin-bottom: 15px;
+
+  .option-list {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+  }
+}
+
+.scale-icon {
+  display: flex;
+  cursor: pointer;
+  justify-content: center;
+  align-items: center;
+  width: 33px;
+  height: 28px;
+  border-radius: 1px;
+  font-weight: 500;
+  font-size: 18px;
+  color: #333333;
+  text-align: center;
+  padding: 2px;
+}
+
+.scale-icon :hover {
+  color: #1890ff;
+}
+
+.ant-spin-nested-loading > div > .ant-spin {
+  max-height: auto !important;
+}
+</style>

package/src/components/public/upload/preview/officeViewer.vue

@@ -0,0 +1,116 @@
+<template>
+    <div ref="officeViewerRef" v-if="officeDialog" class="officeMain">
+        <vue-office-excel
+            v-if="xlsxDialog"
+            :src="url"
+            style="height: 100vh;"
+            @rendered="renderedHandler"
+            @error="errorHandler"
+        />
+        <vue-office-docx
+            v-if="docxDialog"
+            :src="url"
+            style="height: 100vh;"
+            @rendered="renderedHandler"
+            @error="errorHandler"
+        />
+    </div>
+</template>
+
+<script>
+    import VueOfficeExcel from '@vue-office/excel'
+    import '@vue-office/excel/lib/index.css'
+    import VueOfficeDocx from '@vue-office/docx'
+    import '@vue-office/docx/lib/index.css'
+
+    export default {
+        name: "office-viewer",
+        components: {
+          VueOfficeExcel,VueOfficeDocx,
+        },
+        data(){
+            return {
+                previewUrl: '/uploadController/previewFile',
+                officeLoading: '',
+                xlsxDialog:false,
+                docxDialog:false,
+                url:'',
+                fjType:'',
+                isEnd:false,
+                officeDialog:true,
+            }
+        },
+        watch: {
+            isEnd() {
+                this.officeDialog = false;
+                this.$nextTick(()=>{
+                    this.officeDialog = true;
+                })
+            },
+        },
+        mounted(){
+            this.getOfficeUrl();
+        },
+        methods: {
+            getOfficeUrl(){
+                let fjid = this.$route.query.fjid;
+                this.fjType = this.$route.query.fjType;
+                this.url = window.JAVA_URL + "/" + window.ADMIN_NAME + this.previewUrl +`?id=${fjid}`;
+                this.officeLoading = this.$loading({
+                    lock: true,
+                    target:this.$refs.officeViewerRef.$el,
+                    text: '正在加载，请稍后....',
+                    spinner: 'el-icon-loading',
+                    background: 'rgba(0, 0, 0, 0.7)'
+                });
+                if(this.fjType == 'excel'){
+                    this.xlsxDialog = true;
+                }else if(this.fjType == 'word'){
+                    this.docxDialog = true;
+                }
+
+            },
+            renderedHandler() {
+                // this.$message.success("渲染完成！");
+                this.officeLoading && this.officeLoading.close();
+                if(this.fjType == 'excel'){
+                    this.isEnd = true;
+                }
+            },
+            errorHandler() {
+                this.$message.error("渲染失败！");
+                this.officeLoading && this.officeLoading.close();
+            },
+        }
+    }
+</script>
+
+<style lang="scss">
+.officeMain{
+  background-color: #808080;
+  height: 100%;
+  padding: 30px 0;
+  .vue-office-docx,.vue-office-excel{
+    height: calc(100% - 60px)!important;
+  }
+  .vue-office-excel{
+    width: calc(100% - 60px);
+    margin-left: 30px;
+  }
+  .docx-wrapper{
+    padding-top: 0!important;
+    padding-bottom: 0!important;
+  }
+  .docx{
+    border-radius: 3px;
+  }
+  .docx:last-child{
+    margin-bottom: 0!important;
+  }
+  .x-spreadsheet{
+    padding-top: 5px;
+    box-sizing: border-box;
+    border-radius: 5px;
+  }
+}
+</style>

package/src/components/public/upload/preview/pdfPreview.vue

@@ -0,0 +1,91 @@
+<template>
+  <div class="preview-pdf">
+    <div class="loading-block">
+      <img src="../../../../assets/images/loading-bar.gif" class="loading">
+      <p class="loading-word">加载中...</p>
+    </div>
+    <div ref="pdfViewerRef" style="z-index: 10;"></div>
+  </div>
+</template>
+
+<script>
+import PDFObject from 'pdfobject';
+
+export default {
+  name: "pdf-preview",
+  data() {
+    return {
+      url: '',
+      previewUrl:""
+    }
+  },
+  mounted() {
+    this.getPDFUrl();
+  },
+  methods: {
+    getPDFUrl() {
+      const fjid = this.$route.query.fjid;
+      const url = window.JAVA_URL + "/" + window.ADMIN_NAME + `/uploadController/previewFile?id=${fjid}`;
+      fetch(url).then(response => response.arrayBuffer())
+        .then(buffer => new Uint8Array(buffer))
+        .then(uint8array => {
+          // 创建Blob对象
+          const blob = new Blob([uint8array], { type: 'application/pdf' });
+
+          // 创建一个指向Blob的URL
+          const pdfUrl = URL.createObjectURL(blob);
+
+          // 现在你可以使用这个URL与PDFObject结合
+          PDFObject.embed(pdfUrl,this.$refs.pdfViewerRef, {style: 'position: absolute'}); // 'pdf-container'是页面上用于展示PDF的HTML元素ID
+        });
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.preview-pdf {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  overflow-x: hidden;
+  overflow-y: hidden;
+
+  .loading-block {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 150px;
+    height: 150px;
+    margin-left: -75px;
+    margin-top: -75px;
+
+    .loading {
+      width: 150px;
+      height: 100px;
+      z-index: 1;
+    }
+
+    .loading-word {
+      width: 150px;
+      text-align: center;
+      font-size: 14px;
+      font-family: "saspiconfont", sans-serif;
+      color: #333333;
+      letter-spacing: 4px;
+    }
+  }
+
+  /deep/ {
+    .pdfobject-container {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+    }
+  }
+}
+</style>

package/src/{views → components/public/upload}/preview/pdfViewer.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="preview-pdf">
         <div class="loading-block">
-            <img src="../../assets/images/loading-bar.gif" class="loading">
+            <img src="../../../../assets/images/loading-bar.gif" class="loading">
             <p class="loading-word">加载中...</p>
         </div>
         <div ref="pdfViewerRef" style="z-index: 10;"></div>

package/src/views/VueMenuView.vue

@@ -117,19 +117,17 @@
              */
             eachRouterSet(allRouterArr,urlArr,index){
                 allRouterArr.forEach(item =>{
-                    if(urlArr[index + 1]){
-                        if((urlArr[index +1] == (item.name ? item.name : item.path))||((item.name ? item.name : item.path)).indexOf(urlArr[index +1]+"/:")>-1){
-                            //当前匹配
-                            //判断 urlArr是否存在下级
-                            if(item.children && item.children.length > 0) {
-                                //如果存在下级
-                                allRouterArr = item.children || [];
-                                index = index + 1;
-                                this.eachRouterSet(allRouterArr,urlArr,index);
-                            }else{
-                                console.log("item....",item);
-                                this.componentIndex = item.component;
-                            }
+                    if(urlArr[index + 1] && ((urlArr[index +1] == (item.name ? item.name : item.path))||((item.name ? item.name : item.path)).indexOf(urlArr[index +1]+"/:")>-1)){
+                        //当前匹配
+                        //判断 urlArr是否存在下级
+                        if(item.children && item.children.length > 0) {
+                            //如果存在下级
+                            allRouterArr = item.children || [];
+                            index = index + 1;
+                            this.eachRouterSet(allRouterArr,urlArr,index);
+                        }else{
+                            console.log("item....",item);
+                            this.componentIndex = item.component;
                         }
                     }
                 })

package/src/views/data/dataManage.vue

@@ -26,13 +26,14 @@
             <el-header style="height: 40px;padding: 0">
                 <el-input
                         placeholder="输入关键字进行过滤"
-                        v-model="filterText" style="width: 209px;margin-top: 5px;" size="small">
+                        v-model="filterText" style="width: 150px;margin-top: 5px;" size="small">
                 </el-input>
-                <el-button @click="addNode()" style="margin-left: 15px" type="primary" icon="el-icon-circle-plus" size="small">添加</el-button>
-                <el-button @click="removeNode"  style="margin-left: 15px" type="danger" icon="el-icon-delete" size="small">删除</el-button>
+                <el-button @click="addNode()" style="margin-left: 6px" type="primary" icon="el-icon-circle-plus" size="small">添加</el-button>
+                <el-button @click="removeNode"  style="margin-left: 6px" type="danger" icon="el-icon-delete" size="small">删除</el-button>
+                <el-button @click="expiredNode"  style="margin-left: 6px" type="info" icon="el-icon-timer" size="small">过期</el-button>
             </el-header>
             <el-aside class="asideTree">
-                <common-tree :rootDatas="rootDatas" :refreshProper="typeId" :nodekey="nodekey" ref="commonTreeRef" :defaultProps="defaultProps"
+                <common-tree v-if="showTree" :rootDatas="rootDatas" :refreshProper="typeId" :nodekey="nodekey" ref="commonTreeRef" :defaultProps="defaultProps"
                              :treeAllowDrag="treeAllowDrag" :treeNodeDrop="treeNodeDrop" :tree-allow-drop="treeAllowDrop" :draggable=true
                              :filterText="filterText" :expandOnclickNode=false :defaulExpand="defaulExpand" :rightClick="rightClick"
                              :nodeClick="nodeClick" :requestUrl="api.data.getDataByType" :requestParam="{'typeId':typeId,'getOutDate':'1'}"
@@ -99,6 +100,7 @@
                     // isLeaf: 'leaf',
                 },
                 menuVisible:false, // 右击菜单显示的控制
+                showTree:true,//显示树
                 defaulExpand:['-1'], // 默认展开节点
                 orginParentId:['-1'], // 根节点id
                 objectID:null,  // 右击时节点id,如果与上次相同则菜单保持显示
@@ -289,6 +291,50 @@
                     });
                 });
             },
+            expiredNode() { // 过期勾选节点
+                let vm = this;
+                let data = [];
+                let expiredArr = vm.$refs.commonTreeRef.getTreeCheckedNodes("key");
+                if (expiredArr.length == 0) {
+                    vm.$message("请勾选需要过期的节点！");
+                    return;
+                }
+                vm.$confirm('确定过期已勾选节点?', '警告', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                }).then(function () {
+                    for (let i = 0;i < expiredArr.length;i++){
+                        let result = vm.axios.post(vm.api.data.update, {typeId:vm.typeId,id:expiredArr[i],outDate:'1'})
+                        data.push(result)
+                    }
+                    Promise.all(data).then(itemList =>{
+                        (itemList || []).forEach(item=>{
+                            if (item.data.operateSuccess) {
+                                let obj=item.data.operateObj||{};
+                                let node = vm.$refs.commonTreeRef.getNode(obj.id);
+                                vm.$set(node.data,'outDate','1');
+                            }
+                        })
+                        vm.showTree = false;
+                        vm.$nextTick(()=>{
+                            vm.$message({
+                                  duration: 1000,
+                                  type: 'success',
+                                  message: '设置过期成功'
+                                }
+                            );
+                            vm.initFormData();
+                            vm.showTree = true;
+                        })
+                    })
+                }).catch(function () {
+                    vm.$message({
+                        duration: 1000,
+                        type: 'info',
+                        message: '已取消'
+                    });
+                });
+            },
             save() { // 提交
                 let vm = this;
                 let submitData = {};
@@ -550,7 +596,7 @@
         text-decoration: none;
         border: 1px silver solid;
         color: #fff;
-        text-align: center;
+        text-align: left;
         height: 35px;
     }
     .font-dialog /deep/ .el-dialog__body{

package/src/views/event/eventManager/vueEventDiy.vue

@@ -310,12 +310,10 @@
             },
             searchFunc(){
                 (this.crud.dataStore.records || []).forEach(item =>{
-                    if(item.dataSource == '1'){ //内部
-                       if(this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]){ //内部
-                           this.$set(item,'version',this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]['config']['version'] || "1.0");
-                           this.$set(item,'eventName',this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]['config']['eventName']);
-                           this.$set(item,'eventType',this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]['eventType']);
-                       }
+                    if(item.dataSource == '1' && this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]){ //内部
+                       this.$set(item,'version',this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]['config']['version'] || "1.0");
+                       this.$set(item,'eventName',this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]['config']['eventName']);
+                       this.$set(item,'eventType',this.EVENT_PLUGIN["preActiveEvenObj"]["inner-"+item.eventKey]['eventType']);
                     }
                 });
             },

package/src/views/log/loginlog/logManageDevOrSup.vue

@@ -254,11 +254,14 @@
                         "q+": Math.floor((date.getMonth() + 3) / 3), //季度
                         "S": date.getMilliseconds()             //毫秒
                     };
-                    if (/(y+)/.test(fmt))
-                        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
-                    for (let k in o)
-                        if (new RegExp("(" + k + ")").test(fmt))
-                            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+                    if (/(y+)/.test(fmt)) {
+                      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + "").substr(4 - RegExp.$1.length));
+                    }
+                    for (let k in o) {
+                      if (new RegExp("(" + k + ")").test(fmt)) {
+                        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+                      }
+                    }
                 } else {
                     fmt = '无';
                 }