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

fhKeeper/formulahousekeeper/customerBuler-crm/package.json

@@ -19,7 +19,8 @@
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
     "vue": "^3.4.19",
-    "vue-router": "^4.3.0"
+    "vue-router": "^4.3.0",
+    "vuex": "^4.1.0"
   },
   "devDependencies": {
     "@types/node": "^20.11.24",

fhKeeper/formulahousekeeper/customerBuler-crm/src/App.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script setup lang="ts">
-import { provide } from 'vue'
+import { provide, onMounted } from 'vue'
 import { useStore } from '@/store/index'
 import { ElNotification, NotificationParamsTyped } from 'element-plus'
 const { setAsyncRoutesMark } = useStore()
@@ -49,6 +49,17 @@ provide<GlobalPopup>('globalPopup', {
 const notificationTiop = (options: NotificationParamsTyped) => {
   ElNotification(options)
 }
+ 
+onMounted(() => {
+  // 重置 primary 主题颜色
+  document.body.style.setProperty('--el-color-primary', '#075985')
+  document.body.style.setProperty('--el-color-primary-light-3', '#518baa')
+  document.body.style.setProperty('--el-color-primary-light-5', '#83acc2')
+  document.body.style.setProperty('--el-color-primary-light-7', '#b5cdda')
+  document.body.style.setProperty('--el-color-primary-light-8', '#cddee7')
+  document.body.style.setProperty('--el-color-primary-light-9', '#e6eef3')
+  document.body.style.setProperty('--el-color-primary-dark-2', '#06476a')
+})
 
 </script>
 

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

@@ -62,5 +62,5 @@ watch(
 </script>
 
 <template>
-	<div ref="myChartsRef" :style="{ height: height, width: width }" :option="option" />
+	<div ref="myChartsRef" :style="{ height: height, width: width }" :option="option"></div>
 </template>

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

@@ -222,9 +222,9 @@ function closeVisible() {
 }
 function submitForm(formEl: FormInstance | undefined, isClose: boolean) {
   if (!formEl) return
-  formEl.validate((valid) => {
+  formEl.validate((valid: boolean) => {
     if (!valid) {
-      return false
+      return false as any
     }
     const repeatDesignDay = customeDate.value.join(",")
     generateFormRef.value?.getData().then((res: any) => {
@@ -324,7 +324,7 @@ function changeRepeatType(value: REPEAT_VALUE_TYPE) {
   customeDate.value = [];
 }
 
-function changeEndType(value: string | number | boolean) {
+function changeEndType(value: string | number | boolean | undefined) {
   form.value = {
     ...form.value,
     endType: value, //重复类型

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

@@ -2,8 +2,8 @@ import { createApp } from 'vue'
 import { createPinia } from 'pinia'
 import ElementPlus from 'element-plus'
 import "./TailWindCss/index.css";
-// import 'element-plus/dist/index.css'
-// import './styles/index.scss'
+import 'element-plus/dist/index.css'
+// import './styles/element-plus.scss'
 import 'animate.css/animate.min.css' //引入动画
 import * as ElementPlusIconsVue from '@element-plus/icons-vue'
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/customer/detail/index.vue

@@ -158,10 +158,5 @@ function handleScroll(event: any) { // 滚表横向滚动
     padding-top: 4px;
     padding-bottom: 4px;
   }
-
-  .selectClas >>> .el-select__wrapper {
-    background-color: none !important;
-    box-shadow: none !important;
-  }
 }
 </style>

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

@@ -68,9 +68,9 @@ const login = (formEl: FormInstance | undefined) => {
   if (!formEl) {
     return
   }
-  formEl.validate((valid) => {
+  formEl.validate((valid: boolean) => {
     if (!valid) {
-      return false;
+      return false as any;
     }
     loginLoading.value = true;
     //console.log(ruleForm.value);

fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/product/detail/index.vue

@@ -182,10 +182,5 @@ onMounted(() => {
     padding-top: 4px;
     padding-bottom: 4px;
   }
-
-  .selectClas>>>.el-select__wrapper {
-    background-color: none !important;
-    box-shadow: none !important;
-  }
 }
 </style>

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

@@ -138,9 +138,9 @@ const register = (formEl: FormInstance | undefined) => {
     return
   }
 
-  formEl.validate((valid) => {
+  formEl.validate((valid: boolean) => {
     if (!valid) {
-      return false;
+      return false as any;
     }
     registerLoading.value = true;
     let params = {

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

@@ -1,6 +1,6 @@
 <template>
   <div :style="{ width: '1230px', height: '350px' }">
-    <Echarts :option="option" />
+    <Echarts :option="{}"></Echarts>
   </div>
 </template>
 
@@ -141,4 +141,5 @@ const option = reactive<Partial<EChartsOption>>({
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/global.scss

@@ -1,5 +1,3 @@
-@use './index.scss' as *;
-
 $darkBlue: #3475c5;
 $ashen: #fefefe;
 $backColor: #eef3f6;

fhKeeper/formulahousekeeper/customerBuler-crm/src/styles/index.scss

@@ -1 +0,0 @@
-@use './element-plus.scss' as *;

fhKeeper/formulahousekeeper/customerBuler-crm/vite.config.ts

@@ -3,8 +3,8 @@ import vue from "@vitejs/plugin-vue";
 
 import { resolve } from "path";
 
-// const target = "http://192.168.2.8:10010";
-const target = "http://192.168.2.178:10010";
+const target = "http://192.168.2.8:10080";
+// const target = "http://192.168.2.178:10010";
 // const target = "http://47.101.180.183:10010";
 
 export default defineConfig({
@@ -26,16 +26,28 @@ export default defineConfig({
     alias: {
       "@": resolve(__dirname, "./src"),
     },
-    //extensions: [".ts", ".js", ".vue", ".json", ".mjs"],
     extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],
   },
-  // css相关配置
   css: {
     preprocessorOptions: {
       scss: {
         additionalData: '@import "@/styles/global.scss";'
-
       },
     },
   },
+
+  build: {
+    rollupOptions: {
+      output: {
+        entryFileNames: `assets/[name].${new Date().getTime()}.js`,
+        chunkFileNames: `assets/[name].${new Date().getTime()}.js`,
+        assetFileNames: `assets/[name].${new Date().getTime()}.[ext]`,
+        compact: true,
+        manualChunks: {
+          vue: ['vue', 'vue-router', 'vuex'],
+          echarts: ['echarts']
+        },
+      },
+    }
+  }
 });