2022.5.30

fhKeeper/formulahousekeeper/timesheet/src/views/project/project_gantt.vue

@@ -15,7 +15,7 @@
       <div class="head_date" v-if="isDataLoaded">
       <span>时间段</span>
       <el-date-picker
-        style="margin-left:9px"
+        style="margin-left:9px;width:18vw"
         size="small"
         v-model="valueDate"
         type="daterange"
@@ -30,7 +30,7 @@
       <!-- 任务分组筛选 -->
       <div v-if="reqpar1" class="head_taskgroup">
         <span>任务分组</span>
-        <el-select clearable filterable v-model="valuex2" placeholder="请选择" size="small" style="margin-left:9px;width:13vw" @change="taskgroupSel()">
+        <el-select clearable filterable v-model="valuex2" placeholder="请选择" size="small" style="margin-left:9px;width:10vw" @change="taskgroupSel()">
         <el-option
           v-for="item in taskgroupList"
           :key="item.name"
@@ -43,7 +43,7 @@
       <!-- 人员/项目筛选 -->
       <div class="head_select">
         <span>{{(this.radio1 == "按人员查看" ? "人员" : "项目")}}</span>
-      <el-select clearable filterable v-model="valuex" placeholder="请选择" size="small" style="margin-left:9px;width:13vw" @change="optupdata()">
+      <el-select clearable filterable v-model="valuex" placeholder="请选择" size="small" style="margin-left:9px;width:10vw" @change="optupdata()">
         <el-option
           v-for="item in screenList"
           :key="item.id"
@@ -522,19 +522,19 @@ export default {
     align-items: center;
   }
   .gantt_head .head_RorX{
-    width: 18vw;
+    width: 22vw;
   }
   .gantt_head .head_date{
-    width: 27vw;
+    width: 24vw;
   }
   .gantt_head .head_taskgroup{
-    width: 18vw;
+    width: 16vw;
   }
   .gantt_head .head_select{
-    width: 17vw;
+    width: 15vw;
   }
   .gantt_head .head_files{
-    width: 14vw;
+    width: 17vw;
   }
   .poss {
     height: 8%;

fhKeeper/formulahousekeeper/timesheet_h5/src/views/login/index.vue

@@ -222,10 +222,16 @@
                 } else {
                     //检查环境，如果是钉钉有$CORPID$
                     var key = '?corpid=';
+                    var jumpkey = '&jumpto=';
                     var url = location.href;
                     var that = this;
                     if (url.indexOf(key) > 0) {
-                        var corpId = url.substring(url.indexOf(key)+key.length,url.indexOf('#'));
+                        var corpId = ''
+                        if(url.indexOf(jumpkey) > 0){
+                            corpId = url.substring(url.indexOf(key)+key.length,url.indexOf(jumpkey));
+                        }else{
+                            corpId = url.substring(url.indexOf(key)+key.length,url.indexOf('#'));
+                        }
                         this.isDingding = true
                         dd.ready(function() {
                             dd.runtime.permission.requestAuthCode({