fix: 修改appCode取值

fix: 修改appCode取值

sf-ui/src/views/FDS/installationList/index.vue

@@ -12,29 +12,14 @@
       <!--        </el-select>-->
       <!--      </el-form-item>-->
       <el-form-item label="安装包名称" prop="sysApkName">
-        <el-input
+        <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
+        <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
+          <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">-->
@@ -48,12 +33,7 @@
       <!--        </el-select>-->
       <!--      </el-form-item>-->
       <el-form-item label="创建人" prop="created">
-        <el-input
+        <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>
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
@@ -63,14 +43,8 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deploy:INFO:add']" icon="el-icon-plus" plain size="mini" type="primary"
-          v-hasPermi="['deploy:INFO:add']"
+          @click="handleAdd">新增
-          icon="el-icon-plus"
-          plain
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-        >新增
         </el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
@@ -86,15 +60,8 @@
       <!--        </el-button>-->
       <!--      </el-col>-->
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deploy:INFO:remove']" :disabled="multiple" icon="el-icon-delete" plain size="mini"
-          v-hasPermi="['deploy:INFO:remove']"
+          type="danger" @click="handleDelete">批量删除
-          :disabled="multiple"
-          icon="el-icon-delete"
-          plain
-          size="mini"
-          type="danger"
-          @click="handleDelete"
-        >批量删除
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -125,49 +92,24 @@
       <el-table-column align="center" class-name="small-padding fixed-width" fixed="right" label="操作">
         <template slot-scope="scope">
 
-          <el-button
+          <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
+          <el-button v-hasPermi="['deploy:INFO:edit']" icon="el-icon-edit" size="mini" type="text"
-            v-hasPermi="['deploy:INFO:edit']"
+            @click="handleUpdate(scope.row)">修改
-            icon="el-icon-edit"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改
           </el-button>
 
-          <el-button
+          <el-button 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
+          <el-button v-hasPermi="['deploy:INFO:remove']" icon="el-icon-delete" size="mini" type="text"
-            v-hasPermi="['deploy:INFO:remove']"
+            @click="handleDelete(scope.row)">删除
-            icon="el-icon-delete"
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total"
-      v-show="total>0"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :page.sync="queryParams.pageNum"
-      :total="total"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改安装包管理（新）对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body width="700px">
@@ -181,23 +123,15 @@
         </el-form-item>
         <el-form-item label="安装包" prop="sysApk">
           <file-upload v-model="form.sysApk" :accept="['.zip', '.apk', '.hap', '.iap']" :fileSize="50"
-                       :fileType="['apk','hap','iap','zip']"
+            :fileType="['apk', 'hap', 'iap', 'zip']" :limit="1" uploadFileUrl="/system/oss/upload" @getSize="getSize" />
-                       :limit="1"
-                       uploadFileUrl="/system/oss/upload"
-                       @getSize="getSize"
-          />
         </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
+            <el-option v-for="dict in dict.type.sys_apk_type" :key="dict.value" :label="dict.label"
-              v-for="dict in dict.type.sys_apk_type"
+              :value="dict.value"></el-option>
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -259,7 +193,7 @@ export default {
         sysApk: null,
         sysApkSize: undefined,
         sysType: '',
-        appCode: Cookies.get('Admin-Application-Id')
+        appCode: Cookies.get('Admin-Application-appCode')
       },
 
       // 遮罩层
@@ -339,7 +273,7 @@ export default {
         sysApk: null,
         sysApkSize: undefined,
         sysType: '',
-        appCode: Cookies.get('Admin-Application-Id')
+        appCode: Cookies.get('Admin-Application-appCode')
       }
       this.resetForm('form')
     },
