Lxf il y a 2 ans
Parent
révision
3d1b9218a4
7 fichiers modifiés avec 18 ajouts et 10 suppressions
  1. 2
    1
      .env.development
  2. 1
    0
      .env.production
  3. 1
    0
      .gitignore
  4. 5
    5
      src/report.js
  5. 1
    0
      src/utils/mixins.js
  6. 4
    2
      src/views/luru/waipandan.vue
  7. 4
    2
      vue.config.js

+ 2
- 1
.env.development Voir le fichier

@@ -1,2 +1,3 @@
NODE_ENV = 'development'
VUE_APP_BASE_RESFUL = 'http://192.168.123.4:9001/Manhour2/public/'
VUE_APP_BASE_RESFUL = 'http://192.168.123.4:9001/Manhour2/public/'
VUE_APP_PUBLICPATH='/OA/Manhour2'

+ 1
- 0
.env.production Voir le fichier

@@ -1,2 +1,3 @@
NODE_ENV = 'production'
VUE_APP_BASE_RESFUL = 'http://192.168.123.4:9001/Manhour2/public'
VUE_APP_PUBLICPATH=''

+ 1
- 0
.gitignore Voir le fichier

@@ -7,6 +7,7 @@ abbb/
abbbb/
dist1/
dist2/
dist3/
npm-debug.log*
yarn-debug.log*
yarn-error.log*

+ 5
- 5
src/report.js Voir le fichier

@@ -13,7 +13,7 @@ const report = {

let nowDate = new Date()
let nowTime = new Date(nowDate).getTime() / 1000
debugger
let PUBLICPATH = process.env.VUE_APP_PUBLICPATH

if (window.Stimulsoft) {
resolve(true);
@@ -25,11 +25,11 @@ const report = {
text: "报表组件加载中...",
background: "rgba(0, 0, 0, 0.3)"
});
$LAB.script("/OA/Manhour2/static/plug/zip/zip.js").wait(() => {
zip.installJS("/OA/Manhour2/static/plug/report/src/report.zip", ["stimulsoft.reports.js", "stimulsoft.viewer.js", "stimulsoft.designer.js"], () => {
report.loadCss(["/OA/Manhour2/static/plug/report/css/stimulsoft.viewer.office2013.whiteteal.css", "/OA/Manhour2/static/plug/report/css/stimulsoft.designer.office2013.whiteteal.css", "/OA/Manhour2/static/plug/report/css/stimulsoft.run.css"]);
$LAB.script(PUBLICPATH+ "/static/plug/zip/zip.js").wait(() => {
zip.installJS(PUBLICPATH+"/static/plug/report/src/report.zip", ["stimulsoft.reports.js", "stimulsoft.viewer.js", "stimulsoft.designer.js"], () => {
report.loadCss([PUBLICPATH+"/static/plug/report/css/stimulsoft.viewer.office2013.whiteteal.css", PUBLICPATH+"/static/plug/report/css/stimulsoft.designer.office2013.whiteteal.css", PUBLICPATH+"/static/plug/report/css/stimulsoft.run.css"]);
Stimulsoft.Base.StiLicense.key = "6vJhGtLLLz2GNviWmUTrhSqnOItdDwjBylQzQcAOiHkcgIvwL0jnpsDqRpWg5FI5kt2G7A0tYIcUygBh1sPs7plofUOqPB1a4HBIXJB621mau2oiAIj+ysU7gKUXfjn/D5BocmduNB+ZMiDGPxFrAp3PoD0nYNkkWh8r7gBZ1v/JZSXGE3bQDrCQCNSy6mgby+iFAMV8/PuZ1z77U+Xz3fkpbm6MYQXYp3cQooLGLUti7k1TFWrnawT0iEEDJ2iRcU9wLqn2g9UiWesEZtKwI/UmEI2T7nv5NbgV+CHguu6QU4WWzFpIgW+3LUnKCT/vCDY+ymzgycw9A9+HFSzARiPzgOaAuQYrFDpzhXV+ZeX31AxWlnzjDWqpfluygSNPtGul5gyNt2CEoJD1Yom0VN9fvRonYsMsimkFFx2AwyVpPcs+JfVBtpPbTcZscnzUdmiIvxv8Gcin6sNSibM6in/uUKFt3bVgW/XeMYa7MLGF53kvBSwi78poUDigA2n12SmghLR0AHxyEDIgZGOTbNI33GWu7ZsPBeUdGu55R8w=";
Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile("/OA/Manhour2/static/plug/report/lang/zh-CHS.xml", false, "zh-CHS");
Stimulsoft.Base.Localization.StiLocalization.addLocalizationFile(PUBLICPATH+"/static/plug/report/lang/zh-CHS.xml", false, "zh-CHS");
Stimulsoft.Base.Localization.StiLocalization.cultureName = "zh-CHS";
Stimulsoft.Report.Dictionary.StiFunctions.addFunction("custom", "", "search", "Find field contents based on index in specified data source", "", "", "Return to specified content", [Object, String, String, String], ["this", "source", "index", "field"], ["Reference this object", "Data source name", "Specify index fields", "Field information"],
(that, source, index, field) => {

+ 1
- 0
src/utils/mixins.js Voir le fichier

@@ -11,6 +11,7 @@
export default {
data() {
return {
}
},
methods: {

+ 4
- 2
src/views/luru/waipandan.vue Voir le fichier

@@ -356,6 +356,7 @@ export default {
this.set_rows(this.tabledata);
setName(Tname)
this.set_mrtjson()
//跳转打印
let routeUrl = this.$router.resolve({
path: "/printpage",
@@ -364,7 +365,7 @@ export default {
type: 0,
Pdf: "pdf",
PDFName: this.month + "员工外判工资",
tplpath: "/report/waipandan2.mrt",
tplpath: PUBLICPATH+"/report/waipandan2.mrt",
},
});
window.open(routeUrl.href, "_blank");
@@ -387,13 +388,14 @@ export default {
this.set_rows(this.tabledata);
setName(Tname)
this.set_mrtjson()
let PUBLICPATH = process.env.VUE_APP_PUBLICPATH
//跳转打印
let routeUrl = this.$router.resolve({
path: "/printpage",
//0:直接模板 1 动态模板
query: {
type: 0,
tplpath: "/report/waipandan2.mrt",
tplpath: PUBLICPATH+"/report/waipandan2.mrt",
},
});
window.open(routeUrl.href, "_blank");

+ 4
- 2
vue.config.js Voir le fichier

@@ -10,6 +10,8 @@ function resolve(dir) {
const name = defaultSettings.title || 'vue Admin Template' // page title

const resfulurl = process.env.VUE_APP_BASE_RESFUL
const PUBLICPATH = process.env.VUE_APP_PUBLICPATH

// If your port is set to 80,
// use administrator privileges to execute the command line.
// For example, Mac: sudo npm run
@@ -26,8 +28,8 @@ module.exports = {
* In most cases please use '/' !!!
* Detail: https://cli.vuejs.org/config/#publicpath
*/
publicPath: '/OA/Manhour2',
outputDir: 'dist2',
publicPath: PUBLICPATH,
outputDir: 'dist3',
assetsDir: 'static',
lintOnSave: process.env.NODE_ENV === 'development',
productionSourceMap: false,

Chargement…
Annuler
Enregistrer