Merge branch 'ming' of uskycloud/usky-web-mobile into master

package.json

@@ -1,79 +1,80 @@
 {
-    "name": "uni-preset-vue",
-    "version": "0.0.0",
-    "scripts": {
-        "dev:app": "uni -p app",
-        "dev:custom": "uni -p",
-        "dev:h5": "uni",
-        "dev:h5:prod": "uni --mode production",
-        "dev:h5:ssr": "uni --ssr",
-        "dev:mp-alipay": "uni -p mp-alipay",
-        "dev:mp-baidu": "uni -p mp-baidu",
-        "dev:mp-kuaishou": "uni -p mp-kuaishou",
-        "dev:mp-lark": "uni -p mp-lark",
-        "dev:mp-qq": "uni -p mp-qq",
-        "dev:mp-toutiao": "uni -p mp-toutiao",
-        "dev:mp-weixin": "uni -p mp-weixin",
-        "dev:quickapp-webview": "uni -p quickapp-webview",
-        "dev:quickapp-webview-huawei": "uni -p quickapp-webview-huawei",
-        "dev:quickapp-webview-union": "uni -p quickapp-webview-union",
-        "build:app": "uni build -p app",
-        "build:custom": "uni build -p",
-        "build:h5:prod": "rimraf dist && uni build --mode production",
-        "build:h5:dev": "rimraf dist && uni build --mode development",
-        "build:h5:ssr": "uni build --ssr",
-        "build:mp-alipay": "uni build -p mp-alipay",
-        "build:mp-baidu": "uni build -p mp-baidu",
-        "build:mp-kuaishou": "uni build -p mp-kuaishou",
-        "build:mp-lark": "uni build -p mp-lark",
-        "build:mp-qq": "uni build -p mp-qq",
-        "build:mp-toutiao": "uni build -p mp-toutiao",
-        "build:mp-weixin": "uni build -p mp-weixin",
-        "build:quickapp-webview": "uni build -p quickapp-webview",
-        "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
-        "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
-        "clear": "rimraf node_modules && npm install --force",
-        "clean": "npm cache clean --force",
-        "update:setting": "node unpackage/config/setting.js"
-    },
-    "dependencies": {
-        "@amap/amap-jsapi-loader": "^1.0.1",
-        "@dcloudio/uni-app": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-app-harmony": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-app-plus": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-components": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-h5": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-jd": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-lark": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-qq": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-mp-xhs": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4020320240703001",
-        "echarts": "^5.3.3",
-        "pinia": "2.0.14",
-        "pinia-plugin-persistedstate": "^3.1.0",
-        "vue": "^3.4.21",
-        "vue-echarts": "^6.2.3",
-        "vue-i18n": "^9.1.9",
-        "vue-json-excel": "^0.3.0",
-        "vuex": "^4.0.2",
-        "weixin-js-sdk": "^1.6.0"
-    },
-    "devDependencies": {
-        "@dcloudio/types": "^3.4.8",
-        "@dcloudio/uni-automator": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-cli-shared": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/uni-stacktracey": "3.0.0-alpha-4020320240703001",
-        "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4020320240703001",
-        "@vitejs/plugin-vue": "^2.3.3",
-        "@vue/runtime-core": "^3.4.21",
-        "cross-env": "^7.0.3",
-        "dayjs": "^1.11.7",
-        "sass": "1.57.1",
-        "vite": "5.2.8"
-    }
-}
+  "name": "uni-preset-vue",
+  "version": "0.0.0",
+  "scripts": {
+    "dev:app": "uni -p app",
+    "dev:custom": "uni -p",
+    "dev:h5": "uni",
+    "dev:h5:prod": "uni --mode production",
+    "dev:h5:ssr": "uni --ssr",
+    "dev:mp-alipay": "uni -p mp-alipay",
+    "dev:mp-baidu": "uni -p mp-baidu",
+    "dev:mp-kuaishou": "uni -p mp-kuaishou",
+    "dev:mp-lark": "uni -p mp-lark",
+    "dev:mp-qq": "uni -p mp-qq",
+    "dev:mp-toutiao": "uni -p mp-toutiao",
+    "dev:mp-weixin": "uni -p mp-weixin",
+    "dev:quickapp-webview": "uni -p quickapp-webview",
+    "dev:quickapp-webview-huawei": "uni -p quickapp-webview-huawei",
+    "dev:quickapp-webview-union": "uni -p quickapp-webview-union",
+    "build:app": "uni build -p app",
+    "build:custom": "uni build -p",
+    "build:h5:prod": "rimraf dist && uni build --mode production",
+    "build:h5:dev": "rimraf dist && uni build --mode development",
+    "build:h5:ssr": "uni build --ssr",
+    "build:mp-alipay": "uni build -p mp-alipay",
+    "build:mp-baidu": "uni build -p mp-baidu",
+    "build:mp-kuaishou": "uni build -p mp-kuaishou",
+    "build:mp-lark": "uni build -p mp-lark",
+    "build:mp-qq": "uni build -p mp-qq",
+    "build:mp-toutiao": "uni build -p mp-toutiao",
+    "build:mp-weixin": "uni build -p mp-weixin",
+    "build:quickapp-webview": "uni build -p quickapp-webview",
+    "build:quickapp-webview-huawei": "uni build -p quickapp-webview-huawei",
+    "build:quickapp-webview-union": "uni build -p quickapp-webview-union",
+    "clear": "rimraf node_modules && npm install --force",
+    "clean": "npm cache clean --force",
+    "update:setting": "node unpackage/config/setting.js"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@dcloudio/uni-app": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-app-harmony": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-app-plus": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-components": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-h5": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-alipay": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-baidu": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-jd": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-lark": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-qq": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-weixin": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-mp-xhs": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-4020320240703001",
+    "base-64": "^1.0.0",
+    "echarts": "^5.3.3",
+    "pinia": "2.0.14",
+    "pinia-plugin-persistedstate": "^3.1.0",
+    "vue": "^3.4.21",
+    "vue-echarts": "^6.2.3",
+    "vue-i18n": "^9.1.9",
+    "vue-json-excel": "^0.3.0",
+    "vuex": "^4.0.2",
+    "weixin-js-sdk": "^1.6.0"
+  },
+  "devDependencies": {
+    "@dcloudio/types": "^3.4.8",
+    "@dcloudio/uni-automator": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/uni-stacktracey": "3.0.0-alpha-4020320240703001",
+    "@dcloudio/vite-plugin-uni": "3.0.0-alpha-4020320240703001",
+    "@vitejs/plugin-vue": "^2.3.3",
+    "@vue/runtime-core": "^3.4.21",
+    "cross-env": "^7.0.3",
+    "dayjs": "^1.11.7",
+    "sass": "1.57.1",
+    "vite": "5.2.8"
+  }
+}

