ly 3 years ago
parent
commit
b636b55a53

+ 1 - 1
master/src/main/resources/application.yml

@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /data/cpmsfile/uploadPath)
-  profile: /data/cpmsfile/uploadPath
+  profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

+ 0 - 2
ui/package.json

@@ -65,8 +65,6 @@
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.4.9",
     "vue-i18n": "7.3.2",
-    "vue-orgchart": "^1.1.7",
-    "vue-pdf": "^4.2.0",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
     "vuedraggable": "2.20.0",

+ 2 - 2
ui/src/views/components/PlantProgList/index.vue

@@ -448,13 +448,13 @@
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import RcData from "./rcData";
   import ClassifyData from "./classifyData";
-  import pdf from "vue-pdf";
+
   import {formatDate} from "../../../utils";
 
   export default {
   name: "index",
   props: ['item', 'typename'],
-  components: {ClassifyData, RcData, Treeselect ,pdf },
+  components: {ClassifyData, RcData, Treeselect},
   data() {
     return {
       drawer: false,

+ 2 - 2
ui/src/views/document/publicdoc/index.vue

@@ -285,12 +285,12 @@
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import {allFileList, delCommonfile} from "@/api/common/commonfile";
-  import pdf from "vue-pdf";
+
 
 
   export default {
   name: "Publicdoc",
-  components: { Treeselect,pdf },
+  components: { Treeselect},
   data() {
     return {
       // 遮罩层

+ 1 - 1
ui/src/views/ehs/environapproval/index.vue

@@ -389,7 +389,7 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
-import pdf from "vue-pdf";
+
 
 export default {
   name: "Environapproval",

+ 1 - 1
ui/src/views/ehs/fireapproval/index.vue

@@ -376,7 +376,7 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import pdf from "vue-pdf";
+
 
 export default {
   name: "Fireapproval",

+ 1 - 1
ui/src/views/ehs/healthapproval/index.vue

@@ -370,7 +370,7 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import pdf from "vue-pdf";
+
 
 export default {
   name: "Healthapproval",

+ 1 - 1
ui/src/views/ehs/msds/index.vue

@@ -500,7 +500,7 @@
   import { listStaffmgr } from "@/api/plant/staffmgr";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import pdf from "vue-pdf";
+
 
   export default {
     name: "Msds",

+ 2 - 2
ui/src/views/ehs/rcaudit/index.vue

@@ -332,11 +332,11 @@
   import {listMenu} from "../../../api/ehs/rcauditmenu";
   import { allFileList, delCommonfile } from "@/api/common/commonfile";
   import NaData from "./naData";
-  import pdf from "vue-pdf";
+
 
   export default {
     name: "Rcaudit",
-    components: { Treeselect,NaData ,pdf },
+    components: { Treeselect,NaData},
     data() {
       return {
         drawer: false,

+ 1 - 1
ui/src/views/ehs/records/index.vue

@@ -415,7 +415,7 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { allFileList, listCommonfile, getCommonfile, delCommonfile, addCommonfile, updateCommonfile, exportCommonfile} from "@/api/common/commonfile";
-import pdf from "vue-pdf";
+
 
 export default {
   name: "Records",

+ 1 - 1
ui/src/views/ehs/safetyapproval/index.vue

@@ -379,7 +379,7 @@ import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import pdf from "vue-pdf";
+
 
 export default {
   name: "Safetyapproval",

+ 1 - 1
ui/src/views/plant/targetagreement/index.vue

@@ -395,7 +395,7 @@ import { getToken } from "@/utils/auth";
 import {allFileList, delCommonfile ,updateCommonfile ,addCommonfile} from "@/api/common/commonfile";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import pdf from "vue-pdf";
+
 
 export default {
   name: "Targetagreement",

+ 1 - 1
ui/src/views/plant/targetmeasures/index.vue

@@ -532,7 +532,7 @@
   import {allFileList, delCommonfile } from "@/api/common/commonfile";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import pdf from "vue-pdf";
+
 
   export default {
     name: "Targetmeasures",

+ 2 - 2
ui/src/views/process/moc/index.vue

@@ -620,12 +620,12 @@ import TrueStateData from "./trueStateData";
 import ChangeData from "./changeData";
 import CategoryData from "./categoryData";
 import RiskData from "./riskData";
-import pdf from "vue-pdf";
+
 import {addCommonfile, allFileList, delCommonfile, updateCommonfile} from "@/api/common/commonfile";
 
 export default {
   name: "Moc",
-  components: {RiskData, CategoryData, ChangeData, TrueStateData, YearChart, Treeselect,pdf},
+  components: {RiskData, CategoryData, ChangeData, TrueStateData, YearChart, Treeselect},
   data() {
     return {
       drawer: false,

+ 2 - 2
ui/src/views/training/training/index.vue

@@ -499,11 +499,11 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { allFileList, listCommonfile, getCommonfile, delCommonfile, addCommonfile, updateCommonfile, exportCommonfile} from "@/api/common/commonfile";
-import pdf from "vue-pdf";
+
 
 export default {
   name: "Training",
-  components: { Treeselect, nonAdd, pdf },
+  components: { Treeselect, nonAdd},
   data() {
     return {
       // 遮罩层

+ 1 - 2
ui/src/views/training/trainingrecords/index.vue

@@ -646,11 +646,10 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {allFileList, delCommonfile ,updateCommonfile ,addCommonfile} from "@/api/common/commonfile";
 import {addTrainingNon, updateTrainingNon} from "@/api/training/trainingNon";
-import pdf from 'vue-pdf'
 
 export default {
   name: "Trainingrecords",
-  components: { Treeselect ,pdf},
+  components: { Treeselect},
   data() {
     return {
       transTitle: [], // transTitle 该标题为转化后的标题, 注意多一列,  因为原来的标题变成了竖着显示了, 所以多一列标题, 第一个为空即可

+ 1 - 2
ui/src/views/training/worklicense/index.vue

@@ -402,12 +402,11 @@ import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import LicenseData from "./licenseData";
-import pdf from 'vue-pdf'
 import {addCommonfile, allFileList, delCommonfile, updateCommonfile} from "@/api/common/commonfile";
 
 export default {
   name: "Worklicense",
-  components: {LicenseData, Treeselect ,pdf},
+  components: {LicenseData, Treeselect},
   data() {
     return {
       drawer: false,