Merge branch 'master' of https://gitee.com/dmc_qq/etc-project

src/crud/index.vue

@@ -7,7 +7,7 @@
         </search-operation>
 
         <!-- CRUD组件 -->
-        <crud-operation style="margin-top:10px" @add="add" @edit="edit" @remove="remove" @refresh="refresh"
+        <crud-operation v-if="false" style="margin-top:10px" @add="add" @edit="edit" @remove="remove" @refresh="refresh"
             @search="search" :DEdit="EStart" :DDelete="DStart" :SSearch="SSearch">
         </crud-operation>
 
@@ -97,7 +97,13 @@
         tableData: { //表单数据
             type: Array,
             default: function () {
-                return []
+                return [{
+                    name: '测试数据'
+                }, {
+                    name: '测试数据'
+                }, {
+                    name: '测试数据'
+                }]
             }
         }
     })

src/data/cardAfter/cardRenewal.ts

@@ -0,0 +1,89 @@
+export const Data = {
+    search: {
+        fileOne: ''
+    },
+    table: {
+        style: '',
+        extend: [{
+            type: 'index',
+            label: '序号',
+            width: '80'
+        }],
+        field: [ //表格
+            {
+                prop: 'name',
+                label: '客户名称',
+                width: '120',
+                overflow: true,
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入客户名称'
+                }
+            }, {
+                prop: 'name',
+                label: '证件类型',
+                width: '180',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入证件类型'
+                }
+            }, {
+                prop: 'name',
+                label: '证件号码',
+                width: '180',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入证件号码'
+                }
+            }, {
+                prop: 'name',
+                label: '车牌号码',
+                width: '120',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入车牌号码'
+                }
+            }, {
+                prop: 'name',
+                label: '卡号',
+                width: '180',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入卡号'
+                }
+            }, {
+                prop: 'name',
+                label: '卡片状态',
+                width: '120',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入卡片状态'
+                }
+            },
+            {
+                prop: 'name',
+                label: '到期时间',
+                width: '180',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入到期时间'
+                }
+            }, 
+        ],
+        border: true,
+        operateTitle: '操作',
+        operateFixed: true,
+        isOperate: true,
+        operate: {
+            edit: true,
+            delete: true
+        }
+    }
+}

src/data/cardAfter/initiativeHangUp.ts

@@ -0,0 +1,100 @@
+export const Data = {
+    search: {
+        fileOne: '',
+        fileTwo: '',
+        fileThree: ''
+    },
+    table: {
+        style: '',
+        extend: [{
+            type: 'index',
+            label: '序号',
+            width: '80'
+        }],
+        field: [ //表格
+            {
+                prop: 'name',
+                label: '客户名称',
+                width: '120',
+                overflow: true,
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入客户名称'
+                }
+            }, {
+                prop: 'name',
+                label: '车牌号码',
+                width: '120',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入车牌号码'
+                }
+            }, {
+                prop: 'name',
+                label: '车牌颜色',
+                width: '120',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入车牌颜色'
+                }
+            }, {
+                prop: 'name',
+                label: '卡号',
+                width: '180',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '卡号'
+                }
+            }, {
+                prop: 'name',
+                label: '卡片状态',
+                width: '120',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入卡片状态'
+                }
+            }, {
+                prop: 'name',
+                label: '卡片类型',
+                width: '120',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: '请输入卡片类型'
+                }
+            },
+            {
+                prop: 'name',
+                label: 'OBU编号',
+                width: '180',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: 'OBU编号'
+                }
+            }, {
+                prop: 'name',
+                label: 'OBU状态',
+                width: '120',
+                form: {
+                    required: true,
+                    type: 'input',
+                    placeholder: 'OBU状态'
+                }
+            },
+        ],
+        border: true,
+        operateTitle: '操作',
+        operateFixed: true,
+        isOperate: true,
+        operate: {
+            edit: true,
+            delete: true
+        }
+    }
+}

src/data/menuData.ts

