Compare commits
No commits in common. "2fbb7fe20af99eae4ed791099273b7c8fa492195" and "33ed499e72817a464d11c179a48163ecb86714da" have entirely different histories.
2fbb7fe20a
...
33ed499e72
|
|
@ -1,16 +1,15 @@
|
|||
.DS_Store
|
||||
node_modules/
|
||||
/dist
|
||||
/gyhl
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
*.log
|
||||
|
||||
# Editor directories and files
|
||||
.idea
|
||||
.vscode
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
.DS_Store
|
||||
node_modules/
|
||||
/dist/
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
*.log
|
||||
|
||||
# Editor directories and files
|
||||
.idea
|
||||
.vscode
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
|
|
|
|||
13
Dockerfile
|
|
@ -1,13 +0,0 @@
|
|||
# Build stage
|
||||
FROM node:16 as build-stage
|
||||
WORKDIR /app
|
||||
COPY package*.json ./
|
||||
RUN npm install
|
||||
COPY . .
|
||||
RUN npm run build
|
||||
|
||||
# Production stage
|
||||
FROM nginx:stable-alpine as production-stage
|
||||
COPY --from=build-stage /app/dist /usr/share/nginx/html
|
||||
EXPOSE 81
|
||||
CMD ["nginx", "-g", "daemon off;"]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
pipeline {
|
||||
agent any
|
||||
|
||||
stages {
|
||||
stage('Build') {
|
||||
steps {
|
||||
echo 'Building the Vue project...'
|
||||
sh 'npm install'
|
||||
sh 'npm run build'
|
||||
}
|
||||
}
|
||||
stage('Test') {
|
||||
steps {
|
||||
echo 'Running tests...'
|
||||
sh 'npm run test'
|
||||
}
|
||||
}
|
||||
stage('Deploy') {
|
||||
steps {
|
||||
echo 'Deploying the project...'
|
||||
sh 'scp -P 10222 -r gyhl/* root@36.139.25.238:/opt/data/standard/nginx/www'
|
||||
// Optional: Restart Nginx if needed
|
||||
// sh 'ssh -p 10222 root@36.139.25.238 "systemctl restart nginx"'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
always {
|
||||
echo 'Pipeline completed.'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1 @@
|
|||
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./static/favicon.ico><link rel=stylesheet href=//at.alicdn.com/t/c/font_2149865_4m66szwzwl8.css><meta name=renderer content=webkit><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><title>麦得豪新材料有限公司</title><link href=/static/css/app.e9a8518727324fd076948b5c6bad9ecf.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.21d487c377c8ffe8aba1.js></script><script type=text/javascript src=/static/js/vendor.79c835b96b69ea047c5b.js></script><script type=text/javascript src=/static/js/app.5f486cd1330fd1812b6e.js></script></body></html>
|
||||
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 66 KiB |
|
After Width: | Height: | Size: 66 KiB |
|
After Width: | Height: | Size: 67 KiB |
|
After Width: | Height: | Size: 370 KiB |
|
After Width: | Height: | Size: 1.5 MiB |
|
After Width: | Height: | Size: 1.3 MiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 48 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 50 KiB |
|
After Width: | Height: | Size: 49 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 139 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 150 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 16 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 397 KiB |
|
After Width: | Height: | Size: 80 KiB |
|
After Width: | Height: | Size: 43 KiB |
|
|
@ -0,0 +1 @@
|
|||
webpackJsonp([10],{"4Yyb":function(e,a){},V8uG:function(e,a){},XYs2:function(e,a,t){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var r=t("woOf"),s=t.n(r),i=t("Dd8w"),o=t.n(i),m=t("NYxO"),n=t("bzuE"),l={components:{},data:function(){return{formData:{code:"",name:"",startTime:"",endTime:"",manHour:"",remark:""},loading:!1,options:[],selectDeptId:[],config:n.a,btnDisabled:!0,isDisabled:!1,rulesForm:{code:[{required:!0,message:"请填写班制编码",trigger:"blur"}],name:[{required:!0,message:"请填写班制名称",trigger:"blur"}],startTime:[{required:!0,message:"请填写开始时间",trigger:"blur"}],endTime:[{required:!0,message:"请填写结束时间",trigger:"blur"}],manHour:[{required:!0,message:"请填写工作时长",trigger:"blur"}]},tableData:[]}},mounted:function(){this.$route.query.id&&(this.formData.id=this.$route.query.id,this.getDetail())},watch:{},methods:o()({},Object(m.d)({removeTagNav:"tagNav/removeTagNav"}),{getDetail:function(){var e=this;this.loading=!0,this.$nextTick().then(function(){e.$api.shiftAPI.shiftDetail({shiftId:e.formData.id}).then(function(a){e.loading=!1,0===a.code&&s()(e.formData,a.data)})})},gotoIndex:function(){this.removeTagNav({path:this.$route.path,title:this.$route.meta.name}),this.$router.push({path:"/basic/shift",query:{t:Date.now()}}),this.formData={}},save:function(e){var a=this;this.$refs[e].validate(function(e){if(e){if(a.isDisabled)return;if(0==a.formData.manHour)return void a.$message({message:"工作时长不能为0",type:"error"});a.isDisabled=!0,a.$api.shiftAPI.addAndChangeShift(a.formData).then(function(e){a.isDisabled=!1,0===e.code?(a.$message({message:e.msg,type:"success"}),a.gotoIndex()):a.$message({message:e.msg,type:"error"})})}})}})},f={render:function(){var e=this,a=e.$createElement,t=e._self._c||a;return t("div",{staticClass:"sys-box"},[t("div",{staticClass:"sys-operate"},[t("el-button",{attrs:{type:"primary"},on:{click:e.gotoIndex}},[e._v(e._s(e.config.cancelText))]),e._v(" "),t("el-button",{directives:[{name:"has",rawName:"v-has",value:"basic:shift:save",expression:"'basic:shift:save'"}],attrs:{type:"primary",disabled:e.isDisabled},on:{click:function(a){return e.save("form")}}},[e._v("保存")])],1),e._v(" "),t("div",{staticClass:"sys-form"},[t("el-form",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],ref:"form",attrs:{"lable-width":"120px","label-width":"120px",model:e.formData,rules:e.rulesForm}},[t("div",{staticClass:"flex process-box"},[t("el-form-item",{staticClass:"form-inline",attrs:{prop:"code",label:"班制代码"}},[t("el-input",{attrs:{placeholder:"请输入班制代码"},model:{value:e.formData.code,callback:function(a){e.$set(e.formData,"code",a)},expression:"formData.code"}})],1),e._v(" "),t("el-form-item",{staticClass:"form-inline",attrs:{prop:"name",label:"班制名称"}},[t("el-input",{attrs:{placeholder:"请输入班制名称"},model:{value:e.formData.name,callback:function(a){e.$set(e.formData,"name",a)},expression:"formData.name"}})],1),e._v(" "),t("el-form-item"),e._v(" "),t("el-form-item",{staticClass:"form-inline",attrs:{label:"开始时间",prop:"startTime"}},[t("el-time-picker",{attrs:{format:"HH:mm:ss","value-format":"HH:mm:ss",placeholder:"选择时间"},model:{value:e.formData.startTime,callback:function(a){e.$set(e.formData,"startTime",a)},expression:"formData.startTime"}})],1),e._v(" "),t("el-form-item",{staticClass:"form-inline",attrs:{label:"结束时间",prop:"endTime"}},[t("el-time-picker",{attrs:{format:"HH:mm:ss","value-format":"HH:mm:ss",placeholder:"选择时间"},model:{value:e.formData.endTime,callback:function(a){e.$set(e.formData,"endTime",a)},expression:"formData.endTime"}})],1),e._v(" "),t("el-form-item",{staticClass:"form-inline",attrs:{prop:"manHour",label:"工作时长"}},[t("el-input-number",{attrs:{min:0,label:"描述文字",size:"small"},model:{value:e.formData.manHour,callback:function(a){e.$set(e.formData,"manHour",a)},expression:"formData.manHour"}}),e._v(" (小时)\n ")],1)],1),e._v(" "),t("el-form-item",{attrs:{label:"备注","label-width":"100px"}},[t("el-input",{staticStyle:{width:"100%"},attrs:{type:"textarea",autosize:{minRows:4},clearable:""},model:{value:e.formData.remark,callback:function(a){e.$set(e.formData,"remark",a)},expression:"formData.remark"}})],1)],1)],1)])},staticRenderFns:[]};var c=t("VU/8")(l,f,!1,function(e){t("V8uG"),t("4Yyb")},"data-v-6d28eeea",null);a.default=c.exports}});
|
||||
|
|
@ -0,0 +1 @@
|
|||
webpackJsonp([11],{WybU:function(e,t){},awFY:function(e,t){},uF92:function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var l=a("Dd8w"),n=a.n(l),o=a("NYxO"),r=a("bzuE"),i={data:function(){return{id:"",planNo:"",formDetail:{},formData:{},tableData:[],dialogVisible:!1,loading:!1,config:r.a}},mounted:function(){this.$route.query.id&&(this.id=this.$route.query.id,this.planNo=this.$route.query.planNo),this.getDetail()},methods:n()({},Object(o.d)({removeTagNav:"tagNav/removeTagNav"}),{getDetail:function(){var e=this;this.loading=!0,this.$api.planManagementAPI.workingProcedurePlanfollowPlan({id:this.id}).then(function(t){0===t.code&&(e.tableData=t.data.datas?t.data.datas:[]),e.loading=!1}).catch(function(t){e.loading=!1})},back:function(){this.removeTagNav({path:this.$route.path,title:this.$route.meta.name}),this.$router.push({path:"/planManagement/working_procedure",query:{t:Date.now()}})}})},c={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"sys-box repair-box"},[a("div",{staticClass:"sys-operate"},[a("el-button",{attrs:{type:"primary"},on:{click:function(t){return e.back()}}},[e._v(e._s(e.config.cancelText))])],1),e._v(" "),a("div",{staticClass:"sys-form"},[a("el-form",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],attrs:{"label-width":"120px",model:e.formDetail}},[a("el-divider",{attrs:{"content-position":"left"}},[e._v("工序计划号: "),a("span",[e._v(e._s(e.planNo))])]),e._v(" "),a("el-divider",{attrs:{"content-position":"left"}},[e._v("关联的派工单列表 ")]),e._v(" "),a("div",{staticClass:"sys-table"},[a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],ref:"tb",attrs:{border:"",fit:"",data:e.tableData,"header-cell-style":{fontWeight:"normal",textAlign:"center",backgroundColor:"#eceff4",color:"#222"}}},[a("el-table-column",{attrs:{align:"center",prop:"code",label:"派工单号",width:"160"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"processName",label:"工序名称"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"deptName",label:"生产部门"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"operatorName",label:"操作工"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"deviceName",label:"设备"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"startTime",label:"计划开工日期"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"endTime",label:"计划完工日期"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"actualStartTime",label:"实际开工日期"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"actualEndTime",label:"实际完工日期"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"planCount",label:"计划生产数量"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"completionCount",label:"完工数量"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"conformityCount",label:"合格数量"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"unConformityCount",label:"不合格数量"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"scrapCount",label:"报废数量"}}),e._v(" "),a("el-table-column",{attrs:{align:"center",prop:"reworkCount",label:"返工数量"}})],1)],1)],1)],1)])},staticRenderFns:[]};var s=a("VU/8")(i,c,!1,function(e){a("awFY"),a("WybU")},"data-v-33aa034c",null);t.default=s.exports}});
|
||||