From 31cc16d921fdf8ec0eba13567cf99025b2b68c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=B4=8B=E5=B7=9D?= <604737071@qq.com>
Date: Wed, 24 Apr 2024 10:54:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A0=E5=AF=86=E4=B8=8A=E4=BC=A0=E5=8F=8D=E4=BA=86?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf-ui/src/views/FDS/installationList/add.vue  |   1 -
 .../src/views/FDS/installationList/index.vue  | 493 +++++++++++-------
 .../views/FDS/installationList/index111.vue   | 328 ++++++++++++
 sf-ui/src/views/deployment/module/index.vue   | 134 ++---
 .../deployment/publish/component/detail.vue   |  11 +-
 sf-ui/src/views/deployment/publish/index.vue  |  14 +-
 6 files changed, 728 insertions(+), 253 deletions(-)
 create mode 100644 sf-ui/src/views/FDS/installationList/index111.vue

diff --git a/sf-ui/src/views/FDS/installationList/add.vue b/sf-ui/src/views/FDS/installationList/add.vue
index 3f20339..de16b89 100644
--- a/sf-ui/src/views/FDS/installationList/add.vue
+++ b/sf-ui/src/views/FDS/installationList/add.vue
@@ -39,7 +39,6 @@
               <el-radio-group v-model="formData.sysType" size="medium">
                 <el-radio v-for="(item, index) in  dict.type.sys_apk_type" :key="index" :disabled="item.disabled"
                           :label="item.value"
-                          :uploadFileUrl="item.uploadingType==='OffLineUploading'?'/system/oss/zip/upload':'/system/oss/upload'"
                 >{{ item.label }}
                 </el-radio>
               </el-radio-group>
diff --git a/sf-ui/src/views/FDS/installationList/index.vue b/sf-ui/src/views/FDS/installationList/index.vue
index 2eed7b7..1d03122 100644
--- a/sf-ui/src/views/FDS/installationList/index.vue
+++ b/sf-ui/src/views/FDS/installationList/index.vue
@@ -1,67 +1,58 @@
 <template>
   <div class="app-container">
-    <!--    <el-tabs v-model="activeTabs" type="card" @tab-click="handleClickTabs">-->
-    <!--      <el-tab-pane-->
-    <!--          v-for="item in packTabs"-->
-    <!--          :key="item.name"-->
-    <!--          :label="item.title"-->
-    <!--          :name="item.name"-->
-    <!--      >-->
-    <!--      </el-tab-pane>-->
-    <!--    </el-tabs>-->
-    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small">
       <!--      <el-form-item label="上传类型" prop="uploadingType">-->
-      <!--        <el-select v-model="queryParams.uploadingType" clearable placeholder="请选择上传类型">-->
+      <!--        <el-select v-model="queryParams.uploadingType" placeholder="请选择上传类型" clearable>-->
       <!--          <el-option-->
-      <!--              v-for="dict in dict.type.sys_apk_uploading_type"-->
-      <!--              :key="dict.value"-->
-      <!--              :label="dict.label"-->
-      <!--              :value="dict.value"-->
+      <!--            v-for="dict in dict.type.sys_apk_uploading_type"-->
+      <!--            :key="dict.value"-->
+      <!--            :label="dict.label"-->
+      <!--            :value="dict.value"-->
       <!--          />-->
       <!--        </el-select>-->
       <!--      </el-form-item>-->
       <el-form-item label="安装包名称" prop="sysApkName">
         <el-input
-            v-model="queryParams.sysApkName"
-            clearable
-            placeholder="请输入安装包名称"
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.sysApkName"
+          clearable
+          placeholder="请输入安装包名称"
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="版本号" prop="version">
         <el-input
-            v-model="queryParams.version"
-            clearable
-            placeholder="请输入版本号"
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.version"
+          clearable
+          placeholder="请输入版本号"
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="安装包类型" prop="sysType">
         <el-select v-model="queryParams.sysType" clearable placeholder="请选择安装包类型">
           <el-option
-              v-for="dict in dict.type.sys_apk_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+            v-for="dict in dict.type.sys_apk_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
           />
         </el-select>
       </el-form-item>
       <!--      <el-form-item label="上传状态" prop="uploadingStatus">-->
       <!--        <el-select v-model="queryParams.uploadingStatus" clearable placeholder="请选择上传状态">-->
       <!--          <el-option-->
