|
@@ -24,21 +24,20 @@
|
|
|
<!-- 升级 -->
|
|
|
<el-dialog title="App升级" :visible.sync="dialogUpload" width="70%" append-to-body center>
|
|
|
<avue-crud :option="option1"
|
|
|
- :table-loading="loading"
|
|
|
- :data="data"
|
|
|
+ :table-loading="loadingDeail"
|
|
|
+ :data="dataDetail"
|
|
|
ref="crud"
|
|
|
v-model="form"
|
|
|
- :page.sync="page"
|
|
|
+ :page.sync="pageDetail"
|
|
|
:permission="permissionList"
|
|
|
:before-open="beforeOpen"
|
|
|
- @row-del="rowDel"
|
|
|
- @row-update="rowUpdate"
|
|
|
- @row-save="rowSave"
|
|
|
- @selection-change="selectionChange"
|
|
|
- @current-change="currentChange"
|
|
|
+ @row-del="rowDelDetail"
|
|
|
+ @row-update="rowUpdateDetail"
|
|
|
+ @row-save="rowSaveDetail"
|
|
|
+ @current-change="currentChangeDetail"
|
|
|
@size-change="sizeChange"
|
|
|
- @refresh-change="refreshChange"
|
|
|
- @on-load="onLoad">
|
|
|
+ @refresh-change="refreshChangeDetail"
|
|
|
+ @on-load="onLoadDetail">
|
|
|
</avue-crud>
|
|
|
</el-dialog>
|
|
|
</basic-container>
|
|
@@ -47,15 +46,18 @@
|
|
|
<script>
|
|
|
import {
|
|
|
getList,
|
|
|
- getDetail,
|
|
|
remove,
|
|
|
update,
|
|
|
add,
|
|
|
- setting,
|
|
|
- datasource,
|
|
|
- packageInfo,
|
|
|
- packageSetting
|
|
|
-} from "@/api/system/tenant";
|
|
|
+ getDetailList,
|
|
|
+ updateDetail,
|
|
|
+ addDetail,
|
|
|
+ removeDetail
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+} from "@/api/system/app";
|
|
|
import {getDetail as packageDetail} from "@/api/system/tenantpackage";
|
|
|
import {mapGetters} from "vuex";
|
|
|
import {getMenuTree} from "@/api/system/menu";
|
|
@@ -77,6 +79,11 @@ export default {
|
|
|
currentPage: 1,
|
|
|
total: 0
|
|
|
},
|
|
|
+ pageDetail:{
|
|
|
+ pageSize: 10,
|
|
|
+ currentPage: 1,
|
|
|
+ total: 0
|
|
|
+ },
|
|
|
option: {
|
|
|
height: 'auto',
|
|
|
calcHeight: 30,
|
|
@@ -92,7 +99,7 @@ export default {
|
|
|
column: [
|
|
|
{
|
|
|
label: "应用平台",
|
|
|
- prop: "tenantId",
|
|
|
+ prop: "platform",
|
|
|
span: 24,
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -102,7 +109,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "应用名称",
|
|
|
- prop: "tenantName",
|
|
|
+ prop: "name",
|
|
|
span: 24,
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -112,7 +119,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "当前版本",
|
|
|
- prop: "linkman",
|
|
|
+ prop: "currentVersion",
|
|
|
span: 24,
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -122,15 +129,29 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "应用说明",
|
|
|
- prop: "address",
|
|
|
+ prop: "appExplain",
|
|
|
span: 24,
|
|
|
minRows: 2,
|
|
|
type: "textarea",
|
|
|
- hide: true,
|
|
|
+ // hide: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "更新时间",
|
|
|
+ prop: "updateTime",
|
|
|
+ span: 24,
|
|
|
+ type: "time",
|
|
|
+ display:false ,
|
|
|
+ rules: [{
|
|
|
+ required: true,
|
|
|
+ message: "请输入更新时间",
|
|
|
+ trigger: "blur"
|
|
|
+ }]
|
|
|
},
|
|
|
]
|
|
|
},
|
|
|
data: [],
|
|
|
+ dataDetail:[],
|
|
|
+ loadingDeail:false,
|
|
|
settingForm: {},
|
|
|
dialogUpload: false,
|
|
|
option1: {
|
|
@@ -148,7 +169,7 @@ export default {
|
|
|
column: [
|
|
|
{
|
|
|
label: "当前版本",
|
|
|
- prop: "tenantId",
|
|
|
+ prop: "versionNumber",
|
|
|
span: 24,
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -158,7 +179,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "软件类型",
|
|
|
- prop: "category",
|
|
|
+ prop: "softwareType",
|
|
|
type: "radio",
|
|
|
span: 24,
|
|
|
dicData: [
|
|
@@ -182,17 +203,17 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "资源类型",
|
|
|
- prop: "category1",
|
|
|
+ prop: "fileType",
|
|
|
type: "radio",
|
|
|
span: 24,
|
|
|
dicData: [
|
|
|
{
|
|
|
- label: "完整安装包",
|
|
|
- value: 1
|
|
|
+ label: "否",
|
|
|
+ value: 0
|
|
|
},
|
|
|
{
|
|
|
- label: "wgt热更新包",
|
|
|
- value: 2
|
|
|
+ label: "是",
|
|
|
+ value: 1
|
|
|
}
|
|
|
],
|
|
|
value: 1,
|
|
@@ -206,7 +227,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "更新内容",
|
|
|
- prop: "address",
|
|
|
+ prop: "updateContent",
|
|
|
span: 24,
|
|
|
minRows: 3,
|
|
|
type: "textarea",
|
|
@@ -219,7 +240,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "文件地址",
|
|
|
- prop: "linkman",
|
|
|
+ prop: "fileUrl",
|
|
|
span: 24,
|
|
|
rules: [{
|
|
|
required: true,
|
|
@@ -229,12 +250,12 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "文件大小",
|
|
|
- prop: "linkman",
|
|
|
+ prop: "fileSize",
|
|
|
span: 24,
|
|
|
},
|
|
|
{
|
|
|
label: "强制更新",
|
|
|
- prop: "category1",
|
|
|
+ prop: "constraintUpdate",
|
|
|
type: "radio",
|
|
|
span: 24,
|
|
|
dicData: [
|
|
@@ -244,7 +265,7 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
label: "否",
|
|
|
- value: 2
|
|
|
+ value: 0
|
|
|
}
|
|
|
],
|
|
|
value: 1,
|
|
@@ -258,6 +279,7 @@ export default {
|
|
|
},
|
|
|
]
|
|
|
},
|
|
|
+ versionId:'',
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
@@ -310,6 +332,21 @@ export default {
|
|
|
loading();
|
|
|
});
|
|
|
},
|
|
|
+
|
|
|
+ rowSaveDetail(row, done, loading) {
|
|
|
+ row.versionId=this.versionId
|
|
|
+ addDetail(row).then(() => {
|
|
|
+ this.onLoadDetail(this.pageDetail);
|
|
|
+ this.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "操作成功!"
|
|
|
+ });
|
|
|
+ done();
|
|
|
+ }, error => {
|
|
|
+ window.console.log(error);
|
|
|
+ loading();
|
|
|
+ });
|
|
|
+ },
|
|
|
rowUpdate(row, index, done, loading) {
|
|
|
update(row).then(() => {
|
|
|
this.onLoad(this.page);
|
|
@@ -323,6 +360,19 @@ export default {
|
|
|
loading();
|
|
|
});
|
|
|
},
|
|
|
+ rowUpdateDetail(row, index, done, loading){
|
|
|
+ updateDetail(row).then(() => {
|
|
|
+ this.onLoadDetail(this.pageDetail);
|
|
|
+ this.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "操作成功!"
|
|
|
+ });
|
|
|
+ done();
|
|
|
+ }, error => {
|
|
|
+ window.console.log(error);
|
|
|
+ loading();
|
|
|
+ });
|
|
|
+ },
|
|
|
rowDel(row) {
|
|
|
this.$confirm("确定将选择数据删除?", {
|
|
|
confirmButtonText: "确定",
|
|
@@ -340,6 +390,23 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
+ rowDelDetail(row) {
|
|
|
+ this.$confirm("确定将选择数据删除?", {
|
|
|
+ confirmButtonText: "确定",
|
|
|
+ cancelButtonText: "取消",
|
|
|
+ type: "warning"
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ return removeDetail(row.id);
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.onLoadDetail(this.page);
|
|
|
+ this.$message({
|
|
|
+ type: "success",
|
|
|
+ message: "操作成功!"
|
|
|
+ });
|
|
|
+ });
|
|
|
+ },
|
|
|
beforeOpen(done, type) {
|
|
|
if (["view"].includes(type)) {
|
|
|
getDetail(this.form.id).then(res => {
|
|
@@ -498,12 +565,18 @@ export default {
|
|
|
currentChange(currentPage) {
|
|
|
this.page.currentPage = currentPage;
|
|
|
},
|
|
|
+ currentChangeDetail(currentPage){
|
|
|
+ this.pageDetail.currentPage = currentPage;
|
|
|
+ },
|
|
|
sizeChange(pageSize) {
|
|
|
this.page.pageSize = pageSize;
|
|
|
},
|
|
|
refreshChange() {
|
|
|
this.onLoad(this.page, this.query);
|
|
|
},
|
|
|
+ refreshChangeDetail(){
|
|
|
+ this.onLoadDetail(this.pageDetail);
|
|
|
+ },
|
|
|
onLoad(page, params = {}) {
|
|
|
this.loading = true;
|
|
|
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
|
|
@@ -516,7 +589,19 @@ export default {
|
|
|
},
|
|
|
handleAdd(row, index) {
|
|
|
this.dialogUpload = true;
|
|
|
+ this.versionId=row.id
|
|
|
+ this.onLoadDetail(this.pageDetail)
|
|
|
},
|
|
|
- }
|
|
|
+ onLoadDetail(page){
|
|
|
+ this.loadingDeail = true;
|
|
|
+ getDetailList(page.currentPage, page.pageSize,this.versionId).then(res => {
|
|
|
+ const data = res.data.data;
|
|
|
+ this.pageDetail.total = data.total;
|
|
|
+ this.dataDetail = data.records;
|
|
|
+ this.loadingDeail = false;
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
+
|
|
|
};
|
|
|
</script>
|