Merge branch 'master' of http://121.41.40.202:3000/web/for_client into master

src/config/app.js

@@ -3,7 +3,7 @@ import theme from './theme'
 //默认配置
 export default {
     theme: 'light', //用户可选择类型：auto,light, dark
-    color: theme.color[1],
+    color: theme.color[0],
     homeTheme: theme.home[4],
     indexModel:'1',
 }

src/config/theme.js

@@ -13,11 +13,9 @@ import bg11 from '~src/assets/home/fd8d568edf61d6824a5a2e3e8e4a0ec4.jpg'
 //主题配置
 export default {
     color: [
-        { name: 'green', color: '#1ECC95', label: '森绿' }, { name: 'blue', color: '#204DA0', label: '蓝色' },
-        { name: 'cyan', color: '#37c0fe', label: '天青' }, { name: 'purple', color: '#8044de', label: '姹紫' },
-        { name: 'mauve', color: '#b745cb', label: '木槿' }, { name: 'pink', color: '#e03997', label: '桃粉' },
-        { name: 'red', color: '#e54d42', label: '嫣红' }, { name: 'orange', color: '#f37b1d', label: '橘橙' },
-        { name: 'yellow', color: '#fbbd08', label: '明黄' }, { name: 'brown', color: '#a5673f', label: '棕褐' },
+        { name: 'blue', color: '#204DA0', label: '深蓝' },
+        { name: 'light-blue', color: '#409eff', label: '浅蓝' },
+        { name: 'black1', color: '#2c3643', label: '黑色' },
     ],
     home: [
         { name: 'theme-1', bg: bg1 },

src/router/modules/base.js

@@ -388,6 +388,36 @@ export default [
             },
         ],
     },
+    {
+        path: '/patrol',
+        name: 'patrol-menu',
+        redirect: '/patrol/safe',
+        meta: { title: '巡检管理' },
+        component: Layout,
+        children: [
+            {
+                path: '/patrol/safe',
+                name: 'patrol-menu-safe',
+                meta: { title: '安全巡检' },
+                component: () => import('~src/views/patrol/safe.vue'),
+            },
+            {
+                path: '/patrol/add',
+                name: 'patrol-menu-add',
+                meta: { title: '安全巡检' },
+                component: () => import('~src/views/patrol/add.vue'),
+            },
+            {
+                path: '/patrol/manage',
+                name: 'patrol-menu-manage',
+                meta: { title: '安全巡检' },
+                component: () => import('~src/views/patrol/manage.vue'),
+            },
+           
+          
+            
+        ],
+    },
     {
         path: '/other',
         name: 'other',

src/styles/app/main.scss

@@ -10,6 +10,20 @@ embed {
     overflow: clip !important;
 }
 
+.bg-blue {
+    background-color: #004ca7 !important;
+    color: white !important;
+}
+
+.bg-light-blue {
+    background-color: #409eff !important;
+    color: white !important;
+}
+.bg-black1 {
+    background-color: #2c3643 !important;
+    color: white !important;
+}
+
 .hc-page-layout-box .hc-layout-left-box {
     margin-right: 16px;
 }

src/views/patrol/add.vue

@@ -0,0 +1,11 @@
+<!--  -->
+<template>
+    <div>新增巡检</div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+</script>
+
+<style lang='scss' scoped>
+</style>

src/views/patrol/manage.vue

@@ -0,0 +1,11 @@
+<!--  -->
+<template>
+    <div>整改管理</div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+</script>
+
+<style lang='scss' scoped>
+</style>

src/views/patrol/safe.vue

@@ -0,0 +1,55 @@
+<!--  -->
+<template>
+    <div class="hc-page-box">
+        <HcNewCard>
+            <HcTable is-new :column="tableColumn" :datas="tableData">
+                <template #key3="{ row }">
+                    <span class="text-link" @click="tableRowEdit(row)">{{ row?.key3 }}</span>
+                </template>
+                <template #action="{ row }">
+                    <el-link type="primary">复核</el-link>
+                    <el-link type="primary">修改</el-link>
+                    <el-link type="primary">删除</el-link>
+                </template>
+            </HcTable>
+            <template #action>
+                <HcPages :pages="searchForm" @change="pageChange" />
+            </template>
+        </HcNewCard>
+    </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+const tableColumn = [
+    { key: 'key1', name: '项目' },
+    { key: 'key2', name: '检查类别' },
+    { key: 'key3', name: '检查名称' },
+    { key: 'key4', name: '复核检查状态' },
+    { key: 'key5', name: '是否需要整改' },
+    { key: 'key6', name: '需求整改完成日期' },
+    { key: 'key7', name: '实际整改完成日期' },
+    { key: 'action', name: '操作' },
+]
+const tableData = ref([
+    { key1: 'xx至xx高速公路-演示项（本地测试）', key2: '安全巡检', key3: '原地面检查', key4:'检查状态', key5:'需要整改', key6:'2023-09-27', key7:'2023-09-27' },
+    { key1: 'xx至xx高速公路-演示项（本地测试）', key2: '安全巡检', key3: '原地面检查', key4:'检查状态', key5:'需要整改', key6:'2023-09-27', key7:'2023-09-27' },
+    { key1: 'xx至xx高速公路-演示项（本地测试）', key2: '安全巡检', key3: '原地面检查', key4:'检查状态', key5:'需要整改', key6:'2023-09-27', key7:'2023-09-27' },
+])
+//搜索表单
+const searchForm = ref({
+    current: 1, size: 20, total: 0,
+})
+//分页被点击
+const pageChange = ({ current, size }) => {
+    searchForm.value.current = current
+    searchForm.value.size = size
+    // getTableData()
+}
+const tableRowEdit = ()=>{
+    
+}
+</script>
+
+<style lang='scss' scoped>
+</style>