fix: 修改离线包模块的字段为正确的字段，加上字典服务

sf-ui/src/layout/components/index.js

@@ -1,6 +1,6 @@
 export { default as AppMain } from './AppMain'
 export { default as Navbar } from './Navbar'
-export { default as NavbarNew } from './NavbarNew'
+// export { default as NavbarNew } from './NavbarNew'
 export { default as Settings } from './Settings'
 export { default as Sidebar } from './Sidebar/index.vue'
 export { default as TagsView } from './TagsView/index.vue'

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

@@ -8,55 +8,57 @@
       <el-main>
         <div class="form-main">
           <el-form ref="elForm" :model="formData" :rules="rules" label-width="100px" size="medium">
-            <el-form-item label="上传方式" prop="field102">
+            <el-form-item label="上传方式" prop="uploadingType">
-              <el-radio-group v-model="formData.field102" size="medium">
+              <el-radio-group v-model="formData.uploadingType" size="medium">
-                <el-radio v-for="(item, index) in field102Options" :key="index" :disabled="item.disabled"
+                <el-radio v-for="(item, index) in dict.type.sys_apk_uploading_type" :key="index"
+                          :disabled="item.disabled"
                           :label="item.value"
                 >{{ item.label }}
                 </el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="activeTabs===1" label="安装包名称" prop="field103">
+            <el-form-item v-if="activeTabs==='1'" label="安装包名称" prop="sysApkName">
-              <el-input v-model="formData.field103" :style="{width: '100%'}" clearable placeholder="请输入安装包名称">
+              <el-input v-model="formData.sysApkName" :style="{width: '100%'}" clearable placeholder="请输入安装包名称">
               </el-input>
             </el-form-item>
-            <el-form-item v-else label="模块包名称" prop="field107">
+            <!--            <el-form-item v-else label="模块包名称" prop="field107">-->
-              <el-input v-model="formData.field107" :style="{width: '100%'}" clearable placeholder="请输入模块包名称">
+            <!--              <el-input v-model="formData.field107" :style="{width: '100%'}" clearable placeholder="请输入模块包名称">-->
+            <!--              </el-input>-->
+            <!--            </el-form-item>-->
+            <el-form-item label="版本号" prop="version">
+              <el-input v-model="formData.version" :style="{width: '100%'}" clearable placeholder="请输入版本号">
               </el-input>
             </el-form-item>
-            <el-form-item label="版本号" prop="field104">
+            <el-form-item label="安装包文件" prop="sysApk">
-              <el-input v-model="formData.field104" :style="{width: '100%'}" clearable placeholder="请输入版本号">
+              <el-upload ref="sysApk" v-model="formData.sysApk" :action="field101Action"
-              </el-input>
+                         :before-upload="field101BeforeUpload"
-            </el-form-item>
-            <el-form-item label="安装包文件" prop="field101">
-              <el-upload ref="field101" :action="field101Action" :before-upload="field101BeforeUpload"
                          :file-list="field101fileList"
               >
                 <el-button icon="el-icon-upload" size="small" type="primary">上传文件</el-button>
               </el-upload>
             </el-form-item>
-            <el-form-item label="安装包大小" prop="field105">
+            <el-form-item label="安装包大小" prop="sysApkSize">
-              <el-input v-model="formData.field105" :style="{width: '100%'}" clearable placeholder="请输入安装包大小">
+              <el-input v-model="formData.sysApkSize" :style="{width: '100%'}" clearable placeholder="请输入安装包大小">
               </el-input>
             </el-form-item>
-            <el-form-item label="适用系统" prop="field106">
+            <el-form-item label="安装包类型" prop="sysType">
-              <el-radio-group v-model="formData.field106" size="medium">
+              <el-radio-group v-model="formData.sysType" size="medium">
-                <el-radio v-for="(item, index) in field106Options" :key="index" :disabled="item.disabled"
+                <el-radio v-for="(item, index) in  dict.type.sys_apk_type" :key="index" :disabled="item.disabled"
                           :label="item.value"
                 >{{ item.label }}
                 </el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="activeTabs!='1'" label="适用模块" prop="configName">
+            <!--            <el-form-item v-if="activeTabs!='1'" label="适用模块" prop="configName">-->
-              <el-select v-model="formData.field108" clearable placeholder="请选择对应的模块">
+            <!--              <el-select v-model="formData.field108" clearable placeholder="请选择对应的模块">-->
-                <el-option
+            <!--                <el-option-->
-                    v-for="dict in dict.type.sys_yes_no"
+            <!--                    v-for="dict in dict.type.sys_yes_no"-->
-                    :key="dict.value"
+            <!--                    :key="dict.value"-->
-                    :label="dict.label"
+            <!--                    :label="dict.label"-->
-                    :value="dict.value"
+            <!--                    :value="dict.value"-->
-                />
+            <!--                />-->
-              </el-select>
+            <!--              </el-select>-->
-            </el-form-item>
+            <!--            </el-form-item>-->
             <el-form-item size="large">
               <el-button type="primary" @click="submitForm">提交</el-button>
               <el-button @click="resetForm">重置</el-button>
@@ -73,7 +75,7 @@ import { addINFO, updateINFO } from '@/api/FDS/installList'
 
 export default {
   name: 'InstallAdd',
-  dicts: ['sys_yes_no'],
+  dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
   data() {
     return {
       formData: {
@@ -87,56 +89,34 @@ export default {
         field108: undefined
       },
       rules: {
-        field102: [{
+        uploadingType: [
-          required: true,
+          { required: true, message: '上传类型不能为空', trigger: 'change' }
-          message: '上传方式不能为空',
+        ],
-          trigger: 'change'
+        sysApkName: [
-        }],
+          { required: true, message: '安装包名称不能为空', trigger: 'blur' }
-        field103: [{
+        ],
-          required: true,
+        version: [
-          message: '请输入安装包名称',
+          { required: true, message: '版本号不能为空', trigger: 'blur' }
-          trigger: 'blur'
+        ],
-        }],
+        sysType: [
-        field107: [{
+          { required: true, message: '安装包类型不能为空', trigger: 'change' }
-          required: true,
+        ]
-          message: '请输入模块包名称',
-          trigger: 'blur'
-        }],
-        field105: [],
-        field106: []
       },
       field101Action: 'https://jsonplaceholder.typicode.com/posts/',
       field101fileList: [],
-      field102Options: [{
-        'label': '在线上传',
-        'value': 1
-      }, {
-        'label': '离线上传',
-        'value': 2
-      }],
-      field106Options: [{
-        'label': 'Android',
-        'value': 'Android'
-      }, {
-        'label': 'IOS',
-        'value': 'IOS'
-      }, {
-        'label': '鸿蒙',
-        'value': 'HarmonyOS'
-      }],
       activeTabs: '1'
     }
   },
   computed: {},
   mounted() {
-    this.activeTabs = this.$route.params.activeTabs
+    this.activeTabs = this.$route.query.activeTabs
   },
   methods: {
     /** 提交按钮 */
     submitForm() {
       this.$refs['elForm'].validate(valid => {
         if (valid) {
-          if (this.form.configId != undefined) {
+          if (this.form.id != undefined) {
             updateINFO(this.form).then(response => {
               this.$modal.msgSuccess('修改成功')
               this.closeModal()

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

@@ -183,7 +183,7 @@ import { delINFO, listINFO } from '@/api/FDS/installList'
 
 export default {
   name: 'InstallationList',
-  dicts: ['sys_yes_no'],
+  dicts: ['sys_apk_uploading_type', 'uploading_status', 'sys_apk_type'],
   data() {
     return {
       // 遮罩层