heyang 2 éve
szülő
commit
5121b93632

+ 3 - 2
src/views/system/apkfile/index.vue

@@ -162,7 +162,7 @@
               maxLength="20"
               placeholder="请输入版本名称"
               clearable
-
+              style="width: 300px"
             />
           </el-form-item>
           <el-form-item label="版本编号" prop="version" label-width="90px">
@@ -171,7 +171,7 @@
               maxLength="20"
               placeholder="请输入版本编号"
               clearable
-
+              style="width: 300px"
             />
           </el-form-item>
           <el-form-item label="版本描述" prop="version" label-width="90px">
@@ -181,6 +181,7 @@
               maxLength="1000"
               placeholder="请输入版本描述"
               clearable
+              style="width: 300px"
             />
           </el-form-item>
           <el-form-item label="类型" prop="onepcType" style="display: block" label-width="90px">

+ 12 - 84
src/views/system/apkfileList/index.vue

@@ -23,28 +23,18 @@
 
     <el-table v-loading="loading" :data="logList">
       <el-table-column label="版本名称" align="left" prop="versionName" />
-      <el-table-column label="设备名称" align="left" prop="hardName" />
+      <el-table-column label="版本号" align="left" prop="version" />
       <el-table-column label="设备类型" align="left" prop="onepcType" >
         <template slot-scope="scope">
           <p>{{scope.row.onepcType==1?'管控一体机':(scope.row.onepcType==2?'考试一体机':'')}}</p>
         </template>
       </el-table-column>
-      <el-table-column label="版本名称" align="left" prop="versionName" />
-      <el-table-column label="版本编号" align="left" prop="version" />
-      <el-table-column label="状态" align="left" prop="logStatus" >
-        <template slot-scope="scope">
-          <p>{{scope.row.logStatus==0?'安装失败':(scope.row.logStatus==1?'安装成功':(scope.row.logStatus==2?'安装中':(scope.row.logStatus==3?'上传成功':'')))}}</p>
-        </template>
-      </el-table-column>
+      <el-table-column label="说明信息" align="left" prop="apkInfo" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="left" prop="createBy" />
       <el-table-column label="创建时间" align="left" prop="createTime" />
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="left" width="160">
         <template slot-scope="scope">
-          <div class="button-box">
-            <p class="table-button-one-90"
-               @click="handleUpdate(scope.row)"
-               v-hasPermi="['laboratory:apkfile:edit']"
-            ><i class="el-icon-edit-outline"></i>修改</p>
-          </div>
+          <p style="color: #0183fa;cursor: pointer">下载</p>
         </template>
       </el-table-column>
     </el-table>
@@ -79,10 +69,6 @@
         total: 0,
         // apk需要对应升级的日志表格数据
         logList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -91,44 +77,17 @@
           versionName: null,
           onepcType: null,
         },
-        // 表单参数
-        form: {},
-        // 表单校验
-        rules: {
-          deptId: [
-            { required: true, message: "请选择院系", trigger: "blur" }
-          ],
-          apkId: [
-            { required: true, message: "分类名称不能为空", trigger: "blur" }
-          ],
-          onepcType2: [
-            { required: true, message: "设备类型不能为空", trigger: "blur" }
-          ],
-        },
-        onepcTypeList:[
-          {id:1,name:"管控一体机",},
-          {id:2,name:"考试一体机",}
-        ],
-        //实验室列表
-        subjectOptions: [],
-        //文件列表
-        fileList:[],
-
-        //apk列表
-        apkIdOptions:[],
-        //apk 列表查询参数
-        apkQueryParams: {
-          pageNum: 1,
-          pageSize:20,
-        },
-
       };
     },
     created() {
       this.getList();
     },
     methods: {
-
+      handleClick(index,row,doType){
+        if(doType='download'){
+          window.open(window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + row.apkFileUpload)
+        }
+      },
       /** 查询apk需要对应升级的日志列表 */
       getList() {
         this.loading = true;
@@ -138,37 +97,6 @@
           this.loading = false;
         });
       },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-      },
-      // 取消按钮
-      cancelUp() {
-        if (this.loading){
-          return
-        }
-        this.fileList=[];
-        // this.$refs.uploader.files = [];
-        // this.$refs.uploader.fileList = [];
-        //this.$refs.uploader.allRemove();
-        this.fileData = {};
-        this.openUp = false;
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          onepcHardwareNum: null,
-          apkUploadId: null,
-          logStatus: 0,
-          createBy: null,
-          createTime: null,
-          updateBy: null,
-          updateTime: null,
-          remark: null
-        };
-        this.resetForm("form");
-      },
       /** 搜索按钮操作 */
       handleQuery() {
         this.queryParams.pageNum = 1;
@@ -176,8 +104,8 @@
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.searchValue='';
-        this.resetForm("queryForm");
+        this.queryParams.versionName='';
+        this.queryParams.onepcType='';
         this.handleQuery();
       },
     }