更新

src/views/app_update/edit.vue

@@ -8,12 +8,27 @@
       @confirm="handleSubmit"
       @close="handleClose"
     >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        label-width="120px"
+        :rules="formRules"
+      >
         <el-form-item label="标题" prop="title">
-                    <el-input v-model="formData.title" clearable placeholder="请输入标题" />
+          <el-input
+            v-model="formData.title"
+            clearable
+            placeholder="请输入标题"
+          />
         </el-form-item>
         <el-form-item label="内容" prop="content">
-                    <el-input v-model="formData.content" clearable placeholder="请输入内容" />
+          <el-input
+            v-model="formData.content"
+            clearable
+            placeholder="请输入内容"
+            type="textarea"
+            autosize
+          />
         </el-form-item>
         <el-form-item label="APP类型" prop="type">
           <el-radio-group v-model="formData.type" placeholder="请选择APP类型">
@@ -27,13 +42,34 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="版本" prop="version">
-                    <el-input v-model="formData.version" clearable placeholder="请输入版本" />
+          <el-input
+            v-model="formData.version"
+            clearable
+            placeholder="请输入版本,例如1.0.1"
+          />
         </el-form-item>
-                <el-form-item label="app链接" prop="dow_url">
+        <el-form-item label="更新包文件" prop="dow_url">
-                    <el-input v-model="formData.dow_url" clearable placeholder="请输入app链接" />
+          <el-upload
+            class="upload-demo"
+            style="width: 100%"
+            drag
+            :headers="{ Token: userStore.token }"
+            action="https://worker-task.lihaink.cn/adminapi/upload/file"
+            :limit="1"
+            :on-success="handleFile"
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">文件拖入或点击上传</div>
+            <template #tip>
+              <div class="el-upload__tip">请上传APK/IPA/WGT文件</div>
+            </template>
+          </el-upload>
         </el-form-item>
         <el-form-item label="是否强制更新" prop="force">
-                    <el-radio-group v-model="formData.force" placeholder="请选择是否强制更新">
+          <el-radio-group
+            v-model="formData.force"
+            placeholder="请选择是否强制更新"
+          >
             <el-radio
               v-for="(item, index) in dictData.app_force_quiet"
               :key="index"
@@ -44,7 +80,10 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="是否静默更新" prop="quiet">
-                    <el-radio-group v-model="formData.quiet" placeholder="请选择是否静默更新">
+          <el-radio-group
+            v-model="formData.quiet"
+            placeholder="请选择是否静默更新"
+          >
             <el-radio
               v-for="(item, index) in dictData.app_force_quiet"
               :key="index"
@@ -60,94 +99,95 @@
 </template>
 
 <script lang="ts" setup name="appUpdateEdit">
-import type { FormInstance } from 'element-plus'
+import type { FormInstance } from "element-plus";
-import Popup from '@/components/popup/index.vue'
+import Popup from "@/components/popup/index.vue";
-import { apiAppUpdateAdd, apiAppUpdateEdit, apiAppUpdateDetail } from '@/api/app_update'
+import {
-import { timeFormat } from '@/utils/util'
+  apiAppUpdateAdd,
-import type { PropType } from 'vue'
+  apiAppUpdateEdit,
+  apiAppUpdateDetail,
+} from "@/api/app_update";
+import { timeFormat } from "@/utils/util";
+import type { PropType } from "vue";
+import useUserStore from "@/stores/modules/user";
 defineProps({
   dictData: {
     type: Object as PropType<Record<string, any[]>>,
-        default: () => ({})
+    default: () => ({}),
-    }
+  },
-})
+});
-const emit = defineEmits(['success', 'close'])
+const emit = defineEmits(["success", "close"]);
-const formRef = shallowRef<FormInstance>()
+const formRef = shallowRef<FormInstance>();
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
-const mode = ref('add')
+const mode = ref("add");
 
+const userStore = useUserStore();
+
+const handleFile = (e: any) => {
+  formData.dow_url = e.data.uri;
+};
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑app更新' : '新增app更新'
+  return mode.value == "edit" ? "编辑app更新" : "新增app更新";
-})
+});
 
 // 表单数据
 const formData = reactive({
-    id: '',
+  id: "",
-    title: '',
+  title: "",
-    content: '',
+  content: "",
-    type: '',
+  type: "",
-    version: '',
+  version: "",
-    dow_url: '',
+  dow_url: "",
-    force: '',
+  force: "",
-    quiet: '',
+  quiet: "",
-})
+});
-
 
 // 表单验证
