From ea28959d814ba41fdb13a6e4bb3758f5b6d19ca8 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 31 Aug 2023 16:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app_update/edit.vue    | 284 +++++++++++++-----------
 src/views/app_update/index.vue   | 356 +++++++++++++++++--------------
 src/views/task_template/edit.vue |   1 +
 3 files changed, 361 insertions(+), 280 deletions(-)

diff --git a/src/views/app_update/edit.vue b/src/views/app_update/edit.vue
index 600c3e5..564a683 100644
--- a/src/views/app_update/edit.vue
+++ b/src/views/app_update/edit.vue
@@ -1,153 +1,193 @@
 <template>
-    <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="标题" prop="title">
-                    <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-form-item>
-                <el-form-item label="APP类型" prop="type">
-                    <el-radio-group v-model="formData.type" placeholder="请选择APP类型">
-                        <el-radio 
-                            v-for="(item, index) in dictData.app_type"
-                            :key="index"
-                            :label="parseInt(item.value)"
-                        >
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="版本" prop="version">
-                    <el-input v-model="formData.version" clearable placeholder="请输入版本" />
-                </el-form-item>
-                <el-form-item label="app链接" prop="dow_url">
-                    <el-input v-model="formData.dow_url" clearable placeholder="请输入app链接" />
-                </el-form-item>
-                <el-form-item label="是否强制更新" prop="force">
-                    <el-radio-group v-model="formData.force" placeholder="请选择是否强制更新">
-                        <el-radio 
-                            v-for="(item, index) in dictData.app_force_quiet"
-                            :key="index"
-                            :label="parseInt(item.value)"
-                        >
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-                <el-form-item label="是否静默更新" prop="quiet">
-                    <el-radio-group v-model="formData.quiet" placeholder="请选择是否静默更新">
-                        <el-radio 
-                            v-for="(item, index) in dictData.app_force_quiet"
-                            :key="index"
-                            :label="parseInt(item.value)"
-                        >
-                            {{ item.name }}
-                        </el-radio>
-                    </el-radio-group>
-                </el-form-item>
-            </el-form>
-        </popup>
-    </div>
+  <div class="edit-popup">
+    <popup
+      ref="popupRef"
+      :title="popupTitle"
+      :async="true"
+      width="550px"
+      @confirm="handleSubmit"
+      @close="handleClose"
+    >
+      <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-form-item>
+        <el-form-item label="内容" prop="content">
+          <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类型">
+            <el-radio
+              v-for="(item, index) in dictData.app_type"
+              :key="index"
+              :label="parseInt(item.value)"
+            >
+              {{ item.name }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="版本" prop="version">
+          <el-input
+            v-model="formData.version"
+            clearable
+            placeholder="请输入版本,例如1.0.1"
+          />
+        </el-form-item>
+        <el-form-item label="更新包文件" prop="dow_url">
+          <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
+              v-for="(item, index) in dictData.app_force_quiet"
+              :key="index"
+              :label="parseInt(item.value)"
+            >
+              {{ item.name }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否静默更新" prop="quiet">
+          <el-radio-group
+            v-model="formData.quiet"
+            placeholder="请选择是否静默更新"
+          >
+            <el-radio
+              v-for="(item, index) in dictData.app_force_quiet"
+              :key="index"
+              :label="parseInt(item.value)"
+            >
+              {{ item.name }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+    </popup>
+  </div>
 </template>
 
 <script lang="ts" setup name="appUpdateEdit">
-import type { FormInstance } from 'element-plus'
-import Popup from '@/components/popup/index.vue'
-import { apiAppUpdateAdd, apiAppUpdateEdit, apiAppUpdateDetail } from '@/api/app_update'
-import { timeFormat } from '@/utils/util'
-import type { PropType } from 'vue'
+import type { FormInstance } from "element-plus";
+import Popup from "@/components/popup/index.vue";
+import {
+  apiAppUpdateAdd,
+  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: () => ({})
-    }
-})
-const emit = defineEmits(['success', 'close'])
-const formRef = shallowRef<FormInstance>()
-const popupRef = shallowRef<InstanceType<typeof Popup>>()
-const mode = ref('add')
+  dictData: {
+    type: Object as PropType<Record<string, any[]>>,
+    default: () => ({}),
+  },
+});
+const emit = defineEmits(["success", "close"]);
+const formRef = shallowRef<FormInstance>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>();
+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: '',
-    title: '',
-    content: '',
-    type: '',
-    version: '',
-    dow_url: '',
-    force: '',
-    quiet: '',
-})
-
+  id: "",
+  title: "",
+  content: "",
+  type: "",
+  version: "",
+  dow_url: "",
+  force: "",
+  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]
-        }
+  for (const key in formData) {
+    if (data[key] != null && data[key] != undefined) {
+      //@ts-ignore
+      formData[key] = data[key];
     }
-    
-    
-}
+  }
+};
 
 const getDetail = async (row: Record<string, any>) => {
-    const data = await apiAppUpdateDetail({
-        id: row.id
-    })
-    setFormData(data)
-}
-
+  const data = await apiAppUpdateDetail({
+    id: row.id,
+  });
+  setFormData(data);
+};
 
 // 提交按钮
 const handleSubmit = async () => {
-    await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiAppUpdateEdit(data) 
-        : await apiAppUpdateAdd(data)
-    popupRef.value?.close()
-    emit('success')
-}
+  await formRef.value?.validate();
+  const data = { ...formData };
+  mode.value == "edit"
+    ? await apiAppUpdateEdit(data)
+    : await apiAppUpdateAdd(data);
+  popupRef.value?.close();
+  emit("success");
+};
 
 //打开弹窗