-      <!--              v-for="dict in dict.type.uploading_status"-->
-      <!--              :key="dict.value"-->
-      <!--              :label="dict.label"-->
-      <!--              :value="dict.value"-->
+      <!--            v-for="dict in dict.type.uploading_status"-->
+      <!--            :key="dict.value"-->
+      <!--            :label="dict.label"-->
+      <!--            :value="dict.value"-->
       <!--          />-->
       <!--        </el-select>-->
       <!--      </el-form-item>-->
       <el-form-item label="创建人" prop="created">
         <el-input
-            v-model="queryParams.created"
-            clearable
-            placeholder="请输入创建人"
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.created"
+          clearable
+          placeholder="请输入创建人"
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item>
@@ -73,119 +64,219 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['system:config:add']"
-            icon="el-icon-plus"
-            plain
-            size="mini"
-            type="primary"
-            @click="handleAdd"
-        >新建
+          v-hasPermi="['deploy:INFO:add']"
+          icon="el-icon-plus"
+          plain
+          size="mini"
+          type="primary"
+          @click="handleAdd"
+        >新增
         </el-button>
       </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          v-hasPermi="['deploy:INFO:edit']"-->
+      <!--          :disabled="single"-->
+      <!--          icon="el-icon-edit"-->
+      <!--          plain-->
+      <!--          size="mini"-->
+      <!--          type="success"-->
+      <!--          @click="handleUpdate"-->
+      <!--        >修改-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['system:config:delete']"
-            :disabled="multiple"
-            icon="el-icon-plus"
-            plain
-            size="mini"
-            type="info"
-            @click="handleDelete"
+          v-hasPermi="['deploy:INFO:remove']"
+          :disabled="multiple"
+          icon="el-icon-delete"
+          plain
+          size="mini"
+          type="danger"
+          @click="handleDelete"
         >批量删除
         </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"/>
-      <template v-if="activeTabs=='1'">
-        <!--        <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="sysApkSize"/>
-        <el-table-column align="center" label="安装包类型" prop="sysType">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.sys_apk_type" :value="scope.row.sysType"/>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="创建人" prop="created"/>
-      </template>
-      <template v-if="activeTabs=='2'">
-        <el-table-column align="center" label="安装包名称" prop="configId"/>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version"/>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="安装包大小" prop="sys_apk_size"/>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="上传方式" prop="uploading_type"/>
-        <el-table-column :show-overflow-tooltip="true" align="center" label="创建人" prop="created"/>
-        <el-table-column align="center" label="创建时间" prop="create_time" width="180">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-      </template>
-      <el-table-column align="center" label="状态" prop="uploading_status">
-        <template slot-scope="scopeA">
-          <dict-tag :options="dict.type.uploading_status" :value="scopeA.row.uploadingStatus"/>
+      <!--      <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="sysApkSize"/>
+      <el-table-column align="center" label="安装包类型" prop="sysType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_apk_type" :value="scope.row.sysType"/>
         </template>
       </el-table-column>
-      <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="250">
+      <el-table-column align="center" label="创建人" prop="created"/>
+      <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
+
           <el-button
-              v-hasPermi="['system:config:dowmload']"
-              icon="el-icon-download"
-              size="mini"
-              type="text"
-              @click="handleDownload(scope.row)"
+            icon="el-icon-download"
+            size="mini"
+            type="text"
+            @click="handleDownload(scope.row)"
           >下载安装包
           </el-button>
+
           <el-button
-              v-hasPermi="['system:config:edit']"
-              icon="el-icon-edit"
-              size="mini"
-              type="text"
-              @click="handleEdit(scope.row)"
-          >编辑
+            v-hasPermi="['deploy:INFO:edit']"
+            icon="el-icon-edit"
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
+          >修改
           </el-button>
+
           <el-button
-              v-hasPermi="['system:config:detail']"
-              icon="el-icon-view"
-              size="mini"
-              type="text"
-              @click="handleDetail(scope.row)"
+            icon="el-icon-view"
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row)"
           >详情
           </el-button>
           <el-button
-              v-hasPermi="['system:config:delete']"
-              icon="el-icon-delete"
-              size="mini"
-              type="text"
-              @click="handleDelete(scope.row)"
+            v-hasPermi="['deploy:INFO:remove']"
+            icon="el-icon-delete"
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
           >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
+
     <pagination
