软件包管理增加版本类型

admin.ui.plus-master/.env.development

@@ -4,7 +4,7 @@ ENV = 'development'
 # 本地环境接口地址
 # VITE_API_URL = 'http://ipos.biz:8070'
 #  VITE_API_URL = 'http://192.168.0.202:8003'
-# VITE_API_URL = 'http://localhost:8003'
+# VITE_API_URL = 'http://localhost:8000'
 VITE_API_URL = 'http://dev.hsfuel.com:8070'
 # VITE_API_URL = 'http://47.101.220.106:8070'
 # VITE_API_URL = 'http://ipos.biz:8070'

admin.ui.plus-master/.env.production

@@ -10,7 +10,7 @@ VITE_PUBLIC_PATH = '/'
 # 线上环境接口地址
 # VITE_API_URL = 'http://ipos.biz:8070'
 # VITE_API_URL = 'http://localhost:8000'
-# VITE_API_URL = 'http://localhost:8003'
+# VITE_API_URL = 'http://localhost:8000'
 VITE_API_URL = 'http://dev.hsfuel.com:8070'
 # VITE_API_URL = 'http://47.101.220.106:8070'
 # VITE_API_URL = 'http://ipos.biz:8070'

admin.ui.plus-master/src/api/admin/deviceAuthorization/softwarePackageManagementDto.ts

@@ -16,6 +16,8 @@ export  interface softwarePackageManagement_SearchFilter{
   softwareName?: string,
   /**版本 */
   version?: string,
+  /**版本类型 */
+  versionType?: string,
   /**设备类型*/
   equipmentType?: string | number,
   /**开始的时间 */
@@ -43,6 +45,8 @@ export  interface softwarePackageManagement_TableData{
   softwareName?: string | null,
   /**版本号*/
   version?: string | null,
+  /**版本类型*/
+  versionType?: string | null,
   /**说明*/
   explain?: string | null,
   /**状态*/

admin.ui.plus-master/src/stores/globalCacheStore.ts

@@ -22,7 +22,8 @@ const arr =
     'qrBookFileStatus',
     'pcbaTestState',
     'pcbaBoardType',
-    'pcbaTestType'
+    'pcbaTestType',
+    'softwareVersionType'
   ]
 
 export const useGlobalCacheStore = defineStore('globalCacheStore', {

admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/components/form-edit.vue

@@ -32,6 +32,13 @@
               <el-input v-model="formData.editData.version" placeholder="请输入版本号" clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="软件版本类型" prop="versionType">
+              <el-select  v-model="formData.editData.versionType" placeholder="请选择软件版本类型" >
+                <el-option v-for="(value, key) in versionType" :key="key" :label="value[1].name"  :value="Number(value[1].value)" />
+              </el-select>
+            </el-form-item>
+          </el-col>     
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="软件包更新说明" prop="explain">
               <el-input v-model="formData.editData.explain" placeholder="请输入说明" rows="6" clearable type="textarea"></el-input>
@@ -100,6 +107,10 @@ const equipmentType = ref(globalCacheStore.getGlobalStore().get('equipmentType')
 /**软件类型缓存*/
 const softwareType = ref(globalCacheStore.getGlobalStore().get('softwareType'))
 
+/**软件版本类型缓存*/
+const versionType = ref(globalCacheStore.getGlobalStore().get('softwareVersionType'))
+
+
 enum Form {
   ADD,
   UPDATE
@@ -146,6 +157,9 @@ const rules = reactive<FormRules>({
     { required: true, message: '请输入版本号', trigger: 'blur' },
     { validator: validateVersion, trigger: 'blur' }
   ],
+  versionType: [
+    { required: true, message: '请选择版本型', trigger: 'blur' },
+  ],
 })
 
 /**

admin.ui.plus-master/src/views/admin/authorize/softwarePackageManagement/index.vue

@@ -25,6 +25,15 @@
                   <el-input v-model="softwareData.Filter.version" placeholder="请输入版本号" clearable></el-input>
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
+                <el-form-item label="版本类型">
+                  <el-select v-model="softwareData.Filter.versionType" placeholder="请选择版本类型" clearable>
+                    <el-option label="所有" :value="''"></el-option>
+                    <el-option v-for="(value, key) in softwareVersionType" :key="key" :label="value[1].name"
+                      :value="Number(value[1].value)" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="8" :xl="6" class="mb20">
                 <el-form-item label="设备类型">
                   <el-select v-model="softwareData.Filter.equipmentType" placeholder="请选择设备类型" clearable>
@@ -104,7 +113,7 @@
               </template>
             </el-table-column>
             <el-table-column label="操作" fixed="right" header-align="center" align="center" class="right-operation"
-              width="160">
+              width="120">
 
               <template #default="{ row }">
                 <el-link class="my-el-link mr12 ml12" v-if="row.state === 0" type="primary" icon="ele-Upload"
@@ -179,6 +188,8 @@ const globalCacheStore = useGlobalCacheStore()
 const equipmentType = ref(globalCacheStore.getGlobalStore().get('equipmentType'))
 /** 软件类型缓存 */
 const softwareType = ref(globalCacheStore.getGlobalStore().get('softwareType'))
+/** 软件版本类型缓存 */
+const softwareVersionType = ref(globalCacheStore.getGlobalStore().get('softwareVersionType'))
 /** 软件包状态缓存 */
 const softwarePackageStatus = ref(globalCacheStore.getGlobalStore().get('softwarePackageStatus'))
 
@@ -217,6 +228,7 @@ const softwareData = reactive({
     { prop: 'equipmentType', label: '设备类型' },
     { prop: 'softwareName', label: '软件名称' },
     { prop: 'version', label: '版本号' },
+    { prop: 'versionType', label: '版本类型' },
     { prop: 'state', label: '状态' },
     { prop: 'numberOfDownloads', label: '下载次数' },
     { prop: 'remark', label: '备注' },
@@ -260,6 +272,7 @@ const flattenObject = (obj, parentKey = '') => {
 const init = async () => {
   softwareData.loading = true
   try {
+      console.log(softwareData.Filter)
     const res: any = await new SoftwarePackageManagementApi().getPageData({ 
       ...softwareData.pageInput, 
       Filter: softwareData.Filter 
@@ -329,6 +342,7 @@ const resetQuery = () => {
   softwareData.Filter.projectName = ''
   softwareData.Filter.softwareName = ''
   softwareData.Filter.version = ''
+  softwareData.Filter.versionType = ''
   softwareData.Filter.equipmentType = ''
   softwareData.Filter.state = null
   softwareData.Filter.BeginTime = null
@@ -448,6 +462,14 @@ const onCurrentChange = () => {
 /** 处理表格数据显示 */
 const getProp = (val, row) => {
   if (val === 'softwareType') return softwareType.value.get(String(row[val])).name
+  if (val === 'versionType') 
+  {
+    if(row[val] == null)
+    {
+      return "";
+    }
+    return softwareVersionType.value.get(String(row[val])).name
+  }
   if (val === 'equipmentType') return equipmentType.value.get(String(row[val])).name
   if (val === 'state') return softwarePackageStatus.value.get(String(row[val])).name
   return row[val]