Home Explore Help
Register Sign In
wutt
/
manHourHousekeeper
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

提交相关代码

Lijy 6 days ago
parent
cb7943a6fd
commit
5fa21ce18c
11 changed files with 32 additions and 22 deletions
Split View Show Diff Stats
  1. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
  2. 2 2
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index copy.vue
  3. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index.vue
  4. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index copy 2.vue
  5. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index copy.vue
  6. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index.vue
  7. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm/index.html
  8. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/header/header.vue
  9. 1 1
      fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue
  10. 11 1
      fhKeeper/formulahousekeeper/timesheet-workshop/src/views/attendanceCalendar/employeeCalendar.vue
  11. 11 11
      fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/index.html
View File 

@@ -4,7 +4,7 @@
 
     <meta charset="UTF-8" />
 
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-    <title>智能客户管家CRM</title>
 
+    <title>火石智能客户管家CRM</title>
 
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
 
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
 
     <!-- <script src="https://s.url.cn/qqun/qun/qqweb/m/qun/confession/js/vconsole.min.js "></script> -->

+ 2 - 2
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index copy.vue
View File 

@@ -3,7 +3,7 @@
 
     <template v-slot:headerLeft>
 
       <div class="homeheaderleft">
 
         <img src="/src/assets/image/home_logo.png">
 
-        <div class="text-white">智能客户管家CRM</div>
 
+        <div class="text-white">火石智能客户管家CRM</div>
 
       </div>
 
     </template>
 
     <template v-slot:headerRight>
 
@@ -35,7 +35,7 @@
 
       <!-- 显示对应的模块 -->
 
       <van-popup v-model:show="showModule" closeable position="bottom" round>
 
         <div class="newModuleAdded relative">
 
-          <div class="text-size-large text-[#474A56] absolute topTitle">智能客户管家CRM</div>
 
+          <div class="text-size-large text-[#474A56] absolute topTitle">火石智能客户管家CRM</div>
 
           <div class="flex flex-wrap">
 
             <template v-for="(item) in moduleList" :key="item.id">
 
               <div class="w-16 flex flex-col items-center mrSpacing" @click.stop="toAddEditor(item)">

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/home/index.vue
View File 

@@ -4,7 +4,7 @@
 
       <div class="homeheaderleft">
 
         <img src="/src/assets/image/home_logo.png">
 
         <!-- <div class="text-white">客户管家<ww-open-data :openid="useInfo.userInfo.name" type="userName"></ww-open-data></div> -->
 
-        <div class="text-white">智能客户管家CRM</div>
 
+        <div class="text-white">火石火石智能客户管家CRM</div>
 
       </div>
 
     </template>

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index copy 2.vue
View File 

@@ -105,7 +105,7 @@ function bindWeiXin() {
 
     return;
 
   }
 
 
-  var appId = "wx1c1d8fc81bc073a8"; //智能客户管家公众号
 
+  var appId = "wx1c1d8fc81bc073a8"; //火石智能客户管家公众号
 
   var url =
 
     "https://mobcrm.ttkuaiban.com/api/wechat/bindWeiXin2?userId=" +
 
     userInfo.userInfo.id; //工时管家公众号授权回调页面

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index copy.vue
View File 

@@ -99,7 +99,7 @@ function bindWeiXin() {
 
     return;
 
   }
 
 
-  var appId = "wx1c1d8fc81bc073a8";//智能客户管家公众号
 
+  var appId = "wx1c1d8fc81bc073a8";//火石智能客户管家公众号
 
   var url = "https://mobcrm.ttkuaiban.com/api/wechat/bindWeiXin2?userId=" + userInfo.userInfo.id;//工时管家公众号授权回调页面
 
   if (isCorpWX.value) {
 
     appId = "ww4e237fd6abb635af"; //企业微信第三方的SUIT ID

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm-h5/src/pages/tabbar/my/index.vue
View File 

@@ -105,7 +105,7 @@ function bindWeiXin() {
 
     return;
 
   }
 
 
-  var appId = "wx1c1d8fc81bc073a8"; //智能客户管家公众号
 
+  var appId = "wx1c1d8fc81bc073a8"; //火石智能客户管家公众号
 
   var url =
 
     "https://mobcrm.ttkuaiban.com/api/wechat/bindWeiXin2?userId=" +
 
     userInfo.userInfo.id; //工时管家公众号授权回调页面

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/index.html
View File 

@@ -4,7 +4,7 @@
 
   <meta charset="UTF-8" />
 
   <link rel="icon" type="image/svg+xml" href="./logo.svg" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <title>智能客户管家</title>
 
+  <title>火石智能客户管家</title>
 
 </head>
 
 
 <body>

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/header/header.vue
View File 

@@ -1,7 +1,7 @@
 
 <template>
 
   <div class="trademark mr-8 flex items-center text-white">
 
     <img :src="loginLogin" class="w-10 h-10 mr-4" />
 
-    <div class="text-nowrap">智能客户管家</div>
 
+    <div class="text-nowrap">火石智能客户管家</div>
 
   </div>
 
   <div class=" flex flex-row justify-start items-center text-white flex-1 parentDiv" ref="parentDiv">
 
     <div v-for="(routerItem, routerItemIdex) in routerList" @click="setCurrentRouter(routerItem)"

+ 1 - 1
fhKeeper/formulahousekeeper/customerBuler-crm/src/pages/login.vue
View File 

@@ -4,7 +4,7 @@
 
       <div class="m-auto pt-4">
 
         <img class="w-1/5 m-auto" :src="loginLogo" alt="">
 
       </div>
 
-      <h2 class="text-xl text-center pt-4 font-bold">智能客户管家</h2>
 
+      <h2 class="text-xl text-center pt-4 font-bold">火石智能客户管家</h2>
 
       <el-form class="pt-4" ref="ruleFormRef" :model="ruleForm" :rules="rules">
 
         <el-form-item prop="username">
 
           <el-input clearable :prefix-icon="UserFilled" size="large" class="mt-2" v-model.trim="ruleForm.username"

+ 11 - 1
fhKeeper/formulahousekeeper/timesheet-workshop/src/views/attendanceCalendar/employeeCalendar.vue
View File 

@@ -3,7 +3,8 @@
 
     <div class="calendar-left">
 
       <el-calendar v-model="calendarValue">
 
         <div slot="dateCell" slot-scope="data" class="calendar-cell" @click="setRightRow(data.data.day)">
 
-          <div>{{ dayjs(data.date).format("DD") }}</div>
 
+          <!-- <div>{{ dayjs(data.date).format("dddd") }}</div> -->
 
+          <div>{{ weekMap[dayjs(data.date).format("dddd")] }}</div>
 
           <div class="calendar-cell-text" :style="`color: ${getDateRow(data.data.day).color}`">{{ getDateRow(data.data.day).attendanceTypeName }}</div>
 
         </div>
 
       </el-calendar>
 
@@ -55,6 +56,15 @@ export default {
 
       },
 
       haveYouViewedAllOfThem: false,
 
       user: JSON.parse(sessionStorage.getItem('user')),
 
+      weekMap: {
 
+        '星期一': '周 一',
 
+        '星期二': '周 二',
 
+        '星期三': '周 三',
 
+        '星期四': '周 四',
 
+        '星期五': '周 五',
 
+        '星期六': '周 六',
 
+        '星期天': '周 日',
 
+      }
 
     };
 
   },
 
   methods: {

+ 11 - 11
fhKeeper/formulahousekeeper/timesheet_h5/vue.config.js
View File 

@@ -5,19 +5,19 @@ const themePath = path.resolve(__dirname,'src/assets/style/theme.less');
 
 const Timestamp = new Date().getTime();
 
 
 // var ip = '47.101.180.183'
 
-// var ip = '47.100.37.243'
 
+var ip = '47.100.37.243'
 
 // var ip = '192.168.2.42'
 
-// var ip = '127.0.0.1'
 
+// var ip = '1.94.62.58'
 
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 
-for (var i in ifaces) {
 
-    for (var j in ifaces[i]) {
 
-        var val = ifaces[i][j]
 
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
 
-            ip = val.address
 
-        }
 
-    }
 
-}
 
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 
+// for (var i in ifaces) {
 
+//     for (var j in ifaces[i]) {
 
+//         var val = ifaces[i][j]
 
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
 
+//             ip = val.address
 
+//         }
 
+//     }
 
+// }
 
 
 module.exports = {
 
     runtimeCompiler: true,