-const formRules = reactive<any>({
+const formRules = reactive<any>({});
-
-})
-
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
   for (const key in formData) {
     if (data[key] != null && data[key] != undefined) {
       //@ts-ignore
-            formData[key] = data[key]
+      formData[key] = data[key];
     }
   }
-    
+};
-    
-}
 
 const getDetail = async (row: Record<string, any>) => {
   const data = await apiAppUpdateDetail({
-        id: row.id
+    id: row.id,
-    })
+  });
-    setFormData(data)
+  setFormData(data);
-}
+};
-
 
 // 提交按钮
 const handleSubmit = async () => {
-    await formRef.value?.validate()
+  await formRef.value?.validate();
-    const data = { ...formData,  }
+  const data = { ...formData };
-    mode.value == 'edit' 
+  mode.value == "edit"
     ? await apiAppUpdateEdit(data)
-        : await apiAppUpdateAdd(data)
+    : await apiAppUpdateAdd(data);
-    popupRef.value?.close()
+  popupRef.value?.close();
-    emit('success')
+  emit("success");
-}
+};
 
 //打开弹窗
-const open = (type = 'add') => {
+const open = (type = "add") => {
-    mode.value = type
+  mode.value = type;
-    popupRef.value?.open()
+  popupRef.value?.open();
-}
+};
 
 // 关闭回调
 const handleClose = () => {
-    emit('close')
+  emit("close");
-}
+};
-
-
 
 defineExpose({
   open,
   setFormData,
-    getDetail
+  getDetail,
-})
+});
 </script>

src/views/app_update/index.vue

@@ -1,19 +1,32 @@
 <template>
   <div>
     <el-card class="!border-none mb-4" shadow="never">
-            <el-form
+      <el-form class="mb-[-16px]" :model="queryParams" inline>
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
         <el-form-item label="标题" prop="title">
-                    <el-input class="w-[280px]" v-model="queryParams.title" clearable placeholder="请输入标题" />
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.title"
+            clearable
+            placeholder="请输入标题"
+          />
         </el-form-item>
         <el-form-item label="内容" prop="content">
-                    <el-input class="w-[280px]" v-model="queryParams.content" clearable placeholder="请输入内容" />
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.content"
+            clearable
+            placeholder="请输入内容"
+            type="textarea"
+            autosize
+          />
         </el-form-item>
         <el-form-item label="APP类型" prop="type">
-                    <el-select class="w-[280px]" v-model="queryParams.type" clearable placeholder="请选择APP类型">
+          <el-select
+            class="w-[280px]"
+            v-model="queryParams.type"
+            clearable
+            placeholder="请选择APP类型"
+          >
             <el-option label="全部" value=""></el-option>
             <el-option
               v-for="(item, index) in dictData.app_type"
@@ -24,13 +37,20 @@
           </el-select>
         </el-form-item>
         <el-form-item label="版本" prop="version">
-                    <el-input class="w-[280px]" v-model="queryParams.version" clearable placeholder="请输入版本" />
+          <el-input
-                </el-form-item>
+            class="w-[280px]"
-                <el-form-item label="app链接" prop="dow_url">
+            v-model="queryParams.version"
-                    <el-input class="w-[280px]" v-model="queryParams.dow_url" clearable placeholder="请输入app链接" />
+            clearable
+            placeholder="请输入版本"
+          />
         </el-form-item>
         <el-form-item label="是否强制更新" prop="force">
-                    <el-select class="w-[280px]" v-model="queryParams.force" clearable placeholder="请选择是否强制更新">
+          <el-select
+            class="w-[280px]"
+            v-model="queryParams.force"
+            clearable
+            placeholder="请选择是否强制更新"
+          >
             <el-option label="全部" value=""></el-option>
             <el-option
               v-for="(item, index) in dictData.app_force_quiet"
@@ -41,7 +61,12 @@
           </el-select>
         </el-form-item>
         <el-form-item label="是否静默更新" prop="quiet">
-                    <el-select class="w-[280px]" v-model="queryParams.quiet" clearable placeholder="请选择是否静默更新">
+          <el-select
+            class="w-[280px]"
+            v-model="queryParams.quiet"
+            clearable
+            placeholder="请选择是否静默更新"
+          >
             <el-option label="全部" value=""></el-option>
             <el-option
               v-for="(item, index) in dictData.app_force_quiet"