@@ -75,7 +75,7 @@ export const list = [
                     children: []
                 }, {
                     title: '卡签注销',
-                    path: 'home',
+                    path: 'TABActivate',
                     children: []
                 }]
             }, {

src/layout/components/Head.vue

@@ -25,7 +25,7 @@
         <template #reference>
           <!-- 头像 -->
           <div style="margin-left: 20px">
-            <el-avatar @click="visible = !visible" shape="square" :size="40" :src="ImgHead" />
+            <el-avatar @click="visible = !visible" shape="square" :size="40" src="/logo2.png" />
           </div>
         </template>
       </el-popover>

src/layout/components/SidebarItem.vue

@@ -4,7 +4,7 @@
     <el-sub-menu v-if="item.children && item.children.length > 0" :index="item.title + ',' + item.path">
       <template #title>
         <Item />
-        <span>{{ item.title }}</span>
+        <span style="font-size:14px">{{ item.title }}</span>
       </template>
       <el-menu-item-group>
         <sidebarItem :list="item.children"></sidebarItem>
@@ -16,7 +16,7 @@
       <el-menu-item class="el-menu-item" :index="item.title + ',' + item.path">
         <!-- <Item /> -->
         <template #title>
-          <span>{{ item.title }}</span>
+          <span style="font-size:14px">{{ item.title }}</span>
         </template>
       </el-menu-item>
     </router-link>

src/layout/components/TabControl.vue

@@ -1,7 +1,7 @@
 <template>
     <!-- 标签选项卡模块 :model-value="props.editableTabsValue"(只读) -->
     <el-tabs v-model="editableTabsValue.index" type="card" @tab-click="tabClick" @tab-remove="removeTab"
-        @contextmenu.stop.prevent.native="openMenu($event)">
+        @contextmenu.prevent.native="openMenu($event)">
         <el-tab-pane v-for="item in editableTabs" :key="item.name" :closable="item.start" :label="item.title"
             :name="item.name">
             <slot></slot>
@@ -99,8 +99,8 @@
                     data.indexes = index
                 }
             })
-            data.left = event.clientX + 15
-            data.top = event.clientY + 15
+            data.left = event.clientX - 200
+            data.top = event.clientY - 65
             data.visible = true
         }
     }

src/layout/index.vue

@@ -10,7 +10,8 @@
         <!-- 菜单头部部分 -->
         <div class="as-gravity-center-start" style="height: 70px;">
           <img rel="icon" src="/logo2.png" style="width: 60px;height: 60px;" />
-          <span class="as-bold" style="font-size:18px;color: #FFFFFF" v-show="menuStart.menuIsExpansion">D-UI框架模板</span>
+          <!-- D-UI框架模板 -->
+          <span class="as-bold" style="font-size:18px;color: #FFFFFF" v-show="menuStart.menuIsExpansion">黔通智联</span>
         </div>
 
         <!-- 菜单主体部分 -->

src/router/index.ts