@@ -394,7 +328,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             let data = Object.assign({}, this.form)
-            data.appCode = Cookies.get('Admin-Application-Id'),
+            data.appCode = Cookies.get('Admin-Application-appCode')
             delete data.explain
             updateINFO(data).then(response => {
               this.$modal.msgSuccess('修改成功')

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

@@ -1,21 +1,10 @@
 <template>
   <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :modal-append-to-body="false" :title="title"
-             :visible.sync="open" v-bind="$attrs" width="700px"
+    :visible.sync="open" v-bind="$attrs" width="700px" @close="onClose" @open="onOpen" v-on="$listeners">
-             @close="onClose"
+    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
-             @open="onOpen"
-             v-on="$listeners"
-  >
-    <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px"
-             size="small"
-    >
       <el-form-item label="安装包名称" prop="installpackName">
-        <el-input
+        <el-input v-model="queryParams.sysApkName" clearable placeholder="请输入安装包名称" style="width: 240px"
-          v-model="queryParams.sysApkName"
+          @keyup.enter.native="handleQuery" />
-          clearable
-          placeholder="请输入安装包名称"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item>
         <el-button icon="el-icon-search" size="mini" type="primary" @click="handleQuery">搜索</el-button>
@@ -34,9 +23,7 @@
       <!--      </el-table-column>-->
       <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"
+          <el-button circle icon="el-icon-plus" size="20" type="primary" @click="addPack(scope.row)"></el-button>
-                     @click="addPack(scope.row)"
-          ></el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -73,7 +60,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         sysApkName: null,
-        appCode: Cookies.get('Admin-Application-Id')
+        appCode: Cookies.get('Admin-Application-appCode')
       }
     }
   },

sf-ui/src/views/FDS/publishList/index.vue

@@ -3,43 +3,21 @@
     <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="90px" size="small">
       <el-form-item label="选择APP" prop="configName">
         <el-select v-model="queryParams.configType" clearable placeholder="请选择APP">
-          <el-option
+          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item label="版本号" prop="version">
-        <el-input
+        <el-input v-model="queryParams.version" clearable placeholder="请输入版本号" style="width: 240px"
-          v-model="queryParams.version"
+          @keyup.enter.native="handleQuery" />
-          clearable
-          placeholder="请输入版本号"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
 
       <el-form-item label="公开时间">
-        <el-date-picker
+        <el-date-picker v-model="dateRange" end-placeholder="结束日期" range-separator="-" start-placeholder="开始日期"
-          v-model="dateRange"
+          style="width: 240px" type="daterange" value-format="yyyy-MM-dd"></el-date-picker>
-          end-placeholder="结束日期"
-          range-separator="-"
-          start-placeholder="开始日期"
-          style="width: 240px"
-          type="daterange"
-          value-format="yyyy-MM-dd"
-        ></el-date-picker>
       </el-form-item>
       <el-form-item label="状态" prop="configType">
         <el-select v-model="queryParams.configType" clearable placeholder="请选择状态">
-          <el-option
+          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" />
-            v-for="dict in dict.type.sys_yes_no"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -50,37 +28,17 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['system:config:add']" icon="el-icon-plus" plain size="mini" type="primary"
-          v-hasPermi="['system:config:add']"
+          @click="handleAdd">新增
-          icon="el-icon-plus"
-          plain
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button :disabled="multiple" icon="el-icon-plus" plain size="mini" type="info" @click="handlePublish">批量发布
-          :disabled="multiple"
-          icon="el-icon-plus"
-          plain
-          size="mini"
-          type="info"
-          @click="handlePublish"
-        >批量发布
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['system:config:add']" :disabled="multiple" icon="el-icon-plus" plain size="mini"
-          v-hasPermi="['system:config:add']"
+          type="info" @click="handleDelete">批量删除
-          :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>
@@ -92,12 +50,8 @@
       <el-table-column :show-overflow-tooltip="true" align="center" label="文件类型" prop="configName" />
       <el-table-column :show-overflow-tooltip="true" align="center" label="版本号" prop="version" />
       <el-table-column :show-overflow-tooltip="true" align="center" label="子版本号" prop="configValue" />
-      <el-table-column
+      <el-table-column label="系统" min-width="80" prop="platform">
-        label="系统"
+        <template slot-scope="scope">
-        min-width="80"
-        prop="platform"
-      >
-        <template scope="scope">
           <div>{{ scope.row.platform === '0' ? '安卓' : 'IOS' }}</div>
         </template>
       </el-table-column>
@@ -132,18 +86,10 @@
       </el-table-column>
 
       <el-table-column :show-overflow-tooltip="true" align="center" label="更新说明" prop="remark" />
-      <el-table-column
+      <el-table-column align="center" label="二维码" min-width="80">
-        align="center"
-        label="二维码"
-        min-width="80"
-      >
         <template slot-scope="scope">
 
-          <el-image
+          <el-image :preview-src-list="srcList" :src="url" style="width: 80px; height: 80px">
-            :preview-src-list="srcList"
-            :src="url"
-            style="width: 80px; height: 80px"
-          >
           </el-image>
 
           <!--          <el-popover-->
@@ -162,39 +108,21 @@
       </el-table-column>
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="150">
         <template slot-scope="scope">
