chenzihao/sac
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修改因为APPCode的问题

Browse Source
This commit is contained in:
张洋川 2024-04-24 12:37:07 +08:00
parent 43deb6286c
commit 5d24f5d25d
4 changed files with 111 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sf-ui/src/views/FDS/publishList/components/addPack.vue
View File

@ -10,11 +10,11 @@
>
<el-form-item label="安装包名称" prop="installpackName">
<el-input
v-model="queryParams.sysApkName"
clearable
placeholder="请输入安装包名称"
style="width: 240px"
@keyup.enter.native="handleQuery"
v-model="queryParams.sysApkName"
clearable
placeholder="请输入安装包名称"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
@ -35,7 +35,7 @@
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="50">
<template slot-scope="scope">
<el-button circle icon="el-icon-plus" size="20" type="primary"
@click="addPack(scope.row.appId,scope.row.version,scope.row.sysType)"
@click="addPack(scope.row)"
></el-button>
</template>
</el-table-column>
@ -49,6 +49,12 @@ import { listINFO } from '@/api/FDS/installList'
export default {
name: 'AddPack',
dicts: ['sys_yes_no'],
props: {
systemType: {
type: String,
default: ''
}
},
data() {
return {
// 遮罩层
@ -66,8 +72,7 @@ export default {
pageNum: 1,
pageSize: 10,
sysApkName: null,
appCode: '000000',
sysType: ''
appCode: '000000'
}
}
},
@ -79,7 +84,12 @@ export default {
/** 查询参数列表 */
getList() {
this.loading = true
listINFO(this.queryParams).then(response => {
console.log(this.systemType)
listINFO(
{
...this.queryParams,
sysType: this.systemType
}).then(response => {
this.moduleList = response.rows
this.total = response.total
this.loading = false
@ -99,11 +109,13 @@ export default {
},
/** 新增当前包的按钮 */
addPack(id, version, sysType) {
addPack(row) {
this.$emit('addPack', {
apkId: id,
version: version,
sysType: sysType
apkId: row.id,
version: row.version,
sysType: row.sysType,
sysApkName: row.sysApkName,
sysApk: row.sysApk
})
},

2
sf-ui/src/views/deployment/module/index.vue
View File

@ -164,7 +164,7 @@
@getSize="getSize"
/>
</el-form-item>
<el-form-item label="安装包大小" prop="moduleSize">system/oss/upload
<el-form-item label="安装包大小" prop="moduleSize">
<el-input v-model="form.moduleSize" placeholder="请输入安装包大小" readonly/>
</el-form-item>
<el-form-item label="系统类型" prop="sysType">

40
sf-ui/src/views/deployment/publish/component/detail.vue
View File

@ -9,18 +9,20 @@
>
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="Appid">
<el-input v-model="form.applyId" placeholder="请输入APPid" readonly/>
{{ form.applyId }}
<!-- <el-input v-model="form.applyId" placeholder="请输入APPid" readonly/>-->
</el-form-item>
<el-form-item label="APP名称">
<el-input v-model="form.appName" placeholder="请输入APP名称" readonly/>
{{ form.appName }}
<!-- <el-input v-model="form.appName" placeholder="请输入APP名称" readonly/>-->
</el-form-item>
<el-form-item label="选择系统" prop="grayFlag">
<el-radio-group v-model="form.systemType">
<el-radio-button label="android">android</el-radio-button>
<el-radio-button label="IOS">IOS</el-radio-button>
<el-radio-button label="HarmonyOS">HarmonyOS</el-radio-button>
</el-radio-group>
{{ form.systemType }}
<!-- <el-radio-group v-model="form.systemType">-->
<!-- <el-radio-button label="android">android</el-radio-button>-->
<!-- <el-radio-button label="IOS">IOS</el-radio-button>-->
<!-- <el-radio-button label="HarmonyOS">HarmonyOS</el-radio-button>-->
<!-- </el-radio-group>-->
<!-- <div class="tag-group">-->
<!-- <el-tag :type="form.systemType=='android'?'':'info'" @click="changeSys('android')">安卓</el-tag>-->
@ -28,10 +30,8 @@
<!-- <el-tag :type="form.systemType=='HarmonyOS'?'':'info'" @click="changeSys('HarmonyOS')">鸿蒙</el-tag>-->
<!-- </div>-->
</el-form-item>
<el-form-item v-if="form.systemType!='IOS'" label="安装包" prop="apkId">
{{ form.apkId }}
<el-form-item v-if="form.systemType!='IOS'" label="安装包" prop="sysApkName">
{{ form.sysApkName }}
<!-- <el-input v-model="form.apkId" class="input-with-select" placeholder="请选择包" readonly>-->
<!-- </el-input>-->
</el-form-item>
@ -148,6 +148,7 @@
import { getPublish } from '@/api/deployment/publish'
import { listEnvironment } from '@/api/deployment/environment'
import { getINFO } from '@/api/FDS/installList'
export default {
name: 'AddPack',
@ -168,7 +169,9 @@ export default {
title: '添加安装包',
loading: true,
configName: undefined,
form: {},
form: {
sysApkName: null
},
moduleList: [],
// 显示搜索条件
showSearch: true,
@ -210,10 +213,17 @@ export default {
getPublish(id).then(response => {
this.form = response.data
this.open = true
this.title = '详情'
this.title = '发布详情'
this.getPackList(this.form.apkId)
})
},
/** 查询参数列表 */
getPackList(id) {
getINFO(id).then(response => {
this.form.sysApkName = response.data.sysApkName
console.log(this.form)
})
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1

80
sf-ui/src/views/deployment/publish/index.vue
View File

@ -199,7 +199,7 @@
icon="el-icon-top"
size="mini"
type="text"
@click="handlePublish(scope.row)"
@click="handlePublish(scope.row.id)"
>发布
</el-button>
@ -260,19 +260,32 @@
<el-input v-model="form.appName" placeholder="请输入APP名称" readonly/>
</el-form-item>
<el-form-item label="选择系统" prop="grayFlag">
<el-radio-group v-model="form.systemType">
<el-radio-button label="android">android</el-radio-button>
<el-radio-button label="IOS">IOS</el-radio-button>
<el-radio-button label="HarmonyOS">HarmonyOS</el-radio-button>
</el-radio-group>
<el-select v-model="form.systemType" placeholder="请选择系统类型" @change="changeSys">
<el-option
v-for="dict in dict.type.sys_apk_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
<!-- <el-radio-group v-model="form.systemType" @change="changeSys">-->
<!-- <el-radio-button label="android">android</el-radio-button>-->
<!-- <el-radio-button label="IOS">IOS</el-radio-button>-->
<!-- <el-radio-button label="HarmonyOS">HarmonyOS</el-radio-button>-->
<!-- </el-radio-group>-->
</el-form-item>
<el-form-item v-if="form.systemType!='IOS'" label="安装包" prop="apkId">
<el-input v-model="form.apkId" class="input-with-select" placeholder="请选择包" readonly>
<el-form-item v-if="form.systemType!='IOS'" label="安装包" prop="sysApkName">
<!-- <el-input v-model="form.apkId" class="input-with-select" placeholder="请选择包" readonly>-->
<!-- <el-button slot="append" icon="el-icon-search" @click="handlePackOpen"></el-button>-->
<!-- </el-input>-->
<el-input v-model="form.sysApkName" class="input-with-select" placeholder="请选择包" readonly>
<el-button slot="append" icon="el-icon-search" @click="handlePackOpen"></el-button>
</el-input>
<!-- <el-input v-model="form.apkId" placeholder="请输入安装包编号"/>-->
</el-form-item>
<el-form-item v-if="form.systemType=='IOS'" label="app store地址" prop="appStoreAddress">
<el-form-item v-if="form.systemType=='ios'" label="app store地址" prop="appStoreAddress">
<el-input v-model="form.appStoreAddress" placeholder="请输入app store地址"/>
</el-form-item>
<el-form-item label="版本号" prop="version">
@ -369,14 +382,13 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="pubLishForm">发 布</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<AddPack v-if="packOpen" @addPack="addPack" @close="closeAddPack"></AddPack>
<AddPack v-if="packOpen" :systemType="form.systemType" @addPack="addPack" @close="closeAddPack"></AddPack>
<DetailModal v-if="openDetail" :detailId="detailId" :openDetail="openDetail" @close="closeDetailModal"
></DetailModal>
</div>
@ -397,10 +409,11 @@ import AddPack from '@/views/FDS/publishList/components/addPack.vue'
import DetailModal from './component/detail.vue'
import { listEnvironment } from '@/api/deployment/environment'
import { getApplicationName } from '@/utils/application'
import { getINFO } from '@/api/FDS/installList'
export default {
name: 'Publish',
dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status'],
dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status', 'sys_apk_type'],
components: {
AddPack,
DetailModal
@ -444,6 +457,12 @@ export default {
},
// 表单参数
form: {},
queryParamsPack: {
pageNum: 1,
pageSize: 10,
sysApkName: null,
appCode: '000000'
},
// 表单校验
rules: {
appName: [
@ -568,8 +587,18 @@ export default {
this.form = response.data
this.open = true
this.title = '修改发布列表'
this.getPackList(this.form.apkId)
})
},
/** 查询参数列表 */
getPackList(id) {
this.loading = true
getINFO(id).then(response => {
this.form.sysApkName = response.data.sysApkName
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
@ -578,6 +607,7 @@ export default {
let data = Object.assign({}, this.form)
delete data.explain
updatePublish(data).then(response => {
console.log(data)
this.$modal.msgSuccess('修改成功')
this.loading = false
this.open = false
@ -604,18 +634,18 @@ export default {
let data = Object.assign({}, this.form)
delete data.explain
updatePublish(data).then(response => {
this.$modal.msgSuccess('修改成功')
this.handlePublish(data.id)
this.loading = false
this.open = false
this.handlePublish(data.id)
// this.getList()
})
} else {
addPublish(this.form).then((res) => {
this.$modal.msgSuccess('新增成功')
this.loading = false
this.open = false
this.handlePublish(res.id)
// this.handlePublish(res.id)
// this.getList()
})
}
@ -646,9 +676,12 @@ export default {
},
addPack(e) {
this.form.apkId = e.apkId
this.form.version = e.version
this.form.systemType = e.sysType
this.form.sysApkName = e.sysApkName
this.form.sysApk = e.sysApk
this.packOpen = false
},
@ -667,8 +700,13 @@ export default {
},
// 选择系统做一些逻辑判断
changeSys(sysType) {
this.form.systemType = sysType
changeSys() {
// this.form.systemType = sysType
this.form.apkId = null
this.form.version = null
this.form.sysApkName = null
this.form.appStoreAddress = null
console.log(this.form, 99999999)
},
/**下载安装包*/
handleDownload() {
@ -677,12 +715,14 @@ export default {
/**下架*/
handleDown(row) {
soldPublish(row.id).then(response => {
this.$modal.msgSuccess('下架成功')
this.getList()
})
},
/**发布*/
handlePublish(row) {
publish(row.id).then(response => {
handlePublish(id) {
publish(id).then(response => {
this.$modal.msgSuccess('发布成功')
this.getList()
})
},