@@ -171,7 +171,7 @@ const routes: RouteRecordRaw[] = [
       }, {
         path: '/views/dengmingcong/TABActivate/TABActivate',
         name: 'TABActivate',
-        meta: { title: '标签重新激活服务', isAuth: true }, //标签重新激活服务
+        meta: { title: '卡签注销', isAuth: true }, //卡签注销
         components: {
           key: () => import('@/views/dengmingcong/TABActivate/TABActivate.vue'),
         },

src/views/dengmingcong/TABActivate/TABActivate.vue

@@ -1,10 +1,68 @@
 <template>
-    <div>
-        标签重新激活服务
-    </div>
+    <!-- 卡签注销 -->
+    <CRUD :homeData="Data" text="123">
+        <template #search="{ searchCondition }">
+            <!-- 搜索 监听回车 @keyup.enter.native="search"-->
+            <el-input v-model="searchCondition.fileOne" clearable placeholder="卡号" style="width: 200px;" />
+            <el-input v-model="searchCondition.fileTwo" clearable placeholder="车牌号码"
+                style="width: 200px;margin: 0 10px 0 10px;" />
+            <el-select v-model="searchCondition.fileThree" placeholder="--请输入车牌颜色--" style="margin: 0 10px 0 10px;">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+            <el-button type="primary" icon="CreditCard">读卡</el-button>
+        </template>
+    </CRUD>
 </template>
 <script setup lang="ts">
+    import CRUD from "@/crud/index.vue";
+    import {
+        Data
+    } from '@/data/cardAfter/initiativeHangUp' //表单配置
+    import {
+        tableData
+    } from "@/data/tableData" //表单数据
 
+    const options = [{
+            value: 'Option1',
+            label: '蓝色',
+        },
+        {
+            value: 'Option2',
+            label: '黄色',
+        },
+        {
+            value: 'Option3',
+            label: '黑色',
+        },
+        {
+            value: 'Option4',
+            label: '白色',
+        },
+        {
+            value: 'Option5',
+            label: '渐变绿色',
+        },
+        {
+            value: 'Option6',
+            label: '黄绿双拼色',
+        },
+        {
+            value: 'Option7',
+            label: '蓝白渐变色',
+        },
+        {
+            value: 'Option8',
+            label: '未确定',
+        },
+        {
+            value: 'Option9',
+            label: '绿色',
+        },
+        {
+            value: 'Option10',
+            label: '红色',
+        },
+    ]
 </script>
 <style lang="scss" scoped>
 

src/views/dengmingcong/cardFillDo/cardFillDo.vue

@@ -5,9 +5,6 @@
             <!-- 搜索 监听回车 @keyup.enter.native="search"-->
             <el-input v-model="searchCondition.fileOne" clearable placeholder="卡号" style="width: 200px;" />
             <el-input v-model="searchCondition.fileTwo" clearable placeholder="车牌号码" style="width: 200px;margin: 0 10px 0 10px;" />
-            <!-- 日期搜索 -->
-            <!-- <el-date-picker v-model="searchCondition.date" type="date" placeholder="输入日期搜索"
-                style="width: 200px;margin: 0 10px 0 10px;" value-format="YYYY-MM-DD" /> -->
             <el-select v-model="searchCondition.fileThree" placeholder="--请输入车牌颜色--" style="margin-right: 10px;">
                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>

src/views/dengmingcong/cardRenewal/cardRenewal.vue

@@ -1,10 +1,60 @@
 <template>
-    <div>
-        卡签续期
-    </div>
+    <!-- 卡签续期 -->
+    <CRUD :homeData="Data" text="123">
+        <template #search="{ searchCondition }">
+            <!-- 搜索 监听回车 @keyup.enter.native="search"-->
+            <el-input v-model="searchCondition.fileOne" clearable placeholder="卡号" style="width: 200px;margin-right: 10px;" />
+            <el-button type="primary" icon="CreditCard">读卡</el-button>
+        </template>
+    </CRUD>
 </template>
 <script setup lang="ts">
+    import CRUD from "@/crud/index.vue";
+    import {
+        Data
+    } from '@/data/cardAfter/cardRenewal' //表单配置
 
+    const options = [{
+            value: 'Option1',
+            label: '蓝色',
+        },
+        {
+            value: 'Option2',
+            label: '黄色',
+        },
+        {
+            value: 'Option3',
+            label: '黑色',
+        },
+        {
+            value: 'Option4',
+            label: '白色',
+        },
+        {
+            value: 'Option5',
+            label: '渐变绿色',
+        },
+        {
+            value: 'Option6',
+            label: '黄绿双拼色',
+        },
+        {
+            value: 'Option7',
+            label: '蓝白渐变色',
+        },
+        {
+            value: 'Option8',
+            label: '未确定',
+        },
+        {
+            value: 'Option9',
+            label: '绿色',
+        },
+        {
+            value: 'Option10',
+            label: '红色',
+        },
+    ]
 </script>
 <style lang="scss" scoped>
 

src/views/dengmingcong/initiativeHangUp/initiativeHangUp.vue

@@ -1,10 +1,68 @@
 <template>
-    <div>
-        主动挂起服务
-    </div>
+    <!-- 主动挂起服务 -->
+    <CRUD :homeData="Data" text="123">
+        <template #search="{ searchCondition }">
+            <!-- 搜索 监听回车 @keyup.enter.native="search"-->
+            <el-input v-model="searchCondition.fileOne" clearable placeholder="卡号" style="width: 200px;" />
+            <el-input v-model="searchCondition.fileTwo" clearable placeholder="车牌号码"
+                style="width: 200px;margin: 0 10px 0 10px;" />
+            <el-select v-model="searchCondition.fileThree" placeholder="--请输入车牌颜色--" style="margin: 0 10px 0 10px;">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+            <el-button type="primary" icon="CreditCard">读卡</el-button>
+        </template>
+    </CRUD>
 </template>
 <script setup lang="ts">
+    import CRUD from "@/crud/index.vue";
+    import {
+        Data
+    } from '@/data/cardAfter/initiativeHangUp' //表单配置
+    import {
+        tableData
+    } from "@/data/tableData" //表单数据
 
+    const options = [{
+            value: 'Option1',
+            label: '蓝色',
+        },
+        {
+            value: 'Option2',
+            label: '黄色',
+        },
+        {
+            value: 'Option3',
+            label: '黑色',
+        },
+        {
+            value: 'Option4',
+            label: '白色',
+        },
+        {
+            value: 'Option5',
+            label: '渐变绿色',
+        },
+        {
+            value: 'Option6',
+            label: '黄绿双拼色',
+        },
+        {
+            value: 'Option7',
+            label: '蓝白渐变色',
+        },
+        {
+            value: 'Option8',
+            label: '未确定',
+        },
+        {
+            value: 'Option9',
+            label: '绿色',
+        },
+        {
+            value: 'Option10',
+            label: '红色',
+        },
+    ]
 </script>
 <style lang="scss" scoped>
 

src/views/dengmingcong/passivityHangUp/passivityHangUp.vue

@@ -1,10 +1,68 @@
 <template>
-    <div>
-        被动挂起服务
-    </div>
+    <!-- 被动挂起服务 -->
+    <CRUD :homeData="Data" text="123">
+        <template #search="{ searchCondition }">
+            <!-- 搜索 监听回车 @keyup.enter.native="search"-->
+            <el-input v-model="searchCondition.fileOne" clearable placeholder="卡号" style="width: 200px;" />
+            <el-input v-model="searchCondition.fileTwo" clearable placeholder="车牌号码"
+                style="width: 200px;margin: 0 10px 0 10px;" />
+            <el-select v-model="searchCondition.fileThree" placeholder="--请输入车牌颜色--" style="margin: 0 10px 0 10px;">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+            <el-button type="primary" icon="CreditCard">读卡</el-button>
+        </template>
+    </CRUD>
 </template>
 <script setup lang="ts">
+    import CRUD from "@/crud/index.vue";
+    import {
+        Data
+    } from '@/data/cardAfter/initiativeHangUp' //表单配置
+    import {
+        tableData
+    } from "@/data/tableData" //表单数据
 
+    const options = [{
+            value: 'Option1',
+            label: '蓝色',
+        },
+        {
+            value: 'Option2',
+            label: '黄色',
+        },
+        {
+            value: 'Option3',
+            label: '黑色',
+        },
+        {
+            value: 'Option4',
+            label: '白色',
+        },
+        {
+            value: 'Option5',
+            label: '渐变绿色',
+        },
+        {
+            value: 'Option6',
+            label: '黄绿双拼色',
+        },
+        {
+            value: 'Option7',
+            label: '蓝白渐变色',
+        },
+        {
+            value: 'Option8',
+            label: '未确定',
+        },
+        {
+            value: 'Option9',
+            label: '绿色',
+        },
+        {
+            value: 'Option10',
+            label: '红色',
+        },
+    ]
 </script>
 <style lang="scss" scoped>
 

src/views/system/login/Login.vue

@@ -33,9 +33,6 @@
     reactive,
     ref
   } from 'vue'
-  import {
-    FormInstance
-  } from 'element-plus'
   import {
     useRoute,
     useRouter
@@ -53,7 +50,7 @@
   //引入滑块组件
   import SlidingBlockVerifyTwo from '@/components/SlidingBlockVerifyTwo/SlidingBlockVerifyTwo.vue'
 
-  const form = ref < FormInstance > ()
+  const form = ref()
   const router = useRouter()
   const bgVideo = bgTwo
   const verify = ref(false)