-          <el-button
+          <el-button v-hasPermi="['system:config:edit']" icon="el-icon-bottom" size="mini" type="text"
-            v-hasPermi="['system:config:edit']"
+            @click="handleDown(scope.row)">下架
-            icon="el-icon-bottom"
-            size="mini"
-            type="text"
-            @click="handleDown(scope.row)"
-          >下架
           </el-button>
-          <el-button
+          <el-button v-hasPermi="['system:config:edit']" icon="el-icon-edit" size="mini" type="text"
-            v-hasPermi="['system:config:edit']"
+            @click="handleEdit(scope.row)">修改
-            icon="el-icon-edit"
-            size="mini"
-            type="text"
-            @click="handleEdit(scope.row)"
-          >修改
           </el-button>
-          <el-dropdown size="mini"
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
-                       @command="(command) => handleCommand(command, scope.row)"
-          >
             <el-button icon="el-icon-d-arrow-right" size="mini" type="text">更多</el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item v-hasPermi="['system:user:resetPwd']" command="handleDetail"
+              <el-dropdown-item v-hasPermi="['system:user:resetPwd']" command="handleDetail" icon="el-icon-view">详情
-                                icon="el-icon-view"
-              >详情
               </el-dropdown-item>
-              <el-dropdown-item v-hasPermi="['system:user:edit']" command="handleDownload"
+              <el-dropdown-item v-hasPermi="['system:user:edit']" command="handleDownload" icon="el-icon-download">下载安装包
-                                icon="el-icon-download"
-              >下载安装包
               </el-dropdown-item>
 
-              <el-dropdown-item v-hasPermi="['system:user:edit']" command="handleDelete"
+              <el-dropdown-item v-hasPermi="['system:user:edit']" command="handleDelete" icon="el-icon-delete">删除
-                                icon="el-icon-delete"
-              >删除
               </el-dropdown-item>
 
             </el-dropdown-menu>
@@ -203,13 +131,8 @@
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total"
-      v-show="total>0"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :page.sync="queryParams.pageNum"
-      :total="total"
-      @pagination="getList"
-    />
 
   </div>
 </template>

sf-ui/src/views/deployment/module/index.vue

@@ -2,28 +2,14 @@
   <div class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small">
       <el-form-item label="模块包名称名称" prop="moduleName">
-        <el-input
+        <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
+        <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">
-        <el-date-picker v-model="queryParams.createTime"
+        <el-date-picker v-model="queryParams.createTime" clearable placeholder="请选择创建时间" type="date"
-                        clearable
+          value-format="yyyy-MM-dd">
-                        placeholder="请选择创建时间"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -34,49 +20,23 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deployment:module:add']" icon="el-icon-plus" plain size="mini" type="primary"
-          v-hasPermi="['deployment:module:add']"
+          @click="handleAdd">新增
-          icon="el-icon-plus"
-          plain
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deployment:module:edit']" :disabled="single" icon="el-icon-edit" plain size="mini"
-          v-hasPermi="['deployment:module:edit']"
+          type="success" @click="handleUpdate">修改
-          :disabled="single"
-          icon="el-icon-edit"
-          plain
-          size="mini"
-          type="success"
-          @click="handleUpdate"
-        >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deployment:module:remove']" :disabled="multiple" icon="el-icon-delete" plain size="mini"
-          v-hasPermi="['deployment:module:remove']"
+          type="danger" @click="handleDelete">删除
-          :disabled="multiple"
-          icon="el-icon-delete"
-          plain
-          size="mini"
-          type="danger"
-          @click="handleDelete"
-        >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deployment:module:export']" icon="el-icon-download" plain size="mini" type="warning"
-          v-hasPermi="['deployment:module:export']"
+          @click="handleExport">导出
-          icon="el-icon-download"
-          plain
-          size="mini"
-          type="warning"
-          @click="handleExport"
-        >导出
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -102,50 +62,25 @@
       <!--      <el-table-column align="center" label="上传状态" prop="uploadingStatus"/>-->
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
-          <el-button
+          <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
+          <el-button v-hasPermi="['deployment:module:edit']" icon="el-icon-edit" size="mini" type="text"
-            v-hasPermi="['deployment:module:edit']"
+            @click="handleUpdate(scope.row)">修改
-            icon="el-icon-edit"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改
           </el-button>
 