-const open = (type = 'add') => {
-    mode.value = type
-    popupRef.value?.open()
-}
+const open = (type = "add") => {
+  mode.value = type;
+  popupRef.value?.open();
+};
 
 // 关闭回调
 const handleClose = () => {
-    emit('close')
-}
-
-
+  emit("close");
+};
 
 defineExpose({
-    open,
-    setFormData,
-    getDetail
-})
+  open,
+  setFormData,
+  getDetail,
+});
 </script>
diff --git a/src/views/app_update/index.vue b/src/views/app_update/index.vue
index 9d95b38..84502b7 100644
--- a/src/views/app_update/index.vue
+++ b/src/views/app_update/index.vue
@@ -1,191 +1,231 @@
 <template>
-    <div>
-        <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="标题" prop="title">
-                    <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-form-item>
-                <el-form-item label="APP类型" prop="type">
-                    <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"
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="版本" prop="version">
-                    <el-input class="w-[280px]" v-model="queryParams.version" clearable placeholder="请输入版本" />
-                </el-form-item>
-                <el-form-item label="app链接" prop="dow_url">
-                    <el-input class="w-[280px]" v-model="queryParams.dow_url" clearable placeholder="请输入app链接" />
-                </el-form-item>
-                <el-form-item label="是否强制更新" prop="force">
-                    <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"
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="是否静默更新" prop="quiet">
-                    <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"
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="resetPage">查询</el-button>
-                    <el-button @click="resetParams">重置</el-button>
-                </el-form-item>
-            </el-form>
-        </el-card>
-        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['app_update/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
-            <el-button
+  <div>
+    <el-card class="!border-none mb-4" shadow="never">
+      <el-form class="mb-[-16px]" :model="queryParams" inline>
+        <el-form-item label="标题" prop="title">
+          <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="请输入内容"
+            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-option label="全部" value=""></el-option>
+            <el-option
+              v-for="(item, index) in dictData.app_type"
+              :key="index"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="版本" prop="version">
+          <el-input
+            class="w-[280px]"
+            v-model="queryParams.version"
+            clearable
+            placeholder="请输入版本"
+          />
+        </el-form-item>
+        <el-form-item label="是否强制更新" prop="force">
+          <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"
+              :key="index"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="是否静默更新" prop="quiet">
+          <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"
+              :key="index"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="resetPage">查询</el-button>
+          <el-button @click="resetParams">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+      <el-button v-perms="['app_update/add']" type="primary" @click="handleAdd">
+        <template #icon>
+          <icon name="el-icon-Plus" />
+        </template>
+        新增
+      </el-button>
+      <el-button
+        v-perms="['app_update/delete']"
+        :disabled="!selectData.length"
+        @click="handleDelete(selectData)"
+      >
+        删除
+      </el-button>
+      <div class="mt-4">
+        <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" />
+          <el-table-column label="标题" prop="title" show-overflow-tooltip />
+          <el-table-column label="内容" prop="content" show-overflow-tooltip />
+          <el-table-column label="APP类型" prop="type">
+            <template #default="{ row }">
+              <dict-value :options="dictData.app_type" :value="row.type" />
+            </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="是否强制更新" prop="force">
+            <template #default="{ row }">
+              <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"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="120" fixed="right">
+            <template #default="{ row }">
+              <el-button
+                v-perms="['app_update/edit']"
+                type="primary"
+                link
+                @click="handleEdit(row)"
+              >
+                编辑
+              </el-button>
+              <el-button
                 v-perms="['app_update/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+                type="danger"
+                link
+                @click="handleDelete(row.id)"
+              >
                 删除
-            </el-button>
-            <div class="mt-4">
-                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" />
-                    <el-table-column label="标题" prop="title" show-overflow-tooltip />
-                    <el-table-column label="内容" prop="content" show-overflow-tooltip />
-                    <el-table-column label="APP类型" prop="type">
-                        <template #default="{ row }">
-                            <dict-value :options="dictData.app_type" :value="row.type" />
-                        </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="是否强制更新" prop="force">
-                        <template #default="{ row }">
-                            <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" />
-                        </template>
-                    </el-table-column>
-                    <el-table-column label="操作" width="120" fixed="right">
-                        <template #default="{ row }">
-                             <el-button
-                                v-perms="['app_update/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
-                                编辑
-                            </el-button>
-                            <el-button
-                                v-perms="['app_update/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
-                                删除
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </div>
-            <div class="flex mt-4 justify-end">
-                <pagination v-model="pager" @change="getLists" />
-            </div>
-        </el-card>
-        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-    </div>
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="flex mt-4 justify-end">
+        <pagination v-model="pager" @change="getLists" />
+      </div>
+    </el-card>
+    <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 { useDictData } from '@/hooks/useDictOptions'
-import { apiAppUpdateLists, apiAppUpdateDelete } from '@/api/app_update'
-import { timeFormat } from '@/utils/util'
-import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
+import { usePaging } from "@/hooks/usePaging";
+import { useDictData } from "@/hooks/useDictOptions";
+import { apiAppUpdateLists, apiAppUpdateDelete } from "@/api/app_update";
+import { timeFormat } from "@/utils/util";
+import feedback from "@/utils/feedback";
+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: '',
-    content: '',
-    type: '',
-    version: '',
-    dow_url: '',
-    force: '',
-    quiet: ''
-})
+  title: "",
+  content: "",
+  type: "",
+  version: "",
+  dow_url: "",
+  force: "",
+  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
-})
+  fetchFun: apiAppUpdateLists,
+  params: queryParams,
+});
 
 // 添加
 const handleAdd = async () => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('add')
-}
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("add");
+};
 
 // 编辑
 const handleEdit = async (data: any) => {
-    showEdit.value = true
-    await nextTick()
-    editRef.value?.open('edit')
-    editRef.value?.setFormData(data)
-}
+  showEdit.value = true;
+  await nextTick();
+  editRef.value?.open("edit");
+  editRef.value?.setFormData(data);
+};
 
 // 删除
 const handleDelete = async (id: number | any[]) => {
-    await feedback.confirm('确定要删除？')
-    await apiAppUpdateDelete({ id })
-    getLists()
-}
+  await feedback.confirm("确定要删除？");
+  await apiAppUpdateDelete({ id });
+  getLists();
+};
 
-getLists()
+getLists();
 </script>
 
diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index 22321ce..2e41b43 100644
--- a/src/views/task_template/edit.vue
+++ b/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);