-        v-show="total>0"
-        :limit.sync="queryParams.pageSize"
-        :page.sync="queryParams.pageNum"
-        :total="total"
-        @pagination="getList"
+      v-show="total>0"
+      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="total"
+      @pagination="getList"
     />
+
+    <!-- 添加或修改安装包管理（新）对话框 -->
+    <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>
+        <el-form-item label="版本号" prop="version">
+          <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"
+                       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/>
+        </el-form-item>
+        <el-form-item label="安装包类型" prop="sysType">
+          <el-select v-model="form.sysType" placeholder="请选择安装包类型">
+            <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-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="openDetail" append-to-body width="700px">
+      <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item label="安装包名称" prop="moduleName">
+          {{ form.sysApkName }}
+        </el-form-item>
+        <el-form-item label="版本号" prop="version">
+          {{ form.version }}
+        </el-form-item>
+        <el-form-item label="安装包" prop="moduleUrl">
+          {{ form.sysApk }}
+        </el-form-item>
+        <el-form-item label="安装包大小" prop="moduleSize">
+          {{ form.sysApkSize }}
+        </el-form-item>
+        <el-form-item label="系统类型" prop="sysType">
+          {{ form.sysType }}
+        </el-form-item>
+        <el-form-item label="下载地址：">
+          <el-input v-model="form.sysApk" class="input-with-select" readonly>
+            <el-button slot="append" @click="copyIt(form.sysApk)">复制</el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="上传时间：">{{ form.createTime }}</el-form-item>
+
+        <el-form-item label="上传人员：">{{ form.created }}</el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelDetail">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
+
 <script>
-import { delINFO, listINFO } from '@/api/FDS/installList'
+import { addINFO, delINFO, getINFO, listINFO, updateINFO } from '@/api/FDS/installList'
 
 export default {
-  name: 'InstallationList',
+  name: 'INFO',
   dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
   data() {
     return {
+
+      form: {
+        uploadingType: 'OnLineUploading',
+        sysApkName: undefined,
+        version: undefined,
+        sysApk: null,
+        sysApkSize: undefined,
+        sysType: '',
+        appCode: '000000'
+      },
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -200,15 +291,11 @@ export default {
       total: 0,
       // 安装包管理（新）表格数据
       INFOList: [],
-      packTabs: [{
-        name: '1',
-        title: 'APP安装包'
-      }, {
-        name: '2',
-        title: 'H5模块包'
-      }],
-      // 日期范围
-      create_time: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      openDetail: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -220,15 +307,24 @@ export default {
         uploadingStatus: null,
         created: null
       },
-      // 表单参数
-      form: {},
-      activeTabs: '1'
       // 表单校验
-    }
-  },
-  watch: {
-    $route(to, from) {
-      if (to) this.getList()
+      rules: {
+        uploadingType: [
+          { required: true, message: '上传类型不能为空', trigger: 'change' }
+        ],
+        sysApkName: [
+          { required: true, message: '安装包名称不能为空', trigger: 'blur' }
+        ],
+        version: [
+          { required: true, message: '版本号不能为空', trigger: 'blur' }
+        ],
+        sysType: [
+          { required: true, message: '安装包类型不能为空', trigger: 'change' }
+        ],
+        sysApk: [
+          { required: true, message: '安装包不能为空', trigger: 'change' }
+        ]
+      }
     }
   },
   created() {
@@ -237,13 +333,31 @@ export default {
   methods: {
     /** 查询安装包管理（新）列表 */
     getList() {
-      this.loading = false
+      this.loading = true
       listINFO(this.queryParams).then(response => {
         this.INFOList = response.rows
         this.total = response.total
         this.loading = false
       })
     },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        uploadingType: 'OnLineUploading',
+        sysApkName: undefined,
+        version: undefined,
+        sysApk: null,
+        sysApkSize: undefined,
+        sysType: '',
+        appCode: '000000'
+      }
+      this.resetForm('form')
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1
@@ -251,77 +365,98 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.create_time = []
       this.resetForm('queryForm')
       this.handleQuery()
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      const query = {
-        activeTabs: this.activeTabs
-      }
-      this.$router.push({
-        path: '/build/install/add/',
-        query: query
-      })
-      // this.$tab.openPage('新增安装包', '/build/install/add/', params)
-
-    },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length != 1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加安装包管理'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getINFO(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改安装包管理'
+      })
+    },
 
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getINFO(id).then(response => {
+        this.form = response.data
+        this.openDetail = true
+        this.title = '安装包详情'
+        this.type = 'detail'
+      })
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            let data = Object.assign({}, this.form)
+            delete data.explain
+            updateINFO(data).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addINFO(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const configIds = row.id || this.ids
-      this.$modal.confirm('是否确认删除编号为"' + configIds + '"的数据项？').then(function() {
-        return delINFO(configIds)
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除安装包管理编号为"' + ids + '"的数据项？').then(function() {
+        return delINFO(ids)
       }).then(() => {
         this.getList()
         this.$modal.msgSuccess('删除成功')
       }).catch(() => {
       })
     },