-          <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
+          <el-button v-hasPermi="['deployment:module:remove']" icon="el-icon-delete" size="mini" type="text"
-            v-hasPermi="['deployment:module:remove']"
+            @click="handleDelete(scope.row)">删除
-            icon="el-icon-delete"
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total"
-      v-show="total>0"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :page.sync="queryParams.pageNum"
-      :total="total"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改H5模块包对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body width="500px">
@@ -158,33 +93,22 @@
         </el-form-item>
         <el-form-item label="安装包" prop="moduleUrl">
 
-          <file-upload v-model="form.moduleUrl" :accept="['.zip']" :fileSize="20"
+          <file-upload v-model="form.moduleUrl" :accept="['.zip']" :fileSize="20" :fileType="['zip']" :limit="1"
-                       :fileType="['zip']"
+            @getSize="getSize" />
-                       :limit="1"
-                       @getSize="getSize"
-          />
         </el-form-item>
         <el-form-item label="安装包大小" prop="moduleSize">
           <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
+            <el-option v-for="dict in dict.type.sys_apk_type" :key="dict.value" :label="dict.label"
-              v-for="dict in dict.type.sys_apk_type"
+              :value="dict.value"></el-option>
-              :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
+            <el-option v-for="dict in dict.type.module_type" :key="dict.value" :label="dict.label"
-              v-for="dict in dict.type.module_type"
+              :value="dict.value"></el-option>
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -370,7 +294,7 @@ export default {
         modified: null,
         createTime: null,
         updateTime: null,
-        appCode: Cookies.get('Admin-Application-Id')
+        appCode: Cookies.get('Admin-Application-appCode')
       }
       this.resetForm('form')
     },
@@ -425,7 +349,7 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             let data = Object.assign({}, this.form)
-            data.appCode = Cookies.get('Admin-Application-Id'),
+            data.appCode = Cookies.get('Admin-Application-appCode')
             delete data.explain
             updateModule(data).then(response => {
               this.$modal.msgSuccess('修改成功')

sf-ui/src/views/deployment/publish/index.vue

@@ -2,37 +2,19 @@
   <div class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :inline="true" :model="queryParams" label-width="120px" size="small">
       <el-form-item label="APP名称" prop="appName">
-        <el-input
+        <el-input v-model="queryParams.appName" clearable placeholder="请输入APP名称" @keyup.enter.native="handleQuery" />
-          v-model="queryParams.appName"
-          clearable
-          placeholder="请输入APP名称"
-          @keyup.enter.native="handleQuery"
-        />
       </el-form-item>
       <el-form-item label="版本号" prop="version">
-        <el-input
+        <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="validityStartTime">
-        <el-date-picker v-model="queryParams.validityStartTime"
+        <el-date-picker v-model="queryParams.validityStartTime" clearable placeholder="请选择有效期开始时间" type="date"
-                        clearable
+          value-format="yyyy-MM-dd">
-                        placeholder="请选择有效期开始时间"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="有效期结束时间" prop="validityEndTime">
-        <el-date-picker v-model="queryParams.validityEndTime"
+        <el-date-picker v-model="queryParams.validityEndTime" clearable placeholder="请选择有效期结束时间" type="date"
-                        clearable
+          value-format="yyyy-MM-dd">
-                        placeholder="请选择有效期结束时间"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -43,51 +25,24 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deployment:publish:add']" icon="el-icon-plus" plain size="mini" type="primary"
-          v-hasPermi="['deployment:publish:add']"
+          @click="handleAdd">新增
-          icon="el-icon-plus"
-          plain
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-        >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deployment:publish:edit']" :disabled="single" icon="el-icon-edit" plain size="mini"
-          v-hasPermi="['deployment:publish:edit']"
+          type="success" @click="handleUpdate">修改
-          :disabled="single"
-          icon="el-icon-edit"
-          plain
-          size="mini"
-          type="success"
-          @click="handleUpdate"
-        >修改
         </el-button>
       </el-col>
 
       <el-col :span="1.5">
-        <el-button
+        <el-button :disabled="multiple" icon="el-icon-top" plain size="mini" type="info" @click="handleDelete">批量发布
-          :disabled="multiple"
-          icon="el-icon-top"
-          plain
-          size="mini"
-          type="info"
-          @click="handleDelete"
-        >批量发布
         </el-button>
       </el-col>
 
       <el-col :span="1.5">
-        <el-button
+        <el-button v-hasPermi="['deployment:publish:remove']" :disabled="multiple" icon="el-icon-delete" plain size="mini"
-          v-hasPermi="['deployment:publish:remove']"
+          type="danger" @click="handleDelete">批量删除
-          :disabled="multiple"
-          icon="el-icon-delete"
-          plain
-          size="mini"
-          type="danger"
-          @click="handleDelete"
-        >批量删除
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -101,15 +56,13 @@
       <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
+            disabled />
-          />
         </template>
       </el-table-column>
       <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
+            disabled />
-          />
         </template>
       </el-table-column>
       <el-table-column :show-overflow-tooltip="true" align="center" label="上传时间" prop="updateTime">
@@ -117,8 +70,7 @@
           <span>{{ parseTime(scope.row.updateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :show-overflow-tooltip="true" align="center" label="发布环境" prop="publishEnvironment"
+      <el-table-column :show-overflow-tooltip="true" align="center" label="发布环境" prop="publishEnvironment">
-      >
         <template slot-scope="scope">
           <div v-for="item in environmentList" :key="item.id">
             <div v-if="item.id === scope.row.publishEnvironment">{{ item.name }}</div>
@@ -127,8 +79,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column :show-overflow-tooltip="true" align="center" label="发布状态" prop="publishEnvironment"
+      <el-table-column :show-overflow-tooltip="true" align="center" label="发布状态" prop="publishEnvironment">
-      >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.release_status" :value="scope.row.status" />
         </template>
@@ -143,26 +94,14 @@
       </el-table-column>
 
 
-      <el-table-column
+      <el-table-column align="center" label="二维码" min-width="80">
-        align="center"
-        label="二维码"
-        min-width="80"
-      >
         <template slot-scope="scope">
           <template v-if="scope.row.quickMark">
-            <el-image
+            <el-image v-if="scope.row.status != 2" :preview-src-list="[scope.row.quickMark]" :src="scope.row.quickMark"
-              v-if="scope.row.status!=2"
+              style="width: 80px; height: 80px">
-              :preview-src-list="[scope.row.quickMark]"
-              :src="scope.row.quickMark"
-              style="width: 80px; height: 80px"
-            >
             </el-image>
 
-            <el-image
+            <el-image v-else :src="scope.row.quickMark" style="width: 80px; height: 80px">
-              v-else
-              :src="scope.row.quickMark"
-              style="width: 80px; height: 80px"
-            >
             </el-image>
           </template>
 
@@ -184,67 +123,30 @@
 
       <el-table-column align="center" class-name="small-padding fixed-width" label="操作">
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="scope.row.status === 1" icon="el-icon-bottom" size="mini" type="text"
-            v-if="scope.row.status===1"
+            @click="handleDown(scope.row)">下架
-            icon="el-icon-bottom"
-            size="mini"
-            type="text"
-            @click="handleDown(scope.row)"
-          >下架
           </el-button>
-          <el-button
+          <el-button v-if="scope.row.status == 2 || scope.row.status == 0" icon="el-icon-top" size="mini" type="text"
-            v-if="scope.row.status==2 || scope.row.status==0"
+            @click="handlePublish(scope.row.id)">发布
-            icon="el-icon-top"
-            size="mini"
-            type="text"
-            @click="handlePublish(scope.row.id)"
-          >发布
           </el-button>
 
-          <el-button
+          <el-button 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
+          <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
+          <el-button v-if="scope.row.status === 2 || scope.row.status === 0" v-hasPermi="['deployment:publish:edit']"
-            v-if="scope.row.status===2 || scope.row.status===0"
+            icon="el-icon-edit" size="mini" type="text" @click="handleUpdate(scope.row)">修改
-            v-hasPermi="['deployment:publish:edit']"
-            icon="el-icon-edit"
-            size="mini"
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改
           </el-button>
-          <el-button
+          <el-button v-if="scope.row.status === 2 || scope.row.status === 0" v-hasPermi="['deployment:publish:remove']"
-            v-if="scope.row.status===2 || scope.row.status===0"
+            icon="el-icon-delete" size="mini" type="text" @click="handleDelete(scope.row)">删除
-            v-hasPermi="['deployment:publish:remove']"
-            icon="el-icon-delete"
-            size="mini"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :limit.sync="queryParams.pageSize" :page.sync="queryParams.pageNum" :total="total"
-      v-show="total>0"
+      @pagination="getList" />
-      :limit.sync="queryParams.pageSize"
-      :page.sync="queryParams.pageNum"
-      :total="total"
-      @pagination="getList"
-    />
 
     <!-- 添加或修改发布列表对话框 -->
 
@@ -260,12 +162,8 @@
         <el-form-item label="选择系统" prop="systemType">
 
           <el-select v-model="form.systemType" placeholder="请选择系统类型" @change="changeSys">
-            <el-option
+            <el-option v-for="dict in dict.type.sys_apk_type" :key="dict.value" :label="dict.label"
-              v-for="dict in dict.type.sys_apk_type"
+              :value="dict.value"></el-option>
-              :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>-->
@@ -295,53 +193,28 @@
         <el-form-item label="发布环境" prop="publishEnvironment">
 
           <el-select v-model="form.publishEnvironment">
-            <el-option
+            <el-option v-for="dict in environmentList" :key="dict.value" :label="dict.name" :value="parseInt(dict.id)" />
-              v-for="dict in environmentList"
-              :key="dict.value"
-              :label="dict.name"
-              :value="parseInt(dict.id)"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="发布策略" prop="publishStrategy">
 
           <el-select v-model="form.publishStrategy">
-            <el-option
+            <el-option v-for="dict in dict.type.release_strategy" :key="dict.value" :label="dict.label"
-              v-for="dict in dict.type.release_strategy"
+              :value="parseInt(dict.value)" />
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="结果通知" prop="resultNotify">
-          <el-switch
+          <el-switch v-model="form.resultNotify" :active-value="1" :inactive-value="0" />
-            v-model="form.resultNotify"
-            :active-value="1"
-            :inactive-value="0"
-          />
         </el-form-item>
         <el-form-item label="公开版" prop="publicVersion">
 
-          <el-switch
+          <el-switch v-model="form.publicVersion" :active-value="1" :inactive-value="0" />
-            v-model="form.publicVersion"
-            :active-value="1"
-            :inactive-value="0"
-          />
         </el-form-item>
         <el-form-item label="强制更新" prop="forceUpdate">
-          <el-switch
+          <el-switch v-model="form.forceUpdate" :active-value="1" :inactive-value="0" />
-            v-model="form.forceUpdate"
-            :active-value="1"
-            :inactive-value="0"
-          />
         </el-form-item>
         <el-form-item label="下载验证" prop="downloadVerification">
-          <el-switch
+          <el-switch v-model="form.downloadVerification" :active-value="1" :inactive-value="0" />
-            v-model="form.downloadVerification"
-            :active-value="1"
-            :inactive-value="0"
-          />
         </el-form-item>
         <!--        <el-form-item label="更新对象(-1: 不限制, 白名单id)" prop="updateObject">-->
         <!--        <el-form-item label="更新对象" prop="updateObject">-->
@@ -356,21 +229,13 @@
         <!--          </el-select>-->
         <!--        </el-form-item>-->
         <el-form-item label="有效期开始时间" prop="validityStartTime">
-          <el-date-picker v-model="form.validityStartTime"
+          <el-date-picker v-model="form.validityStartTime" clearable placeholder="请选择有效期开始时间" type="date"
-                          clearable
+            value-format="yyyy-MM-dd">
-                          placeholder="请选择有效期开始时间"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="有效期结束时间" prop="validityEndTime">
-          <el-date-picker v-model="form.validityEndTime"
+          <el-date-picker v-model="form.validityEndTime" clearable placeholder="请选择有效期结束时间" type="date"
-                          clearable
+            value-format="yyyy-MM-dd">
-                          placeholder="请选择有效期结束时间"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -379,9 +244,7 @@
 
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.status!=2" type="primary"
+        <el-button v-if="form.status != 2" type="primary" @click="pubLishForm">发 布
-                   @click="pubLishForm"
-        >发 布
         </el-button>
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -390,8 +253,7 @@
 
 
     <AddPack v-if="packOpen" :systemType="form.systemType" @addPack="addPack" @close="closeAddPack"></AddPack>
-    <DetailModal v-if="openDetail" :detailId="detailId" :openDetail="openDetail" @close="closeDetailModal"
+    <DetailModal v-if="openDetail" :detailId="detailId" :openDetail="openDetail" @close="closeDetailModal"></DetailModal>
-    ></DetailModal>
   </div>
 </template>
 
@@ -462,7 +324,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         sysApkName: null,
-        appCode: Cookies.get('Admin-Application-Id')
+        appCode: Cookies.get('Admin-Application-appCode')
       },
       // 表单校验
       rules: {