Merge branch 'dev_4newlayout' of http://182.92.169.222:3000/zhc077/projectManagement into dev_4newlayout

ant-design-vue-jeecg/package.json

@@ -32,7 +32,10 @@
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",
+    "moment": "^2.29.4",
     "nprogress": "^0.2.0",
+    "postcss-px2rem": "^0.3.0",
+    "px2rem-loader": "^0.1.9",
     "qs": "^6.10.3",
     "tinymce": "^5.10.3",
     "viser-vue": "^2.4.8",

ant-design-vue-jeecg/src/App.vue

@@ -6,16 +6,18 @@
   </a-config-provider>
 </template>
 <script>
+import DevicePixelRatio from './utils/devicePixelRatio'
 import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
 import enquireScreen from '@/utils/device'
 
 export default {
   data() {
     return {
-      locale: zhCN,
+      locale: zhCN
     }
   },
   created() {
+    new DevicePixelRatio().init()
     let that = this
     enquireScreen((deviceType) => {
       // tablet
@@ -38,7 +40,7 @@ export default {
       //  console.log(this.$router.getRoutes(), '当前router')
       //console.log(this.$router.push('/src/views/course/SeCourseList'), '当前')
     }, 0)
-  },
+  }
 }
 </script>
 <style>
@@ -46,4 +48,3 @@ export default {
   height: 100%;
 }
 </style>
-

ant-design-vue-jeecg/src/utils/devicePixelRatio.js

@@ -0,0 +1,60 @@
+class DevicePixelRatio {
+  constructor() {
+    // this.flag = false;
+  }
+  // 获取系统类型
+  _getSystem() {
+    let flag = false
+    var agent = navigator.userAgent.toLowerCase()
+    //		var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+    //		if(isMac) {
+    //			return false;
+    //		}
+    // 现只针对windows处理，其它系统暂无该情况，如有，继续在此添加
+    if (agent.indexOf('windows') >= 0) {
+      return true
+    }
+  }
+  // 获取页面缩放比例
+  //	_getDevicePixelRatio() {
+  //		let t = this;
+  //	}
+  // 监听方法兼容写法
+  _addHandler(element, type, handler) {
+    if (element.addEventListener) {
+      element.addEventListener(type, handler, false)
+    } else if (element.attachEvent) {
+      element.attachEvent('on' + type, handler)
+    } else {
+      element['on' + type] = handler
+    }
+  }
+  // 校正浏览器缩放比例
+  _correct() {
+    let t = this
+    // 页面devicePixelRatio（设备像素比例）变化后，计算页面body标签zoom修改其大小，来抵消devicePixelRatio带来的变化。
+    document.getElementsByTagName('body')[0].style.zoom =
+      1 / window.devicePixelRatio
+  }
+  // 监听页面缩放
+  _watch() {
+    let t = this
+    t._addHandler(window, 'resize', function () {
+      // 注意这个方法是解决全局有两个window.resize
+      // 重新校正
+      t._correct()
+    })
+  }
+  // 初始化页面比例
+  init() {
+    let t = this
+    if (t._getSystem()) {
+      // 判断设备，目前只在windows系统下校正浏览器缩放比例
+      // 初始化页面校正浏览器缩放比例
+      t._correct()
+      // 开启监听页面缩放
+      t._watch()
+    }
+  }
+}
+export default DevicePixelRatio

ant-design-vue-jeecg/src/views/newLayout/myTask/list/assignment.vue

