Commit f0ef7b3f authored by 黄贤军's avatar 黄贤军

2.0

parent 38982c2f
Pipeline #22382 passed with stage
in 1 minute and 1 second
......@@ -5,8 +5,8 @@ var erpAPI = 'http://47.100.21.215:40402'
var authAPI = 'http://47.110.145.204:8095/'
// var erPiUrl = 'http://47.100.21.215:40402'
var mesAPI = 'http://47.110.145.204:8109/' //
mesAPI = 'http://192.168.4.116:5000/'
mesAPI = 'http://192.168.4.120:23000/'
mesAPI = 'http://192.168.4.120:5000/'
// mesAPI = 'http://192.168.4.120:23000/'
var mockAPI = 'http://47.110.145.204:8082/mock/239'
module.exports = {
build: {
......
......@@ -48,6 +48,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="set_project('ruleForm')">保存</el-button>
<el-button style="margin-left: 40px" type="primary" @click="delete_project()">删除项目</el-button>
<el-button type="primary" @click="install_runner()">安装runner</el-button>
<el-button type="primary" @click="application()">应用修改</el-button>
<el-button type="primary" @click="download_app()">下载app</el-button>
......@@ -56,6 +57,28 @@
<el-progress type="circle" v-show="percentage!==0" :percentage="percentage"></el-progress>
</el-form-item>
</el-form>
<!-- 查询app列表 -->
<el-dialog title="项目列表" :visible.sync="delete_project_app" width="80%">
<el-table :data="delete_project_app_list" max-height="600"
style="width: 100%; overflowY: hidden" @selection-change="handleSelectionChange_delete_project_app">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column property="project_no" label="项目代码" ></el-table-column>
<el-table-column property="db_ip" label="数据库IP"></el-table-column>
<el-table-column property="db_port" label="数据库端口" ></el-table-column>
<el-table-column property="db_user" label="数据库用户名" ></el-table-column>
<el-table-column property="host_ip" label="本机IP" ></el-table-column>
<el-table-column property="mes_db_name" label="MES数据库名" ></el-table-column>
<!-- <el-table-column property="api_port2" label="后端端口号2" ></el-table-column> -->
</el-table>
<div slot="footer">
<el-button @click="delete_project_app = false" size="mini">取消</el-button>
<el-button type="primary" @click="delete_projec_data()" size="mini">确定</el-button>
</div>
</el-dialog>
</el-tab-pane>
<!-- <el-tab-pane label="端口开发" name="fourth">端口开发</el-tab-pane> -->
<el-tab-pane label="本机系统升级" name="second">
......@@ -172,11 +195,34 @@
</el-form-item>
<el-form-item>
<el-button type="primary" @click="set_project('service_ruleForm')">保存</el-button>
<el-button style="margin-left: 40px" type="primary" @click="delete_project_work()">删除车间</el-button>
</el-form-item>
<el-form-item style="float:right;margin-top:-300px;margin-right:47%;">
<el-progress type="circle" v-show="percentage!==0" :percentage="percentage"></el-progress>
</el-form-item>
</el-form>
<!-- 查询app列表 -->
<el-dialog title="项目列表" :visible.sync="delete_project_app_work" width="80%">
<el-table :data="delete_project_app_list_work" max-height="600"
style="width: 100%; overflowY: hidden" @selection-change="handleSelectionChange_delete_project_app_work">
<el-table-column
type="selection"
width="55">
</el-table-column>
<el-table-column property="project_no" label="项目代码" ></el-table-column>
<el-table-column property="work_shop_no" label="项目代码" ></el-table-column>
<el-table-column property="db_ip" label="数据库IP"></el-table-column>
<el-table-column property="db_port" label="数据库端口" ></el-table-column>
<el-table-column property="db_user" label="数据库用户名" ></el-table-column>
<el-table-column property="host_ip" label="本机IP" ></el-table-column>
<el-table-column property="mes_db_name" label="MES数据库名" ></el-table-column>
<!-- <el-table-column property="api_port2" label="后端端口号2" ></el-table-column> -->
</el-table>
<div slot="footer">
<el-button @click="delete_project_app_work = false" size="mini">取消</el-button>
<el-button type="primary" @click="delete_projec_data_work()" size="mini">确定</el-button>
</div>
</el-dialog>
</el-tab-pane>
<el-tab-pane label="客户推送升级" name="third">
<el-form :model="remote_server" :rules="rules" ref="remote_server" label-width="130px" class="demo-ruleForm">
......@@ -329,6 +375,10 @@ export default {
mixins: [utilSingeUc],
data() {
return {
delete_project_app_list_work: [],
delete_project_app_work: false,
delete_project_app_list: [],
delete_project_app: false,
test_list: [],
app_list_server: [],
dialogVisible_install_APP: false,
......@@ -342,6 +392,8 @@ export default {
install_dialogTableVisible: false,
searchParam: {
},
multipleSelection_delete: [],
multipleSelection_delete_work: [],
multipleSelection: [],
multipleSelection_server: [],
multipleSelection_test: [],
......@@ -368,6 +420,69 @@ export default {
}
},
methods: {
delete_projec_data_work() {
const id_list = []
if (!this.multipleSelection_delete_work.length) {
this.$message.error('请选择数据')
return
} else {
this.multipleSelection_delete_work.map(item => {
id_list.push(item.id)
})
}
const data = {
id_list: id_list
}
this.$API.delete(`mesAPI/connection/remote_db_list/`, {}, {}, data).then(res => {
this.$message.success('删除成功')
this.delete_project_app_work = false
this.service_ruleForm = {}
this.get_service_project()
})
},
// 车间删除弹框的弹出
delete_project_work() {
this.delete_project_app_work = true
this.$API.get(`mesAPI/connection/remote_db_list/`).then(res => {
this.delete_project_app_list_work = res.data
})
},
// 车间删除列表的选择
handleSelectionChange_delete_project_app_work(e) {
this.multipleSelection_delete_work = e
},
// 确定删除项目
delete_projec_data() {
const id_list = []
if (!this.multipleSelection_delete.length) {
this.$message.error('请选择数据')
return
} else {
this.multipleSelection_delete.map(item => {
id_list.push(item.id)
})
}
const data = {
id_list: id_list
}
this.$API.delete(`mesAPI/connection/project_info_list/`, {}, {}, data).then(res => {
this.$message.success('删除成功')
this.delete_project_app = false
this.ruleForm = {}
this.get_project()
})
},
// 删除弹框的弹出
delete_project() {
this.delete_project_app = true
this.$API.get(`mesAPI/connection/project_info_list/`).then(res => {
this.delete_project_app_list = res.data
})
},
// 删除列表的选择
handleSelectionChange_delete_project_app(e) {
this.multipleSelection_delete = e
},
handleSelectionChange_test(e) {
this.multipleSelection_test = e
},
......@@ -653,7 +768,9 @@ export default {
} else {
this.$message.error(res.data.message)
}
this.get_project()
if (str !== 'service_ruleForm') {
this.get_project()
}
this.closeFullScreen(this.openFullScreen())
}).catch(() => {
this.closeFullScreen(this.openFullScreen())
......@@ -684,18 +801,21 @@ export default {
return
}
this.$API.get(`mesAPI/connection/work_shop/${this.ruleForm.project_no}/`).then(res => {
if (res.data) {
if (res.data.length) {
this.work_list = res.data
this.service_ruleForm.work_shop_no = this.work_list[0].work_shop_no
this.work_shop_change(this.service_ruleForm.work_shop_no)
} else {
this.work_list = []
}
})
},
// 获取项目链接
get_project() {
this.$API.get(`mesAPI/connection/`).then(res => {
if (!res.data) {
if (!res.data.length) {
this.ruleForm = {}
this.project_list = []
} else {
this.project_list = res.data
this.ruleForm.project_no = res.data[0].project_no
......@@ -730,7 +850,7 @@ export default {
// 获取远程服务器连接
get_remote_server() {
this.$API.get(`mesAPI/connection/remote_server/${this.service_ruleForm.project_no}/${this.service_ruleForm.work_shop_no}/`).then(res => {
if (!res.data) {
if (!res.data.length) {
this.remote_server = {}
this.remote_server.project_no = this.service_ruleForm.project_no
this.remote_server.work_shop_no = this.service_ruleForm.work_shop_no
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment