优化

src/views/index.vue

@@ -56,19 +56,19 @@
 
 <style scoped>
 .home {
+    gap: 32px;
+    display: flex;
     min-height: 100%;
+    flex-direction: column;
     padding: 32px 40px 48px;
     background: radial-gradient(circle at top left, #e6f4ff 0, #ffffff 50%, #f5f7fb 100%);
-    display: flex;
-    flex-direction: column;
-    gap: 32px;
 }
 
 .home-hero {
-    display: grid;
-    grid-template-columns: minmax(0, 2fr) minmax(280px, 1.4fr);
     gap: 32px;
+    display: grid;
     align-items: stretch;
+    grid-template-columns: minmax(0, 2fr) minmax(280px, 1.4fr);
 }
 
 .home-hero-main {

src/views/planMange/dailyPlan/forms/projectForm.vue

@@ -626,7 +626,7 @@ const nonNegativeIntegerPattern = /^(0|[1-9]\d*)$/
 const rules = computed(() => ({
     plannedWorkload: [
         { required: true, message: '请输入计划工作量', trigger: 'blur' },
-        { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' },
+        { pattern: /^[0-9]\d*$/, message: '请输入非负整数', trigger: 'blur' },
     ],
     highAltitudePersonnelList: [
         { required: true, message: '请选择拟投入高处作业人员', trigger: 'change' },

src/views/planMange/dailyPlan/forms/repairForm.vue

@@ -711,7 +711,7 @@ const nonNegativeIntegerPattern = /^(0|[1-9]\d*)$/
 const rules = computed(() => ({
     plannedWorkload: [
         { required: true, message: '请输入计划工作量', trigger: 'blur' },
-        { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' },
+        { pattern: /^[0-9]\d*$/, message: '请输入非负整数', trigger: 'blur' },
     ],
     highAltitudePersonnelList: [
         { required: true, message: '请选择拟投入高处作业人员', trigger: 'change' },

src/views/planMange/dailyPlan/forms/runForm.vue

@@ -416,7 +416,7 @@ const percentagePattern = /^(0|[1-9]\d?|100)$/
 const rules = computed(() => ({
     plannedWorkload: [
         { required: true, message: '请输入计划工作量', trigger: 'blur' },
-        { pattern: positiveIntegerPattern, message: '请输入正整数', trigger: 'blur' },
+        { pattern: /^[0-9]\d*$/, message: '请输入非负整数', trigger: 'blur' },
     ],
     planPersonnelList: [{ required: true, message: '请选择拟投入作业人员', trigger: 'change' }],
     proposedLongTimeCar: [

src/views/planMange/monthlyPlan/edit.vue

@@ -732,7 +732,7 @@ const rules = computed(() => {
     ]
     baseRules.planAuxiliaryWorkerNum = [
         { required: true, message: '请输入辅助工人员数量', trigger: 'blur' },
-        { pattern: /^[1-9]\d*$/, message: '请输入正整数', trigger: 'blur' },
+        { pattern: /^[0-9]\d*$/, message: '请输入非负整数', trigger: 'blur' },
     ]
     baseRules.planSkilledWorkerDay = [
         { required: true, message: '请输入工日', trigger: 'blur' },

src/views/system/post/index.vue

@@ -1,154 +1,185 @@
 <template>
-   <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="岗位编码" prop="postCode">
-            <el-input
-               v-model="queryParams.postCode"
-               placeholder="请输入岗位编码"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="岗位名称" prop="postName">
-            <el-input
-               v-model="queryParams.postName"
-               placeholder="请输入岗位名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="岗位状态" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
-
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:post:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="success"
-               plain
-               icon="Edit"
-               :disabled="single"
-               @click="handleUpdate"
-               v-hasPermi="['system:post:edit']"
-            >修改</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['system:post:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['system:post:export']"
-            >导出</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
-
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="岗位编号" align="center" prop="postId" />
-         <el-table-column label="岗位编码" align="center" prop="postCode" />
-         <el-table-column label="岗位名称" align="center" prop="postName" />
-         <el-table-column label="岗位排序" align="center" prop="postSort" />
-         <el-table-column label="状态" align="center" prop="status">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">删除</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
-
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
-
-      <!-- 添加或修改岗位对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
-            <el-form-item label="岗位名称" prop="postName">
-               <el-input v-model="form.postName" placeholder="请输入岗位名称" />
-            </el-form-item>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
             <el-form-item label="岗位编码" prop="postCode">
-               <el-input v-model="form.postCode" placeholder="请输入编码名称" />
+                <el-input
+                    v-model="queryParams.postCode"
+                    placeholder="请输入岗位编码"
+                    clearable
+                    style="width: 200px"
+                    @keyup.enter="handleQuery"
+                />
             </el-form-item>
-            <el-form-item label="岗位顺序" prop="postSort">
-               <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+            <el-form-item label="岗位名称" prop="postName">
+                <el-input
+                    v-model="queryParams.postName"
+                    placeholder="请输入岗位名称"
+                    clearable
+                    style="width: 200px"
+                    @keyup.enter="handleQuery"
+                />
             </el-form-item>
-            <el-form-item label="岗位状态" prop="status">
-               <el-radio-group v-model="form.status">
-                  <el-radio
-                     v-for="dict in sys_normal_disable"
-                     :key="dict.value"
-                     :value="dict.value"
-                  >{{ dict.label }}</el-radio>
-               </el-radio-group>
+            <el-form-item label="状态" prop="status">
+                <el-select
+                    v-model="queryParams.status"
+                    placeholder="岗位状态"
+                    clearable
+                    style="width: 200px"
+                >
+                    <el-option
+                        v-for="dict in sys_normal_disable"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                    />
+                </el-select>
             </el-form-item>
-            <el-form-item label="备注" prop="remark">
-               <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
             </el-form-item>
-         </el-form>
-         <template #footer>
-            <div class="dialog-footer">
-               <el-button type="primary" @click="submitForm">确 定</el-button>
-               <el-button @click="cancel">取 消</el-button>
-            </div>
-         </template>
-      </el-dialog>
-   </div>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button
+                    type="primary"
+                    plain
+                    icon="Plus"
+                    @click="handleAdd"
+                    v-hasPermi="['system:post:add']"
+                >
+                    新增
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="success"
+                    plain
+                    icon="Edit"
+                    :disabled="single"
+                    @click="handleUpdate"
+                    v-hasPermi="['system:post:edit']"
+                    >修改</el-button
+                >
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="danger"
+                    plain
+                    icon="Delete"
+                    :disabled="multiple"
+                    @click="handleDelete"
+                    v-hasPermi="['system:post:remove']"
+                >
+                    删除
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                    type="warning"
+                    plain
+                    icon="Download"
+                    @click="handleExport"
+                    v-hasPermi="['system:post:export']"
+                    >导出</el-button
+                >
+            </el-col>
+            <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="岗位编号" align="center" prop="postId" />
+            <el-table-column label="岗位编码" align="center" prop="postCode" />
+            <el-table-column label="岗位名称" align="center" prop="postName" />
+            <el-table-column label="岗位排序" align="center" prop="postSort" />
+            <el-table-column label="状态" align="center" prop="status">
+                <template #default="scope">
+                    <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime) }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column
+                label="操作"
+                width="180"
+                align="center"
+                class-name="small-padding fixed-width"
+            >
+                <template #default="scope">
+                    <el-button
+                        link
+                        type="primary"
+                        icon="Edit"
+                        @click="handleUpdate(scope.row)"
+                        v-hasPermi="['system:post:edit']"
+                        >修改</el-button
+                    >
+                    <el-button
+                        link
+                        type="primary"
+                        icon="Delete"
+                        @click="handleDelete(scope.row)"
+                        v-hasPermi="['system:post:remove']"
+                        >删除</el-button
+                    >
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+        />
+
+        <!-- 添加或修改岗位对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="岗位名称" prop="postName">
+                    <el-input v-model="form.postName" placeholder="请输入岗位名称" />
+                </el-form-item>
+                <el-form-item label="岗位编码" prop="postCode">
+                    <el-input v-model="form.postCode" placeholder="请输入编码名称" />
+                </el-form-item>
+                <el-form-item label="岗位顺序" prop="postSort">
+                    <el-input-number v-model="form.postSort" controls-position="right" :min="0" />
+                </el-form-item>
+                <el-form-item label="岗位状态" prop="status">
+                    <el-radio-group v-model="form.status">
+                        <el-radio
+                            v-for="dict in sys_normal_disable"
+                            :key="dict.value"
+                            :value="dict.value"
+                            >{{ dict.label }}</el-radio
+                        >
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+                </el-form-item>
+            </el-form>
+            <template #footer>
+                <div class="dialog-footer">
+                    <el-button type="primary" @click="submitForm">确 定</el-button>
+                    <el-button @click="cancel">取 消</el-button>
+                </div>
+            </template>
+        </el-dialog>
+    </div>
 </template>
 
 <script setup name="Post">
-import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post"
+import { listPost, addPost, delPost, getPost, updatePost } from '@/api/system/post'
 
 const { proxy } = getCurrentInstance()
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable")
+const { sys_normal_disable } = proxy.useDict('sys_normal_disable')
 
 const postList = ref([])
 const open = ref(false)
@@ -158,129 +189,137 @@ const ids = ref([])
 const single = ref(true)
 const multiple = ref(true)
 const total = ref(0)
-const title = ref("")
+const title = ref('')
 
 const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    postCode: undefined,
-    postName: undefined,
-    status: undefined
-  },
-  rules: {
-    postName: [{ required: true, message: "岗位名称不能为空", trigger: "blur" }],
-    postCode: [{ required: true, message: "岗位编码不能为空", trigger: "blur" }],
-    postSort: [{ required: true, message: "岗位顺序不能为空", trigger: "blur" }],
-  }
+    form: {},
+    queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        postCode: undefined,
+        postName: undefined,
+        status: undefined,
+    },
+    rules: {
+        postName: [{ required: true, message: '岗位名称不能为空', trigger: 'blur' }],
+        postCode: [{ required: true, message: '岗位编码不能为空', trigger: 'blur' }],
+        postSort: [{ required: true, message: '岗位顺序不能为空', trigger: 'blur' }],
+    },
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询岗位列表 */
 function getList() {
-  loading.value = true
-  listPost(queryParams.value).then(response => {
-    postList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
+    loading.value = true
+    listPost(queryParams.value).then((response) => {
+        postList.value = response.rows
+        total.value = response.total
+        loading.value = false
+    })
 }
 
 /** 取消按钮 */
 function cancel() {
-  open.value = false
-  reset()
+    open.value = false
+    reset()
 }
 
 /** 表单重置 */
 function reset() {
-  form.value = {
-    postId: undefined,
-    postCode: undefined,
-    postName: undefined,
-    postSort: 0,
-    status: "0",
-    remark: undefined
-  }
-  proxy.resetForm("postRef")
+    form.value = {
+        postId: undefined,
+        postCode: undefined,
+        postName: undefined,
+        postSort: 0,
+        status: '0',
+        remark: undefined,
+    }
+    proxy.resetForm('postRef')
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
+    queryParams.value.pageNum = 1
+    getList()
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
+    proxy.resetForm('queryRef')
+    handleQuery()
 }
 
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.postId)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
+    ids.value = selection.map((item) => item.postId)
+    single.value = selection.length != 1
+    multiple.value = !selection.length
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加岗位"
+    reset()
+    open.value = true
+    title.value = '添加岗位'
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset()
-  const postId = row.postId || ids.value
-  getPost(postId).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改岗位"
-  })
+    reset()
+    const postId = row.postId || ids.value
+    getPost(postId).then((response) => {
+        form.value = response.data
+        open.value = true
+        title.value = '修改岗位'
+    })
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["postRef"].validate(valid => {
-    if (valid) {
-      if (form.value.postId != undefined) {
-        updatePost(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addPost(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
-    }
-  })
+    proxy.$refs['postRef'].validate((valid) => {
+        if (valid) {
+            if (form.value.postId != undefined) {
+                updatePost(form.value).then((response) => {
+                    proxy.$modal.msgSuccess('修改成功')
+                    open.value = false
+                    getList()
+                })
+            } else {
+                addPost(form.value).then((response) => {
+                    proxy.$modal.msgSuccess('新增成功')
+                    open.value = false
+                    getList()
+                })
+            }
+        }
+    })
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.postId || ids.value
-  proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function() {
-    return delPost(postIds)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+    const postIds = row.postId || ids.value
+    proxy.$modal
+        .confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？')
+        .then(function () {
+            return delPost(postIds)
+        })
+        .then(() => {
+            getList()
+            proxy.$modal.msgSuccess('删除成功')
+        })
+        .catch(() => {})
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("system/post/export", {
-    ...queryParams.value
-  }, `post_${new Date().getTime()}.xlsx`)
+    proxy.download(
+        'system/post/export',
+        {
+            ...queryParams.value,
+        },
+        `post_${new Date().getTime()}.xlsx`,
+    )
 }
 
 getList()