@@ -176,19 +176,14 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
+                    <span> {{ item.startTime | timeFilter }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
+                    <span>{{ item.publishTime | timeFilter }}</span>
-                    <span>{{
+                    -
-                      `${
+                    <span>{{ item.submitTime | timeFilter }}</span>
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -233,6 +228,7 @@
           <Container
             drag-class="card-ghost"
             drop-class="card-ghost-drop"
+            :drop-placeholder="dropPlaceholderOptions"
             group-name="col"
             @drop="(e) => onDevelopedCardDrop(e)"
             :get-child-payload="getDevelopedCardPayload()"
@@ -323,19 +319,13 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
+                    <span> {{ item.startTime | timeFilter }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
+                    <span>{{ item.publishTime | timeFilter }}</span> -
-                    <span>{{
+                    <span>{{ item.submitTime | timeFilter }}</span>
-                      `${
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -455,19 +445,13 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
+                    <span> {{ item.startTime | timeFilter }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
+                    <span>{{ item.publishTime | timeFilter }}</span> -
-                    <span>{{
+                    <span>{{ item.submitTime | timeFilter }}</span>
-                      `${
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -583,19 +567,14 @@
                 <div class="date">
                   <div class="cycle">
                     <label>任务周期：</label>
-                    <span> {{ item.startTime }}</span> -
+                    <span> {{ item.startTime | timeFilter }}</span> -
-                    <span>{{ item.expectedEndTime }}</span>
+                    <span>{{ item.expectedEndTime | timeFilter }}</span>
                   </div>
                   <div class="publish">
                     <label>发布提交：</label>
-                    <span>{{ item.publishTime }}</span> -
+                    <span>{{ item.publishTime | timeFilter }}</span>
-                    <span>{{
+                    -
-                      `${
+                    <span>{{ item.submitTime | timeFilter }}</span>
-                        item.submitTime !== '1970-01-01'
-                          ? item.submitTime
-                          : '待提交'
-                      }`
-                    }}</span>
                   </div>
                   <div class="expected_duration">
                     <label>预计时长：</label
@@ -683,23 +662,26 @@ import { Container, Draggable } from 'vue-smooth-dnd'
 import TaskModal from '@/views/task/modules/TaskModal'
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import moment from 'moment'
 const changeTime = (time) => {
-  let date = new Date(time)
+  // let date = new Date(time)
-  let Y = date.getFullYear()
+  // let Y = date.getFullYear()
-  let M = String(date.getMonth() + 1).padStart(2, '0')
+  // let M = String(date.getMonth() + 1).padStart(2, '0')
-  let D = String(date.getDate()).padStart(2, '0')
+  // let D = String(date.getDate()).padStart(2, '0')
-  let newDate = [Y, M, D].join('-')
+  // let newDate = [Y, M, D].join('-')
-  return newDate
+  // return newDate
+  return moment(item.startTime * 1000).format('YYYY-MM-DD HH:mm:ss')
 }
 const changeStyle = (arr) => {
   let newArr = arr.map((item) => {
     item.headpic = getFileAccessHttpUrl(item.headpic)
     item.taskPic = getFileAccessHttpUrl(item.taskPic)
     item.taskFile = getFileAccessHttpUrl(item.taskFile)
-    item.expectedEndTime = changeTime(item.expectedEndTime)
+    // item.expectedEndTime = moment(item.expectedEndTime).format('YYYY-MM-DD')
-    item.startTime = changeTime(item.startTime)
+    // item.expectedEndTime = changeTime(item.expectedEndTime)
-    item.submitTime = changeTime(item.submitTime)
+    // item.startTime = moment(item.startTime).format('YYYY-MM-DD')
-    item.publishTime = changeTime(item.publishTime)
+    // item.submitTime =moment(item.startTime).format('YYYY-MM-DD')
+    // item.publishTime = changeTime(item.publishTime)
   })
   return newArr
 }
@@ -743,7 +725,7 @@ export default {
       drawerData: {},
       dropPlaceholderOptions: {
         className: 'drop-preview',
-        animationDuration: '1000',
+        animationDuration: '150',
         showOnTop: true
       },
       time: [
@@ -756,6 +738,9 @@ export default {
     }
   },
   methods: {
+    modalFormOk() {
+      this.allUpadate()
+    },
     timeSearch(time) {
       this.timeSearchData = time.id
       console.log('this.timeSearchData', this.timeSearchData)
@@ -893,9 +878,9 @@ export default {
       window.open(this.dialogurl)
     },
     //滚动分页加载数据
-    assignmnetScroll(e) {
+    assignmnetScroll() {
       let isLoading = true //是否有数据可以加载
-      this.$refs.assignmnetcards.onscroll = async () => {
+      this.$refs.assignmnetcards.onscroll = async (e) => {
         const { scrollTop, clientHeight, scrollHeight } = e.target
         console.log(scrollTop, clientHeight, scrollHeight)
         let bottomOfWindow = scrollTop + clientHeight === scrollHeight
@@ -933,12 +918,13 @@ export default {
         }
       }
     },
-    async developedScroll(e) {
+    developedScroll() {
       let isLoading = true //是否有数据可以加载
+      this.$refs.developedcards.onscroll = async (e) => {
         const { scrollTop, clientHeight, scrollHeight } = e.target
-      console.log(scrollTop, clientHeight, scrollHeight)
         let bottomOfWindow = scrollTop + clientHeight === scrollHeight
-      if (bottomOfWindow && isLoading == true) {
+        console.log(scrollTop, clientHeight, scrollHeight)
+        if (bottomOfWindow && isLoading) {
           this.developedData.page = this.developedData.page + 1 //每次分页+1
           let workStatus = 2
           let pageNo = this.developedData.page
@@ -946,7 +932,6 @@ export default {
           let typeId = this.queryParam.typeId
           let projectId = this.queryParam.projectId
           let time = this.timeSearchData
-        // console.log(pageNo, pageSize)
           await getMyTaskData({
             workStatus,
             pageNo,
@@ -956,20 +941,22 @@ export default {
             time
           }).then(({ result: res }) => {
             //有数据的时候加载
-          if (res.records.length > 0) {
+            console.log(res.records)
-            changeStyle(res.records)
+            if (res.records.length === 0) {
-            this.developedData.cardList.push(...res.records) //追加数据 使用 ...语法
-            isLoading = true
-          } else {
               this.$notify({
                 title: '温馨提示：',
                 message: '暂无更多数据信息！',
                 position: 'bottom-right'
               })
               isLoading = false //无数据可以加载
+            } else {
+              changeStyle(res.records)
+              this.developedData.cardList.push(...res.records) //追加数据 使用 ...语法
+              isLoading = true
             }
           })
         }
+      }
     },
     completedScroll(e) {
       let isLoading = true //是否有数据可以加载
@@ -1184,6 +1171,11 @@ export default {
     this.completedScroll()
     this.auditedScroll()
     this.updateWorkStatus()
+  },
+  filters: {
+    timeFilter: function (value) {
+      return moment(value).format('YYYY-MM-DD')
+    }
   }
 }
 </script>
@@ -1415,7 +1407,7 @@ header {
   }
 }
 .cards {
-  height: 100dvh;
+  height: 700px;
   overflow-x: auto;
 }
 .content {