Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/customerBuler-crm/package-lock.json

@@ -8,6 +8,8 @@
       "name": "customerbuler-crm",
       "version": "0.0.0",
       "dependencies": {
+        "@element-plus/icons-vue": "^2.3.1",
+        "@zmjs/form-design": "^0.1.16",
         "axios": "^1.6.7",
         "echarts": "^5.5.0",
         "element-plus": "^2.5.6",
@@ -1022,6 +1024,119 @@
         }
       }
     },
+    "node_modules/@zmjs/form-design": {
+      "version": "0.1.16",
+      "resolved": "https://registry.npmjs.org/@zmjs/form-design/-/form-design-0.1.16.tgz",
+      "integrity": "sha512-RCjB1JbV1BKJrQ14jxez8WI72oKN3JXsMkLskZyni7tVEPjmTP8s/R3ZfFzchV0FVuZ4FZnRYNYrSDxBnpqmuw==",
+      "dependencies": {
+        "@vueuse/core": "^8.2.3",
+        "ace-builds": "^1.4.14",
+        "element-plus": "^2.1.10",
+        "lodash-es": "^4.17.21",
+        "prismjs": "^1.28.0",
+        "vue": "^3.2.31",
+        "vue-prism-editor": "^2.0.0-alpha.2",
+        "vuedraggable": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/zhiyuanzmj"
+      }
+    },
+    "node_modules/@zmjs/form-design/node_modules/@types/web-bluetooth": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz",
+      "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A=="
+    },
+    "node_modules/@zmjs/form-design/node_modules/@vueuse/core": {
+      "version": "8.9.4",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.9.4.tgz",
+      "integrity": "sha512-B/Mdj9TK1peFyWaPof+Zf/mP9XuGAngaJZBwPaXBvU3aCTZlx3ltlrFFFyMV4iGBwsjSCeUCgZrtkEj9dS2Y3Q==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.14",
+        "@vueuse/metadata": "8.9.4",
+        "@vueuse/shared": "8.9.4",
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.1.0",
+        "vue": "^2.6.0 || ^3.2.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@zmjs/form-design/node_modules/@vueuse/core/node_modules/@vueuse/shared": {
+      "version": "8.9.4",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.9.4.tgz",
+      "integrity": "sha512-wt+T30c4K6dGRMVqPddexEVLa28YwxW5OFIPmzUHICjphfAuBFTTdDoyqREZNDOFJZ44ARH1WWQNCUK8koJ+Ag==",
+      "dependencies": {
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.1.0",
+        "vue": "^2.6.0 || ^3.2.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@zmjs/form-design/node_modules/@vueuse/core/node_modules/vue-demi": {
+      "version": "0.14.7",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
+      "integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==",
+      "hasInstallScript": true,
+      "bin": {
+        "vue-demi-fix": "bin/vue-demi-fix.js",
+        "vue-demi-switch": "bin/vue-demi-switch.js"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.0.0-rc.1",
+        "vue": "^3.0.0-0 || ^2.6.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@zmjs/form-design/node_modules/@vueuse/metadata": {
+      "version": "8.9.4",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.9.4.tgz",
+      "integrity": "sha512-IwSfzH80bnJMzqhaapqJl9JRIiyQU0zsRGEgnxN6jhq7992cPUJIRfV+JHRIZXjYqbwt07E1gTEp0R0zPJ1aqw==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/ace-builds": {
+      "version": "1.32.7",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.32.7.tgz",
+      "integrity": "sha512-ziv35kaYELFw4suWlotz/Xsl1/1LhWAbwFoD3zIgCgP9gXGECEsAM4GhiB0T0xZdmQjyv6hmAzO280g0+n4vGw=="
+    },
     "node_modules/ansi-regex": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
@@ -2247,6 +2362,14 @@
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
+    "node_modules/prismjs": {
+      "version": "1.29.0",
+      "resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
+      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -2480,6 +2603,11 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/sortablejs": {
+      "version": "1.14.0",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
+      "integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
+    },
     "node_modules/source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
@@ -2841,6 +2969,17 @@
         }
       }
     },
+    "node_modules/vue-prism-editor": {
+      "version": "2.0.0-alpha.2",
+      "resolved": "https://registry.npmjs.org/vue-prism-editor/-/vue-prism-editor-2.0.0-alpha.2.tgz",
+      "integrity": "sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.0"
+      }
+    },
     "node_modules/vue-router": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.3.0.tgz",
@@ -2882,6 +3021,17 @@
         "typescript": "*"
       }
     },
+    "node_modules/vuedraggable": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-4.1.0.tgz",
+      "integrity": "sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==",
+      "dependencies": {
+        "sortablejs": "1.14.0"
+      },
+      "peerDependencies": {
+        "vue": "^3.0.1"
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",

fhKeeper/formulahousekeeper/customerBuler-crm/package.json

@@ -10,6 +10,8 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@element-plus/icons-vue": "^2.3.1",
+    "@zmjs/form-design": "^0.1.16",
     "axios": "^1.6.7",
     "echarts": "^5.5.0",
     "element-plus": "^2.5.6",

fhKeeper/formulahousekeeper/customerBuler-crm/src/components/ReEcharts/index.vue

@@ -6,7 +6,7 @@ import { ref, watch, onMounted, onBeforeUnmount } from 'vue';
 interface Props {
 	width?: string;
 	height?: string;
-	option: EChartsOption;
+	option: Partial<EChartsOption>;
 }
 const props = withDefaults(defineProps<Props>(), {
 	width: '100%',
@@ -18,7 +18,7 @@ const myChartsRef = ref<HTMLDivElement>();
 let myChart: ECharts;
 // eslint-disable-next-line no-undef
 // let timer: string | number | NodeJS.Timeout | undefined;
-let timer: number | undefined;
+let timer: any;
 
 // 初始化echarts
 const initChart = (): void => {
@@ -47,7 +47,7 @@ onMounted(() => {
 onBeforeUnmount(() => {
 	window.removeEventListener('resize', resizeChart);
 	clearTimeout(timer);
-	timer = 0;
+	timer = null;
 });
 
 watch(

fhKeeper/formulahousekeeper/customerBuler-crm/src/main.ts

@@ -1,15 +1,20 @@
 import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import ElementPlus from 'element-plus'
+import "./TailWindCss/index.css";
 import 'element-plus/dist/index.css'
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 import App from './App.vue'
 import router from './router/index'
 import "./styles.css"
-import "./TailWindCss/index.css";
 import * as echarts from 'echarts';
 
 const app = createApp(App)
 
+for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
+  app.component(key, component)
+}
+
 app.config.globalProperties.$echarts = echarts;
 app
   .use(ElementPlus)

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue

@@ -1,256 +1,51 @@
 <template>
-    <div @click="tologin">登录</div>
-    <h2> {{ store.name }}</h2>
-    <h1 @click="changeName">修改名称</h1>
-    <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" />
-    <div @click="networkRequest()">点击发起网络请求</div>
-    <div class="abc fonsSize30">测试sass样式</div>
-    <div class="text-pink-200">1111</div>
-    <div :style="{ width: '1230px', height: '350px' }">
-        <Echarts :option="option" />
+  <div class="loginView w-screen h-screen overflow-hidden pt-20">
+    <div class="w-96 h-3/5 bg-white m-auto border-t-8 border-blue-400 shadow-xl rounded-md pl-9 pr-9">
+      <div class="m-auto pt-4">
+        <img class="w-1/5 h-1/5 m-auto" :src="loginLogo" alt="">
+      </div>
+      <h2 class="text-xl text-center pt-4 font-bold">客户管家</h2>
+      <div class="pt-5">
+        <el-input :prefix-icon="UserFilled" size="large" class="mt-4" v-model="username" placeholder="账号/手机号" />
+        <el-input :prefix-icon="Lock" show-password size="large" class="mt-8" v-model="password" placeholder="密码" />
+        <div class="pt-8">
+          <el-button type="primary" size="large" class="w-full" :loading="loginLoading" @click="login">登录</el-button>
+        </div>
+      </div>
+      <el-divider content-position="center">或</el-divider>
+      <div class="m-auto mb-5">
+        <img class="w-9 m-auto p-1 rounded-full border-blue-300 border-2 cursor-pointer" :src="qiyeweixin" alt="">
+      </div>
+      <div class="flex justify-between">
+        <div class="cursor-pointer text-blue-400">联系客服</div>
+        <div class="flex justify-around">
+          <div class="mr-4 cursor-pointer text-blue-400">使用说明</div>
+          <div class="cursor-pointer text-blue-400">企业注册</div>
+        </div>
+      </div>
     </div>
+  </div>
 </template>
-<script lang="ts" setup>
-import { reactive } from 'vue';
-import Echarts from '@/components/ReEcharts/index.vue';
-import { useRoute, useRouter } from 'vue-router'
-import { useStore } from "../store/index";
-import { post } from '@/utils/request'
-
-const router = useRouter()
-const store = useStore()
-function tologin() {
-    router.push({
-        name: 'index'
-    })
-}
-function changeName(): void {
-    store.name = '索索'
-}
-
-async function networkRequest(): Promise<void> {
-    console.log('发起请求')
-    const requestUrl = '/user/loginAdmin'
-    const data = {
-        username: '18130408100',
-        password: '220926'
-    }
-    // proxy.$post(requestUrl, data)
-    // .then((response: any) => {
-    //     console.log(response, '<=== 请求返回的数据')
-    // })
-    const res = await post(requestUrl, data)
-    console.log(res, '<=== 请求返回的数据')
-}
-
-
-interface Tree {
-    label: string
-    children?: Tree[]
-}
-
-const handleNodeClick = (data: Tree) => {
-    console.log(data)
-}
-
-const data: Tree[] = [
-    {
-        label: 'Level one 1',
-        children: [
-            {
-                label: 'Level two 1-1',
-                children: [
-                    {
-                        label: 'Level three 1-1-1',
-                    },
-                ],
-            },
-        ],
-    },
-    {
-        label: 'Level one 2',
-        children: [
-            {
-                label: 'Level two 2-1',
-                children: [
-                    {
-                        label: 'Level three 2-1-1',
-                    },
-                ],
-            },
-            {
-                label: 'Level two 2-2',
-                children: [
-                    {
-                        label: 'Level three 2-2-1',
-                    },
-                ],
-            },
-        ],
-    },
-    {
-        label: 'Level one 3',
-        children: [
-            {
-                label: 'Level two 3-1',
-                children: [
-                    {
-                        label: 'Level three 3-1-1',
-                    },
-                ],
-            },
-            {
-                label: 'Level two 3-2',
-                children: [
-                    {
-                        label: 'Level three 3-2-1',
-                    },
-                ],
-            },
-        ],
-    },
-]
-
-const defaultProps = {
-    children: 'children',
-    label: 'label',
-}
-
-const option = reactive({
-    tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-            type: 'shadow',
-            label: {
-                show: true
-            }
-        }
-    },
-    grid: {
-        left: '4%',
-        top: '15%',
-        right: '4%',
-        bottom: '10%'
-    },
-    legend: {
-        data: ['昨日总人数', '今日实时人数'],
-        top: '4%',
-        color: '#1FC3CE',
-        fontSize: 14,
-        selected: { 昨日使用率: false } // 不需要显示的设置为false
-    },
-    xAxis: {
-        data: [
-            '会议室1',
-            '会议室2',
-            '会议室3',
-            '会议室4',
-            '会议室5',
-            '会议室6',
-            '会议室7',
-            '会议室8',
-            '会议室9'
-        ],
-        axisLine: {
-            show: true, //隐藏X轴轴线
-            lineStyle: {
-                color: '#eee',
-                width: 1
-            }
-        },
-        axisTick: {
-            show: true, //隐藏X轴刻度
-            alignWithLabel: true
-        },
-        axisLabel: {
-            show: true,
-            color: '#333', //X轴文字颜色
-            fontSize: 14
-        }
-    },
-    yAxis: [
-        {
-            type: 'value',
-            name: '人数',
-            nameTextStyle: {
-                color: '#333',
-                fontSize: 14
-            },
-            splitLine: {
-                show: true,
-                lineStyle: {
-                    width: 1,
-                    color: '#eee'
-                }
-            },
-            axisTick: {
-                show: false
-            },
-            axisLine: {
-                show: false
-            },
-            axisLabel: {
-                show: true,
-                color: '#333',
-                fontSize: 14
-            }
-        }
-    ],
-    series: [
-        {
-            name: '昨日总人数',
-            type: 'bar',
-            barWidth: 18,
-            itemStyle: {
-                color: {
-                    type: 'linear',
-                    x: 0, // 右
-                    y: 1, // 下
-                    x2: 0, // 左
-                    y2: 0, // 上
-                    colorStops: [
-                        {
-                            offset: 0,
-                            color: '#F89898' // 0% 处的颜色
-                        },
-                        {
-                            offset: 1,
-                            color: '#F56C6C' // 100% 处的颜色
-                        }
-                    ]
-                }
-            },
-            data: [24, 45, 43, 35, 76, 154, 86, 42, 68]
-        },
-        {
-            name: '今日实时人数',
-            type: 'bar',
-            barWidth: 18,
-            itemStyle: {
-                color: {
-                    type: 'linear',
-                    x: 0, // 右
-                    y: 1, // 下
-                    x2: 0, // 左
-                    y2: 0, // 上
-                    colorStops: [
-                        {
-                            offset: 0,
-                            color: '#52A7FF' // 0% 处的颜色
-                        },
-                        {
-                            offset: 1,
-                            color: '#409EFF' // 100% 处的颜色
-                        }
-                    ]
-                }
-            },
-            data: [133, 23, 114, 67, 89, 35, 67, 96, 90]
-        }
-    ]
-});
 
+<script lang="ts" setup>
+import loginLogo from "@/assets/login/login_logo.png";
+import qiyeweixin from "@/assets/login/qiyeweixin.png";
+import { UserFilled, Lock } from '@element-plus/icons-vue'
+import { ref } from "vue";
+const username = ref("");
+const password = ref("");
+const loginLoading = ref(false);
+const login = () => {
+  loginLoading.value = true;
+  console.log(username.value, password.value);
+  setTimeout(() => {
+    loginLoading.value = false;
+  }, 1000);
+};
 </script>
 
-<style lang="scss" scoped></style>
-
+<style lang="scss" scoped>
+.loginView {
+  background: #f0f2f5 url("../assets/login/background.png") no-repeat;
+}
+</style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/test/echarts.vue

@@ -0,0 +1,144 @@
+<template>
+  <div :style="{ width: '1230px', height: '350px' }">
+    <Echarts :option="option" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import Echarts from '@/components/ReEcharts/index.vue';
+import { EChartsOption } from 'echarts';
+import { reactive } from 'vue';
+const option = reactive<Partial<EChartsOption>>({
+  tooltip: {
+    trigger: 'axis',
+    axisPointer: {
+      type: 'shadow',
+      label: {
+        show: true
+      }
+    }
+  },
+  grid: {
+    left: '4%',
+    top: '15%',
+    right: '4%',
+    bottom: '10%'
+  },
+  legend: {
+    data: ['昨日总人数', '今日实时人数'],
+    top: '4%',
+    selected: { 昨日使用率: false } // 不需要显示的设置为false
+  },
+  xAxis: {
+    data: [
+      '会议室1',
+      '会议室2',
+      '会议室3',
+      '会议室4',
+      '会议室5',
+      '会议室6',
+      '会议室7',
+      '会议室8',
+      '会议室9'
+    ],
+    axisLine: {
+      show: true, //隐藏X轴轴线
+      lineStyle: {
+        color: '#eee',
+        width: 1
+      }
+    },
+    axisTick: {
+      show: true, //隐藏X轴刻度
+      alignWithLabel: true
+    },
+    axisLabel: {
+      show: true,
+      color: '#f00', //X轴文字颜色
+      fontSize: 14
+    }
+  },
+  yAxis: [
+    {
+      type: 'value',
+      name: '人数',
+      nameTextStyle: {
+        color: '#333',
+        fontSize: 14
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          width: 1,
+          color: '#ccc'
+        }
+      },
+      axisTick: {
+        show: false
+      },
+      axisLine: {
+        show: false
+      },
+      axisLabel: {
+        show: true,
+        color: '#333',
+        fontSize: 14
+      }
+    }
+  ],
+  series: [
+    {
+      name: '昨日总人数',
+      type: 'bar',
+      barWidth: 18,
+      itemStyle: {
+        color: {
+          type: 'linear',
+          x: 0, // 右
+          y: 1, // 下
+          x2: 0, // 左
+          y2: 0, // 上
+          colorStops: [
+            {
+              offset: 0,
+              color: '#F89898' // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: '#F56C6C' // 100% 处的颜色
+            }
+          ]
+        }
+      },
+      data: [24, 45, 43, 35, 76, 154, 86, 42, 68]
+    },
+    {
+      name: '今日实时人数',
+      type: 'bar',
+      barWidth: 18,
+      itemStyle: {
+        color: {
+          type: 'linear',
+          x: 0, // 右
+          y: 1, // 下
+          x2: 0, // 左
+          y2: 0, // 上
+          colorStops: [
+            {
+              offset: 0,
+              color: '#52A7FF' // 0% 处的颜色
+            },
+            {
+              offset: 1,
+              color: '#409EFF' // 100% 处的颜色
+            }
+          ]
+        }
+      },
+      data: [133, 23, 114, 67, 89, 35, 67, 96, 90]
+    }
+  ]
+});
+</script>
+
+<style lang="scss" scoped></style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/test/index.vue

@@ -7,14 +7,14 @@
     <div>{{ config[id].num }}</div>
   </div>
 </template>
+
 <script lang="ts" setup>
 import { config } from "./config"
 const id = 2;
 </script>
+
 <style lang="scss" scoped>
 .myClass {
-  @apply w-1/6;
-  @apply bg-red-700;
-  @apply text-white
+  @apply w-1/6 bg-red-700 text-white hover:size-20;
 }
 </style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/router/index.ts

@@ -19,6 +19,10 @@ export const routes = [
         name: "test",
         path: "/test",
         component: () => import("../pages/test/index.vue")
+    }, {
+        name: "testEcharts",
+        path: "/testEcharts",
+        component: () => import("../pages/test/echarts.vue")
     }
 ]
 const router = createRouter({

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles.css

@@ -1,80 +0,0 @@
-:root {
-    font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-    line-height: 1.5;
-    font-weight: 400;
-  
-    color-scheme: light dark;
-    color: rgba(255, 255, 255, 0.87);
-    background-color: #242424;
-  
-    font-synthesis: none;
-    text-rendering: optimizeLegibility;
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-  }
-  
-  a {
-    font-weight: 500;
-    color: #646cff;
-    text-decoration: inherit;
-  }
-  a:hover {
-    color: #535bf2;
-  }
-  
-  body {
-    margin: 0;
-    display: flex;
-    place-items: center;
-    min-width: 320px;
-    min-height: 100vh;
-  }
-  
-  h1 {
-    font-size: 3.2em;
-    line-height: 1.1;
-  }
-  
-  button {
-    border-radius: 8px;
-    border: 1px solid transparent;
-    padding: 0.6em 1.2em;
-    font-size: 1em;
-    font-weight: 500;
-    font-family: inherit;
-    background-color: #1a1a1a;
-    cursor: pointer;
-    transition: border-color 0.25s;
-  }
-  button:hover {
-    border-color: #646cff;
-  }
-  button:focus,
-  button:focus-visible {
-    outline: 4px auto -webkit-focus-ring-color;
-  }
-  
-  .card {
-    padding: 2em;
-  }
-  
-  #app {
-    max-width: 1280px;
-    margin: 0 auto;
-    padding: 2rem;
-    text-align: center;
-  }
-  
-  @media (prefers-color-scheme: light) {
-    :root {
-      color: #213547;
-      background-color: #ffffff;
-    }
-    a:hover {
-      color: #747bff;
-    }
-    button {
-      background-color: #f9f9f9;
-    }
-  }
-  

fhKeeper/formulahousekeeper/customerBuler-crm/tsconfig.json

@@ -23,7 +23,8 @@
     "noFallthroughCasesInSwitch": true,
     "paths": {
       "@/*": ["./src/*"]
-    }
+    },
+    "types": ["element-plus/global"]
   },
   "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"],
   "references": [{ "path": "./tsconfig.node.json" }]

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/controller/ClueController.java