@@ -82,15 +107,25 @@
             </template>
           </el-table-column>
           <el-table-column label="版本" prop="version" show-overflow-tooltip />
-                    <el-table-column label="app链接" prop="dow_url" show-overflow-tooltip />
+          <el-table-column
+            label="app链接"
+            prop="dow_url"
+            show-overflow-tooltip
+          />
           <el-table-column label="是否强制更新" prop="force">
             <template #default="{ row }">
-                            <dict-value :options="dictData.app_force_quiet" :value="row.force" />
+              <dict-value
+                :options="dictData.app_force_quiet"
+                :value="row.force"
+              />
             </template>
           </el-table-column>
           <el-table-column label="是否静默更新" prop="quiet">
             <template #default="{ row }">
-                            <dict-value :options="dictData.app_force_quiet" :value="row.quiet" />
+              <dict-value
+                :options="dictData.app_force_quiet"
+                :value="row.quiet"
+              />
             </template>
           </el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
@@ -119,73 +154,78 @@
         <pagination v-model="pager" @change="getLists" />
       </div>
     </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    <edit-popup
+      v-if="showEdit"
+      ref="editRef"
+      :dict-data="dictData"
+      @success="getLists"
+      @close="showEdit = false"
+    />
   </div>
 </template>
 
 <script lang="ts" setup name="appUpdateLists">
-import { usePaging } from '@/hooks/usePaging'
+import { usePaging } from "@/hooks/usePaging";
-import { useDictData } from '@/hooks/useDictOptions'
+import { useDictData } from "@/hooks/useDictOptions";
-import { apiAppUpdateLists, apiAppUpdateDelete } from '@/api/app_update'
+import { apiAppUpdateLists, apiAppUpdateDelete } from "@/api/app_update";
-import { timeFormat } from '@/utils/util'
+import { timeFormat } from "@/utils/util";
-import feedback from '@/utils/feedback'
+import feedback from "@/utils/feedback";
-import EditPopup from './edit.vue'
+import EditPopup from "./edit.vue";
 
-const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+const editRef = shallowRef<InstanceType<typeof EditPopup>>();
 // 是否显示编辑框
-const showEdit = ref(false)
+const showEdit = ref(false);
-
 
 // 查询条件
 const queryParams = reactive({
-    title: '',
+  title: "",
-    content: '',
+  content: "",
-    type: '',
+  type: "",
-    version: '',
+  version: "",
-    dow_url: '',
+  dow_url: "",
-    force: '',
+  force: "",
-    quiet: ''
+  quiet: "",
-})
+});
 
 // 选中数据
-const selectData = ref<any[]>([])
+const selectData = ref<any[]>([]);
 
 // 表格选择后回调事件
 const handleSelectionChange = (val: any[]) => {
-    selectData.value = val.map(({ id }) => id)
+  selectData.value = val.map(({ id }) => id);
-}
+};
 
 // 获取字典数据
-const { dictData } = useDictData('app_type,app_force_quiet')
+const { dictData } = useDictData("app_type,app_force_quiet");
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
   fetchFun: apiAppUpdateLists,
-    params: queryParams
+  params: queryParams,
-})
+});
 
 // 添加
 const handleAdd = async () => {
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('add')
+  editRef.value?.open("add");
-}
+};
 
 // 编辑
 const handleEdit = async (data: any) => {
-    showEdit.value = true
+  showEdit.value = true;
-    await nextTick()
+  await nextTick();
-    editRef.value?.open('edit')
+  editRef.value?.open("edit");
-    editRef.value?.setFormData(data)
+  editRef.value?.setFormData(data);
-}
+};
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
+  await feedback.confirm("确定要删除？");
-    await apiAppUpdateDelete({ id })
+  await apiAppUpdateDelete({ id });
-    getLists()
+  getLists();
-}
+};
 
-getLists()
+getLists();
 </script>
 

src/views/task_template/edit.vue

@@ -423,6 +423,7 @@ const clickTaskAdmin = async () => {
 const handleSubmit = async () => {
   await formRef.value?.validate();
   const data = { ...formData };
+  if (data.type != 32) data.extend = {}; // 不为三轮车任务时,过滤三轮车配置
   mode.value == "edit"
     ? await apiTaskTemplateEdit(data)
     : await apiTaskTemplateAdd(data);