src/pages/business/common/projectMange/record/details.vue

@@ -32,12 +32,12 @@
             :text="item.createBy.length > 2 ? item.createBy.slice(1, 3) : item.createBy"
             shape="square"
             size="40"
-            fontSize="12"
+            fontSize="12" 
             color="#ffffff"
             :bgColor="proxy.$settingStore.themeColor.color"
           ></u-avatar>
           <view>
-            <view class="content-area-header-title font16 mb5">{{ item.createBy ? item.createBy : " " }}</view>
+            <view class="content-area-header-title font16 mb5">{{ item.createBy ? item.createBy : " " }} {{ item.submitDate.slice(0, 10) != item.reportDate ? "( " + item.reportDate + " )" : "" }}</view>
             <view class="content-area-header-time font14">{{ item.submitDate ? item.submitDate.replace("T", " ") : " " }}</view>
           </view>
         </view>

src/pages/business/common/projectMange/record/index.vue

@@ -52,9 +52,12 @@
       </view>
 
       <u-loading-page :loading="state.loading" fontSize="16" style="z-index: 99"></u-loading-page>
-      <view class="content-area" v-for="(group, date) in proxy.$common.groupedItems(state.dataList, 'submitDate')" :key="date">
-        <view class="content-area-time font14">{{ proxy.$time.jktTimes(date, "否") }}</view>
-        <view class="content-area-center bg-white" v-for="(el, ind) in group" :key="ind">
+
+
+      <!-- start -->
+      <view class="content-area" v-for="(el, index) in reportListNewData" :key="index">
+        <view class="content-area-time font14" v-if="!el.id">{{ proxy.$time.jktTimes(el.submitDate, "否") }}</view>
+        <view class="content-area-center bg-white" v-else style="margin:0 10px 10px;border-radius:10px">
           <view class="content-area-top menu-item" style="float: right; padding: 10px 0px">
             <view class="content-area-top-time"> </view>
             <u-icon class="content-area-top-icon" name="more-dot-fill" size="20" color="#000" @click="moreClick(el)"></u-icon>
@@ -86,6 +89,9 @@
           </view>
         </view>
       </view>
+      <!-- end -->
+
+
     </template>
   </oa-scroll>
 
@@ -198,7 +204,7 @@ const state = reactive({
   tabsCurrent: 0,
 
   loading: false,
-  dataList: [],
+  reportListNewData:[],
   pageSize: 20,
   current: 1,
   total: 0,
@@ -228,7 +234,7 @@ const state = reactive({
   tree: [],
 });
 
-const { tabsList, tabsCurrent, dataList, pageSize, current, total, popup, eventList, modal, timedList, tree } = toRefs(state);
+const { tabsList, tabsCurrent,reportListNewData, pageSize, current, total, popup, eventList, modal, timedList, tree } = toRefs(state);
 /**
  * 操作弹框提醒
  * @param type  弹框类型
@@ -259,6 +265,7 @@ function dialogConfirm() {
  * @初始化
  */
 function init() {
+  let arrayList = [];
   projectApi()
     .ReportRecord({
       // startDate: "2024-07-10",
@@ -274,11 +281,34 @@ function init() {
           el.contentText += `${cl.projectName} ${cl.workTime}h \n ${cl.workContent} \n`;
         });
       });
-      state.dataList = requset.data.records;
       state.total = requset.data.total;
       state.loading = false;
 
-      console.log(state.dataList);
+      var reportListData = requset.data.records;
+      var groupBySubmitTime = reportListData.reduce((acc, current) => {
+        const existIndex = acc.findIndex((item) => item.submitDate.slice(0, 10) === current.submitDate.slice(0, 10));
+        if (existIndex === -1) {
+          acc.push({ submitDate: current.submitDate, items: [current] });
+        } else {
+          acc[existIndex].items.push(current);
+        }
+        return acc;
+      }, []);
+
+      groupBySubmitTime.forEach(function (item, index) {
+        item.items.unshift({ submitDate: item.submitDate });
+        item.items.forEach(function (aa) {
+          arrayList.push(aa);
+        });
+      });
+
+      state.reportListNewData = arrayList;
+
+
+
+
+
+      
     })
     .catch((err) => {
       state.loading = false;

src/pages/login.vue

@@ -1,5 +1,5 @@
 <template>
-  <view id="login-container" class="login-container">
+  <view id="login-container" class="login-container" v-if="xcxData==null">
     <image class="bgImage" :src="useStore.loginBg" v-if="useStore.loginBg" />
 
     <view class="middle">
@@ -102,6 +102,7 @@ import { reactive, getCurrentInstance, toRefs, inject, nextTick } from "vue";
 /*----------------------------------store引入-----------------------------------*/
 import { useStores, commonStores, xunJianStores } from "@/store/modules/index";
 /*----------------------------------公共方法引入-----------------------------------*/
+import Base64 from 'base-64';
 import config from "@/config";
 import { storageSystem } from "@/utils/storage";
 /*----------------------------------公共变量-----------------------------------*/
@@ -123,9 +124,10 @@ const state = reactive({
   /** 用户隐私协议数据 */
   uChecked: false,
   modalShow: false,
+  xcxData:null
 });
 
-const { phone, verify, switchText, username, password, isPassword, linkUrl, uChecked, modalShow } = toRefs(state);
+const { phone, verify, switchText, username, password, isPassword, linkUrl, uChecked, modalShow,xcxData } = toRefs(state);
 
 /**
  * @跳转服务器配置
@@ -298,7 +300,12 @@ onShow(() => {
   });
 });
 
-onLoad((options) => {});
+onLoad((options) => {
+  if(options.xcx){
+    state.xcxData=JSON.parse(Base64.decode(options.xcx))
+    login(state.xcxData)
+  }
+});
 </script>
 
 <style lang="scss" scoped>