-    /** 修改按钮操作 */
-    handleEdit(row) {
-      const query = {
-        activeTabs: this.activeTabs,
-        id: row.id
-      }
-      this.$router.push({
-        path: '/build/install/edit/',
-        query: query
-      })
-
-      // this.$tab.openPage('编辑安装包', '/build/install/add/', params)
+    getSize(e) {
+      this.form.sysApkSize = e[0].size + 'kb'
     },
-    /** 查看详情弹窗 **/
-    handleDetail(row) {
+    // /** 导出按钮操作 */
+    // handleExport() {
+    //   this.download('deploy/INFO/export', {
+    //     ...this.queryParams
+    //   }, `INFO_${new Date().getTime()}.xlsx`)
+    // },
 
-      const params = {
-        id: row.id
-      }
-      this.$tab.openPage('安装包详情', '/build/install/detail/', params)
-    },
-
-    /** 切换TAB触发的事件 */
-    handleClickTabs() {
-      this.getList()
-    },
-
-    /** 下载按钮 */
+    /**下载安装包*/
     handleDownload(row) {
-      const configIds = row.id || this.ids
-      this.$modal.confirm('是否确认下载编号为"' + configIds + '"的数据项？').then(function() {
-        return delConfig(configIds)
-      }).then(() => {
-        this.getList()
-        this.$modal.msgSuccess('下载成功')
-      }).catch(() => {
-      })
+      window.open(row.sysApk)
+    },
+    cancelDetail() {
+      this.openDetail = false
+      this.reset()
+    },
+    copyIt(url) {
+      navigator.clipboard.writeText(url)
+      this.$message.success('复制成功')
     }
   }
 }