@@ -1,10 +1,18 @@
 package com.management.platform.controller;
 
 
+import com.management.platform.entity.Clue;
+import com.management.platform.service.ClueService;
+import com.management.platform.util.HttpRespMsg;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -16,6 +24,47 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/clue")
 public class ClueController {
+    @Resource
+    private ClueService clueService;
+
+//    @RequestMapping("listClue")
+//    public Object list(@RequestBody Clue clue){
+//        clueService.getList(clue);
+//        return
+//    }
+    @RequestMapping("/inserANdUpdate")
+    public Object inserANdUpdate(@RequestBody Clue clue){
+        HttpRespMsg msg = new HttpRespMsg();
+        //操作前校验
+        if (null == clue.getClueName() || "" == clue.getClueName()){
+            msg.setError("线索名称不能为空");
+            return msg;
+        }
+        if (null == clue.getClueSourceId()){
+            msg.setError("线索来源不能为空");
+            return msg;
+        }
+        clue.setIsDelete(0);
+        if (null != clue.getId()){
+            //修改
+            clueService.update(clue);
+            msg.setMsg("操作成功");
+        }else {
+            //新增
+            clueService.insert(clue);
+            msg.setMsg("操作成功");
+        }
+        return  msg;
+    }
+
+
+    @RequestMapping("delete")
+    public Object delete(@RequestBody List<Integer> ids){
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.setMsg("操作成功");
+        clueService.isDelete(ids);
+        return msg;
+    }
 
 }
 

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/entity/Clue.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -46,10 +48,15 @@ public class Clue extends Model<Clue> {
     private Integer clueSourceId;
 
     /**
-     * 联系方式
+     * 电话
+     */
+    @TableField("phone")
+    private String phone;
+    /**
+     * 邮箱
      */
-    @TableField("contact_information")
-    private String contactInformation;
+    @TableField("email")
+    private String email;
 
     /**
      * 客户行业
@@ -69,11 +76,12 @@ public class Clue extends Model<Clue> {
     @TableField("address")
     private String address;
 
+
     /**
      * 负责人id
      */
     @TableField("incharger_id")
-    private String inchargerId;
+    private Integer inchargerId;
 
     /**
      * 备注
@@ -117,6 +125,12 @@ public class Clue extends Model<Clue> {
     @TableField("plate5")
     private String plate5;
 
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
 
     @Override
     protected Serializable pkVal() {

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/ClueService.java

@@ -3,6 +3,8 @@ package com.management.platform.service;
 import com.management.platform.entity.Clue;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ClueService extends IService<Clue> {
 
+    void insert(Clue clue);
+    void update(Clue clue);
+
+    void isDelete(List<Integer> ids);
 }

fhKeeper/formulahousekeeper/management-crm/src/main/java/com/management/platform/service/impl/ClueServiceImpl.java

@@ -1,10 +1,19 @@
 package com.management.platform.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.management.platform.entity.Clue;
 import com.management.platform.mapper.ClueMapper;
 import com.management.platform.service.ClueService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.management.platform.service.SysFunctionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.beans.Transient;
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +26,53 @@ import org.springframework.stereotype.Service;
 @Service
 public class ClueServiceImpl extends ServiceImpl<ClueMapper, Clue> implements ClueService {
 
+    @Autowired
+    private SysFunctionService sysFunctionService;
+    @Autowired
+    private ClueMapper clueMapper;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insert(Clue clue) {
+        setNull(clue);
+        clue.setCreateTime(new Date());
+        clueMapper.insert(clue);
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(Clue clue) {
+        setNull(clue);
+        clueMapper.updateById(clue);
+    }
+
+    private Clue setNull(Clue clue) {
+        if (clue.getPlate1() == ""){
+            clue.setPlate1(null);
+        }
+        if (clue.getPlate2() == ""){
+            clue.setPlate2(null);
+        }
+        if (clue.getPlate3() == ""){
+            clue.setPlate3(null);
+        }
+        if (clue.getPlate4() == ""){
+            clue.setPlate4(null);
+        }
+        if (clue.getPlate5() == ""){
+            clue.setPlate5(null);
+        }
+    return clue;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void isDelete(List<Integer> ids) {
+        UpdateWrapper<Clue> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.in("id", ids);
+        Clue clue = new Clue();
+        clue.setIsDelete(1);
+        clueMapper.update(clue, updateWrapper);
+    }
 }