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 16:11:15 +08:00
parent 9dbbf9c198
commit ca41d8eaff
6 changed files with 41 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sf-ui/src/components/FileUpload/index.vue
View File

@ -2,6 +2,7 @@
<div class="upload-file">
<el-upload
ref="fileUpload"
:accept="accept"
:action="baseUrl+uploadFileUrl"
:before-upload="handleBeforeUpload"
:file-list="fileList"
@ -70,6 +71,10 @@ export default {
uploadFileUrl: {
type: String,
default: () => '/system/oss/zip/upload'
},
accept: {
type: Array,
default: () => []
}
},
data() {

58
sf-ui/src/views/FDS/installationList/index.vue
View File

@ -97,31 +97,24 @@
>批量删除
</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- v-hasPermi="['deploy:INFO:export']"-->
<!-- icon="el-icon-download"-->
<!-- plain-->
<!-- size="mini"-->
<!-- type="warning"-->
<!-- @click="handleExport"-->
<!-- >导出-->
<!-- </el-button>-->
<!-- </el-col>-->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="INFOList" @selection-change="handleSelectionChange">
<el-table-column align="center" type="selection" width="55"/>
<!-- <el-table-column align="center" label="主键" prop="id"/>-->
<!-- <el-table-column align="center" label="上传类型" prop="uploadingType">-->
<!-- <template slot-scope="scope">-->
<!-- <dict-tag :options="dict.type.sys_apk_uploading_type" :value="scope.row.uploadingType"/>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column align="center" label="安装包名称" prop="sysApkName"/>
<el-table-column align="center" label="版本号" prop="version"/>
<el-table-column align="center" label="安装包" prop="sysApk"/>
<el-table-column align="center" label="安装包" prop="sysApk">
<template slot="header" slot-scope="scope">
<span>安装包</span>
<el-tooltip placement="top">
<div slot="content">复制当前的安装包地址</div>
<i class="el-icon-warning-outline" size="20"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<el-button icon="el-icon-copy" type="primary" @click="copyIt(scope.row.sysApk)">复制</el-button>
</template>
</el-table-column>
<el-table-column align="center" label="安装包大小" prop="sysApkSize"/>
<el-table-column align="center" label="安装包类型" prop="sysType">
<template slot-scope="scope">
@ -129,7 +122,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="创建人" prop="created"/>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
<template slot-scope="scope">
<el-button
@ -179,16 +172,7 @@
<!-- 添加或修改安装包管理（新）对话框 -->
<el-dialog :title="title" :visible.sync="open" append-to-body width="700px">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<!-- <el-form-item label="上传类型" prop="uploadingType">-->
<!-- <el-select v-model="form.uploadingType" placeholder="请选择上传类型">-->
<!-- <el-option-->
<!-- v-for="dict in dict.type.sys_apk_uploading_type"-->
<!-- :key="dict.value"-->
<!-- :label="dict.label"-->
<!-- :value="dict.value"-->
<!-- ></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="安装包名称" prop="sysApkName">
<el-input v-model="form.sysApkName" placeholder="请输入安装包名称"/>
</el-form-item>
@ -196,12 +180,12 @@
<el-input v-model="form.version" placeholder="请输入版本号"/>
</el-form-item>
<el-form-item label="安装包" prop="sysApk">
<file-upload v-model="form.sysApk" :fileSize="50" :fileType="['apk','hap','iap','zip']" :limit="1"
<file-upload v-model="form.sysApk" :accept="['.zip','.apk','.hap','.iap']" :fileSize="50"
:fileType="['apk','hap','iap','zip']"
:limit="1"
uploadFileUrl="/system/oss/upload"
@getSize="getSize"
/>
<!-- <file-upload v-model="form.sysApk"/>-->
</el-form-item>
<el-form-item label="安装包大小" prop="sysApkSize">
<el-input v-model="form.sysApkSize" placeholder="请输入安装包大小" readonly/>
@ -260,6 +244,7 @@
<script>
import { addINFO, delINFO, getINFO, listINFO, updateINFO } from '@/api/FDS/installList'
import Cookies from 'js-cookie'
export default {
name: 'INFO',
@ -274,7 +259,7 @@ export default {
sysApk: null,
sysApkSize: undefined,
sysType: '',
appCode: '000000'
appCode: Cookies.get('Admin-Application-Id')
},
// 遮罩层
@ -354,7 +339,7 @@ export default {
sysApk: null,
sysApkSize: undefined,
sysType: '',
appCode: '000000'
appCode: Cookies.get('Admin-Application-Id')
}
this.resetForm('form')
},
@ -409,8 +394,7 @@ export default {
if (valid) {
if (this.form.id != null) {
let data = Object.assign({}, this.form)
console.log(data)
data.appCode = '000000'
data.appCode = Cookies.get('Admin-Application-Id'),
delete data.explain
updateINFO(data).then(response => {
this.$modal.msgSuccess('修改成功')

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

@ -45,6 +45,7 @@
<script>
import { listINFO } from '@/api/FDS/installList'
import Cookies from 'js-cookie'
export default {
name: 'AddPack',
@ -72,7 +73,7 @@ export default {
pageNum: 1,
pageSize: 10,
sysApkName: null,
appCode: '000000'
appCode: Cookies.get('Admin-Application-Id')
}
}
},

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

@ -158,9 +158,9 @@
</el-form-item>
<el-form-item label="安装包" prop="moduleUrl">
<file-upload v-model="form.moduleUrl" :fileSize="20" :fileType="['zip']"
<file-upload v-model="form.moduleUrl" :accept="['.zip']" :fileSize="20"
:fileType="['zip']"
:limit="1"
@getSize="getSize"
/>
</el-form-item>
@ -268,6 +268,7 @@
<script>
import { addModule, delModule, getModule, listModule, updateModule } from '@/api/deployment/module'
import Cookies from 'js-cookie'
export default {
name: 'Module',
@ -369,7 +370,7 @@ export default {
modified: null,
createTime: null,
updateTime: null,
appCode: '000000'
appCode: Cookies.get('Admin-Application-Id')
}
this.resetForm('form')
},
@ -424,7 +425,7 @@ export default {
if (valid) {
if (this.form.id != null) {
let data = Object.assign({}, this.form)
data.appCode = '000000'
data.appCode = Cookies.get('Admin-Application-Id'),
delete data.explain
updateModule(data).then(response => {
this.$modal.msgSuccess('修改成功')

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

@ -98,27 +98,26 @@
<el-table-column :show-overflow-tooltip="true" align="center" label="APP名称" prop="appName"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="系统" prop="systemType"/>
<el-table-column align="center" label="公开版" prop="publicVersion" width="90">
<el-table-column align="center" label="公开版" prop="publicVersion">
<template slot-scope="scope">
<el-switch v-model="scope.row.publicVersion" :active-value="1" :inactive-value="0" class="drawer-switch"
disabled
/>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" label="强制更新" prop="forceUpdate" width="90">
<el-table-column :show-overflow-tooltip="true" align="center" label="强制更新" prop="forceUpdate">
<template slot-scope="scope">
<el-switch v-model="scope.row.forceUpdate" :active-value="1" :inactive-value="0" class="drawer-switch"
disabled
/>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" label="上传时间" prop="updateTime" width="120">
<el-table-column :show-overflow-tooltip="true" align="center" label="上传时间" prop="updateTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime) }}</span>
</template>
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" label="发布环境" prop="publishEnvironment"
width="180"
>
<template slot-scope="scope">
<div v-for="item in environmentList" :key="item.id">
@ -129,7 +128,6 @@
</el-table-column>
<el-table-column :show-overflow-tooltip="true" align="center" label="发布状态" prop="publishEnvironment"
width="180"
>
<template slot-scope="scope">
<dict-tag :options="dict.type.release_status" :value="scope.row.status"/>
@ -138,7 +136,7 @@
<el-table-column :show-overflow-tooltip="true" align="center" label="安装包编号" prop="apkId"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="版本说明" prop="versionDesc"/>
<el-table-column :show-overflow-tooltip="true" align="center" label="公开时间" prop="createTime" width="180">
<el-table-column :show-overflow-tooltip="true" align="center" label="公开时间" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
@ -464,7 +462,7 @@ export default {
pageNum: 1,
pageSize: 10,
sysApkName: null,
appCode: '000000'
appCode: Cookies.get('Admin-Application-Id')
},
// 表单校验
rules: {