diff --git a/sf-ui/src/views/FDS/installationList/index111.vue b/sf-ui/src/views/FDS/installationList/index111.vue
new file mode 100644
index 0000000..2eed7b7
--- /dev/null
+++ b/sf-ui/src/views/FDS/installationList/index111.vue
@@ -0,0 +1,328 @@
+<template>
+  <div class="app-container">
+    <!--    <el-tabs v-model="activeTabs" type="card" @tab-click="handleClickTabs">-->
+    <!--      <el-tab-pane-->
+    <!--          v-for="item in packTabs"-->
+    <!--          :key="item.name"-->
+    <!--          :label="item.title"-->
+    <!--          :name="item.name"-->
+    <!--      >-->
+    <!--      </el-tab-pane>-->
+    <!--    </el-tabs>-->
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
+      <!--      <el-form-item label="上传类型" prop="uploadingType">-->
+      <!--        <el-select v-model="queryParams.uploadingType" clearable placeholder="请选择上传类型">-->
+      <!--          <el-option-->
+      <!--              v-for="dict in dict.type.sys_apk_uploading_type"-->
+      <!--              :key="dict.value"-->
+      <!--              :label="dict.label"-->
+      <!--              :value="dict.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="安装包名称" prop="sysApkName">
+        <el-input
+            v-model="queryParams.sysApkName"
+            clearable
+            placeholder="请输入安装包名称"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="版本号" prop="version">
+        <el-input
+            v-model="queryParams.version"
+            clearable
+            placeholder="请输入版本号"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="安装包类型" prop="sysType">
+        <el-select v-model="queryParams.sysType" clearable placeholder="请选择安装包类型">
+          <el-option
+              v-for="dict in dict.type.sys_apk_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <!--      <el-form-item label="上传状态" prop="uploadingStatus">-->
+      <!--        <el-select v-model="queryParams.uploadingStatus" clearable placeholder="请选择上传状态">-->
+      <!--          <el-option-->
+      <!--              v-for="dict in dict.type.uploading_status"-->
+      <!--              :key="dict.value"-->
+      <!--              :label="dict.label"-->
+      <!--              :value="dict.value"-->
+      <!--          />-->
+      <!--        </el-select>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="创建人" prop="created">
+        <el-input
+            v-model="queryParams.created"
+            clearable
+            placeholder="请输入创建人"
+            @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['system:config:add']"
+            icon="el-icon-plus"
+            plain
+            size="mini"
+            type="primary"
+            @click="handleAdd"
+        >新建
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            v-hasPermi="['system:config:delete']"
+            :disabled="multiple"
+            icon="el-icon-plus"
+            plain
+            size="mini"
+            type="info"
+            @click="handleDelete"
+        >批量删除
+        </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"/>
+      <template v-if="activeTabs=='1'">
+        <!--        <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="sysApkSize"/>
+        <el-table-column align="center" label="安装包类型" prop="sysType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.sys_apk_type" :value="scope.row.sysType"/>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="创建人" prop="created"/>
+      </template>
+      <template v-if="activeTabs=='2'">
+        <el-table-column align="center" label="安装包名称" prop="configId"/>
+        <el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version"/>
+        <el-table-column :show-overflow-tooltip="true" align="center" label="安装包大小" prop="sys_apk_size"/>
+        <el-table-column :show-overflow-tooltip="true" align="center" label="上传方式" prop="uploading_type"/>
+        <el-table-column :show-overflow-tooltip="true" align="center" label="创建人" prop="created"/>
+        <el-table-column align="center" label="创建时间" prop="create_time" width="180">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+      </template>
+      <el-table-column align="center" label="状态" prop="uploading_status">
+        <template slot-scope="scopeA">
+          <dict-tag :options="dict.type.uploading_status" :value="scopeA.row.uploadingStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="250">
+        <template slot-scope="scope">
+          <el-button
+              v-hasPermi="['system:config:dowmload']"
+              icon="el-icon-download"
+              size="mini"
+              type="text"
+              @click="handleDownload(scope.row)"
+          >下载安装包
+          </el-button>
+          <el-button
+              v-hasPermi="['system:config:edit']"
+              icon="el-icon-edit"
+              size="mini"
+              type="text"
+              @click="handleEdit(scope.row)"
+          >编辑
+          </el-button>
+          <el-button
+              v-hasPermi="['system:config:detail']"
+              icon="el-icon-view"
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+          >详情
+          </el-button>
+          <el-button
+              v-hasPermi="['system:config:delete']"
+              icon="el-icon-delete"
+              size="mini"
+              type="text"
+              @click="handleDelete(scope.row)"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+        v-show="total>0"
+        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.pageNum"
+        :total="total"
+        @pagination="getList"
+    />
+  </div>
+</template>
+<script>
+import { delINFO, listINFO } from '@/api/FDS/installList'
+
+export default {
+  name: 'InstallationList',
+  dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 安装包管理（新）表格数据
+      INFOList: [],
+      packTabs: [{
+        name: '1',
+        title: 'APP安装包'
+      }, {
+        name: '2',
+        title: 'H5模块包'
+      }],
+      // 日期范围
+      create_time: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        uploadingType: null,
+        sysApkName: null,
+        version: null,
+        sysType: null,
+        uploadingStatus: null,
+        created: null
+      },
+      // 表单参数
+      form: {},
+      activeTabs: '1'
+      // 表单校验
+    }
+  },
+  watch: {
+    $route(to, from) {
+      if (to) this.getList()
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询安装包管理（新）列表 */
+    getList() {
+      this.loading = false
+      listINFO(this.queryParams).then(response => {
+        this.INFOList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.create_time = []
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      const query = {
+        activeTabs: this.activeTabs
+      }
+      this.$router.push({
+        path: '/build/install/add/',
+        query: query
+      })
+      // this.$tab.openPage('新增安装包', '/build/install/add/', params)
+
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length != 1
+      this.multiple = !selection.length
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const configIds = row.id || this.ids
+      this.$modal.confirm('是否确认删除编号为"' + configIds + '"的数据项？').then(function() {
+        return delINFO(configIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 修改按钮操作 */
+    handleEdit(row) {
+      const query = {
+        activeTabs: this.activeTabs,
+        id: row.id
+      }
+      this.$router.push({
+        path: '/build/install/edit/',
+        query: query
+      })
+
+      // this.$tab.openPage('编辑安装包', '/build/install/add/', params)
+    },
+    /** 查看详情弹窗 **/
+    handleDetail(row) {
+
+      const params = {
+        id: row.id
+      }
+      this.$tab.openPage('安装包详情', '/build/install/detail/', params)
+    },
+
+    /** 切换TAB触发的事件 */
+    handleClickTabs() {
+      this.getList()
+    },
+
+    /** 下载按钮 */
+    handleDownload(row) {
+      const configIds = row.id || this.ids
+      this.$modal.confirm('是否确认下载编号为"' + configIds + '"的数据项？').then(function() {
+        return delConfig(configIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('下载成功')
+      }).catch(() => {
+      })
+    }
+  }
+}
+</script>
diff --git a/sf-ui/src/views/deployment/module/index.vue b/sf-ui/src/views/deployment/module/index.vue
index c197010..a079a4b 100644
--- a/sf-ui/src/views/deployment/module/index.vue
+++ b/sf-ui/src/views/deployment/module/index.vue
@@ -3,18 +3,18 @@
     <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small">
       <el-form-item label="模块包名称名称" prop="moduleName">
         <el-input
-            v-model="queryParams.moduleName"
-            clearable
-            placeholder="请输入模块包名称名称"
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.moduleName"
+          clearable
+          placeholder="请输入模块包名称名称"
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="版本号" prop="version">
         <el-input
-            v-model="queryParams.version"
-            clearable
-            placeholder="请输入版本号"
-            @keyup.enter.native="handleQuery"
+          v-model="queryParams.version"
+          clearable
+          placeholder="请输入版本号"
+          @keyup.enter.native="handleQuery"
         />
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -35,47 +35,47 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['deployment:module:add']"
-            icon="el-icon-plus"
-            plain
-            size="mini"
-            type="primary"
-            @click="handleAdd"
+          v-hasPermi="['deployment:module:add']"
+          icon="el-icon-plus"
+          plain
+          size="mini"
+          type="primary"
+          @click="handleAdd"
         >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['deployment:module:edit']"
-            :disabled="single"
-            icon="el-icon-edit"
-            plain
-            size="mini"
-            type="success"
-            @click="handleUpdate"
+          v-hasPermi="['deployment:module:edit']"
+          :disabled="single"
+          icon="el-icon-edit"
+          plain
+          size="mini"
+          type="success"
+          @click="handleUpdate"
         >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['deployment:module:remove']"
-            :disabled="multiple"
-            icon="el-icon-delete"
-            plain
-            size="mini"
-            type="danger"
-            @click="handleDelete"
+          v-hasPermi="['deployment:module:remove']"
+          :disabled="multiple"
+          icon="el-icon-delete"
+          plain
+          size="mini"
+          type="danger"
+          @click="handleDelete"
         >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['deployment:module:export']"
-            icon="el-icon-download"
-            plain
-            size="mini"
-            type="warning"
-            @click="handleExport"
+          v-hasPermi="['deployment:module:export']"
+          icon="el-icon-download"
+          plain
+          size="mini"
+          type="warning"
+          @click="handleExport"
         >导出
         </el-button>
       </el-col>
@@ -103,36 +103,36 @@
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
           <el-button
-              icon="el-icon-download"
-              size="mini"
-              type="text"
-              @click="handleDownLoad(scope.row)"
+            icon="el-icon-download"
+            size="mini"
+            type="text"
+            @click="handleDownLoad(scope.row)"
           >下载安装包
           </el-button>
 
           <el-button
-              v-hasPermi="['deployment:module:edit']"
-              icon="el-icon-edit"
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
+            v-hasPermi="['deployment:module:edit']"
+            icon="el-icon-edit"
+            size="mini"
+            type="text"
+            @click="handleUpdate(scope.row)"
           >修改
           </el-button>
 
           <el-button
-              icon="el-icon-detail"
-              size="mini"
-              type="text"
-              @click="handleDetail(scope.row)"
+            icon="el-icon-detail"
+            size="mini"
+            type="text"
+            @click="handleDetail(scope.row)"
           >详情
           </el-button>
 
           <el-button
-              v-hasPermi="['deployment:module:remove']"
-              icon="el-icon-delete"
-              size="mini"
-              type="text"
-              @click="handleDelete(scope.row)"
+            v-hasPermi="['deployment:module:remove']"
+            icon="el-icon-delete"
+            size="mini"
+            type="text"
+            @click="handleDelete(scope.row)"
           >删除
           </el-button>
         </template>
@@ -140,11 +140,11 @@
     </el-table>
 
     <pagination
-        v-show="total>0"
-        :limit.sync="queryParams.pageSize"
-        :page.sync="queryParams.pageNum"
-        :total="total"
-        @pagination="getList"
+      v-show="total>0"
+      :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
+      :total="total"
+      @pagination="getList"
     />
 
     <!-- 添加或修改H5模块包对话框 -->
@@ -160,30 +160,30 @@
 
           <file-upload v-model="form.moduleUrl" :fileSize="20" :fileType="['zip']"
                        :limit="1"
-                       uploadFileUrl="/system/oss/upload"
+
                        @getSize="getSize"
           />
         </el-form-item>
-        <el-form-item label="安装包大小" prop="moduleSize">
+        <el-form-item label="安装包大小" prop="moduleSize">system/oss/upload
           <el-input v-model="form.moduleSize" placeholder="请输入安装包大小" readonly/>
         </el-form-item>
         <el-form-item label="系统类型" prop="sysType">
           <el-select v-model="form.sysType" placeholder="请选择系统类型">
             <el-option
-                v-for="dict in dict.type.sys_apk_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+              v-for="dict in dict.type.sys_apk_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="模块类型" prop="moduleType">
           <el-select v-model="form.moduleType" placeholder="请选择模块类型">
             <el-option
-                v-for="dict in dict.type.module_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+              v-for="dict in dict.type.module_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
diff --git a/sf-ui/src/views/deployment/publish/component/detail.vue b/sf-ui/src/views/deployment/publish/component/detail.vue
index c9dc5d1..1b609cf 100644
--- a/sf-ui/src/views/deployment/publish/component/detail.vue
+++ b/sf-ui/src/views/deployment/publish/component/detail.vue
@@ -128,10 +128,19 @@
           <el-button slot="append" @click="copyIt(form.moduleUrl)">复制</el-button>
         </el-input>
       </el-form-item>
+      <el-form-item label="发布状态">
+        <dict-tag :options="dict.type.release_status" :value="form.status"/>
+      </el-form-item>
 
       <el-form-item label="创建人" prop="created">
         {{ form.created }}
       </el-form-item>
+
+      <el-form-item label="发布时间" prop="validityStartTime">
+        {{ form.updateTime }}
+      </el-form-item>
+
+
     </el-form>
   </el-dialog>
 </template>
@@ -142,7 +151,7 @@ import { listEnvironment } from '@/api/deployment/environment'
 
 export default {
   name: 'AddPack',
-  dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type'],
+  dicts: ['release_environment', 'sys_yes_no', 'release_strategy', 'release_user_type', 'release_status'],
   props: {
     detailId: {
       type: String | Number,
diff --git a/sf-ui/src/views/deployment/publish/index.vue b/sf-ui/src/views/deployment/publish/index.vue
index 5200d24..086d229 100644
--- a/sf-ui/src/views/deployment/publish/index.vue
+++ b/sf-ui/src/views/deployment/publish/index.vue
@@ -69,10 +69,10 @@
       <el-col :span="1.5">
         <el-button
           :disabled="multiple"
-          icon="el-icon-delete"
+          icon="el-icon-top"
           plain
           size="mini"
-          type="danger"
+          type="info"
           @click="handleDelete"
         >批量发布
         </el-button>
@@ -121,7 +121,10 @@
                        width="180"
       >
         <template slot-scope="scope">
-          <dict-tag :options="environmentList" :value="scope.row.publishEnvironment"/>
+          <div v-for="item in environmentList" :key="item.id">
+            <div v-if="item.id===scope.row.publishEnvironment">{{ item.name }}</div>
+          </div>
+          <!--          <dict-tag :options="environmentList" :value="scope.row.publishEnvironment"/>-->
         </template>
       </el-table-column>
 
@@ -193,7 +196,7 @@
           </el-button>
           <el-button
             v-if="scope.row.status==2 || scope.row.status==0"
-            icon="el-icon-edit"
+            icon="el-icon-top"
             size="mini"
             type="text"
             @click="handlePublish(scope.row)"
@@ -201,7 +204,7 @@
           </el-button>
 
           <el-button
-            icon="el-icon-edit"
+            icon="el-icon-view"
             size="mini"
             type="text"
             @click="handleDetail(scope.row)"
@@ -484,6 +487,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getEnvironmentList()
   },
   methods: {
     /** 查询发布列表列表 */