Merge branch 'master' of http://192.168.4.246:3000/zhangs/surveyMaker

src/util/time.js

@@ -8,7 +8,7 @@ const dateStr = (date) => {
   //获取js 时间戳
   var time = new Date().getTime();
   //去掉 js 时间戳后三位，与php 时间戳保持一致
-  time = parseInt((time - date * 1000) / 1000);
+  time = parseInt((time - date) / 1000);
   //存储转换值 
   var s;
   if (time < 60 * 10) {//十分钟内
@@ -27,7 +27,7 @@ const dateStr = (date) => {
     return s + "天前";
   } else {
     //超过3天
-    var date = new Date(parseInt(date) * 1000);
+    var date = new Date(parseInt(date));
     return date.getFullYear() + "/" + (date.getMonth() + 1) + "/" + date.getDate();
   }
 }

src/views/cnctestlists/cncTestLists.vue

@@ -2,136 +2,148 @@
 </template>
 
 <script>
-    import HeaderMain from "../../components/HeaderMain";
-    import api from '../../api/editor'
-    export default {
-        components: {
-            HeaderMain
-        },
-        data() {
-            return {
-                cncTestDetailSingle: null,
-                houseList: [],
-                value: '',
-                isShowDialog: false,
-                pageModel: null,
-                loading: true,
-                currentProject: "所属项目",
-                currentProjectHouseId: "",
-                fullscreenLoading: false,
-            }
-        },
-        created() {
-            this.houseList = [];
-            this.fullscreenLoading = true;
-            api.houseList().then((res) => {
-                if (res.success) {
-                    this.houseList = res.list;
-                }
-            });
-            this.getCncTestcaseList();
-        },
-        filters: {
-            transtion(val) {
-                return String.fromCharCode(64 + parseInt(val));
-            },
-            currentOptionNum(section) {
-                var chnNumChar = ["零", "一", "二", "三", "四", "五", "六", "七", "八", "九"];
-                var chnUnitChar = ["", "十", "百", "千", "万", "亿", "万亿", "亿亿"];
-                var strIns = '', chnStr = '';
-                var unitPos = 0;
-                var zero = true;
-                while (section > 0) {
-                    var v = section % 10;
-                    if (v === 0) {
-                        if (!zero) {
-                            zero = true;
-                            chnStr = chnNumChar[v] + chnStr;
-                        }
-                    } else {
-                        zero = false;
-                        strIns = chnNumChar[v];
-                        strIns += chnUnitChar[unitPos];
-                        chnStr = strIns + chnStr;
-                    }
-                    unitPos++;
-                    section = Math.floor(section / 10);
-                }
-                if (chnStr.indexOf("一十") == 0) {
-                    chnStr = chnStr.substr(1);
-                }
-                return "题目" + chnStr;
-            }
-        },
-        methods: {
-            getCncTestcaseList() {
-                let data = {
-                    "houseId": this.currentProjectHouseId,
-                    "pageNo": 1,
-                    "pageSize": 20,
-                    "uid": ""
-                }
-                api.cncTestcaseList(data).then((res) => {
-                    if (res.success) {
-                        this.pageModel = res.pageModel;
-                    }
-                    this.fullscreenLoading = false;
-                })
-            },
-            cncTestDetail(testcaseId) {
-                let that = this;
-                let data = {
-                    testcaseId
-                }
-                api.cncTestDetail(data).then((res) => {
-                    if (res.success) {
-                        that.cncTestDetailSingle = res.single;
-                    }
-                    that.loading = false;
-                })
-            },
-            showQRDialog(testcaseId) {
-                this.isShowDialog = true;
-                this.loading = true;
-                this.cncTestDetail(testcaseId);
-            },
-            close() {
-                this.isShowDialog = false;
-                this.cncTestDetailSingle = null;
-            },
-            handleCommand(command) {
-                this.houseList.forEach(element => {
-                    if (element.houseId === command) {
-                        this.currentProject = element.houseName;
-                        this.currentProjectHouseId = element.houseId;
-                        this.fullscreenLoading = true;
-                        this.getCncTestcaseList();
-                        return true
-                    } else {
-                        this.currentProjectHouseId = "";
-                        return false
-                    }
-                });
-
-            },
-            useCurrentTest(item) {
-                let data = {
-                    "creator": "admin",
-                    "ownHouseName": item.houseName,
-                    "questionCount": item.questionCount,
-                    "title": item.title,
-                };
-                let that = this;
-                api.createTest(data).then((res) => {
-                    if (res.success) {
-                        that.$router.push({ path: '/h5editor', query: { itemId: res.id } })
-                    }
-                })
-
-            },
-        },
+import HeaderMain from "../../components/HeaderMain";
+import api from "../../api/editor";
+export default {
+  components: {
+    HeaderMain
+  },
+  data() {
+    return {
+      cncTestDetailSingle: null,
+      houseList: [],
+      value: "",
+      isShowDialog: false,
+      pageModel: null,
+      loading: true,
+      currentProject: "所属项目",
+      currentProjectHouseId: "",
+      fullscreenLoading: false
+    };
+  },
+  created() {
+    this.houseList = [];
+    this.fullscreenLoading = true;
+    api.houseList().then(res => {
+      if (res.success) {
+        this.houseList = res.list;
+      }
+    });
+    this.getCncTestcaseList();
+  },
+  filters: {
+    transtion(val) {
+      return String.fromCharCode(64 + parseInt(val));
+    },
+    currentOptionNum(section) {
+      var chnNumChar = [
+        "零",
+        "一",
+        "二",
+        "三",
+        "四",
+        "五",
+        "六",
+        "七",
+        "八",
+        "九"
+      ];
+      var chnUnitChar = ["", "十", "百", "千", "万", "亿", "万亿", "亿亿"];
+      var strIns = "",
+        chnStr = "";
+      var unitPos = 0;
+      var zero = true;
+      while (section > 0) {
+        var v = section % 10;
+        if (v === 0) {
+          if (!zero) {
+            zero = true;
+            chnStr = chnNumChar[v] + chnStr;
+          }
+        } else {
+          zero = false;
+          strIns = chnNumChar[v];
+          strIns += chnUnitChar[unitPos];
+          chnStr = strIns + chnStr;
+        }
+        unitPos++;
+        section = Math.floor(section / 10);
+      }
+      if (chnStr.indexOf("一十") == 0) {
+        chnStr = chnStr.substr(1);
+      }
+      return "题目" + chnStr;
+    }
+  },
+  methods: {
+    getCncTestcaseList() {
+      let data = {
+        houseId: this.currentProjectHouseId,
+        pageNo: 1,
+        pageSize: 20,
+        uid: ""
+      };
+      api.cncTestcaseList(data).then(res => {
+        if (res.success) {
+          this.pageModel = res.pageModel;
+        }
+        this.fullscreenLoading = false;
+      });
+    },
+    cncTestDetail(testcaseId) {
+      let that = this;
+      let data = {
+        testcaseId
+      };
+      api.cncTestDetail(data).then(res => {
+        if (res.success) {
+          that.cncTestDetailSingle = res.single;
+        }
+        that.loading = false;
+      });
+    },
+    showQRDialog(testcaseId) {
+      this.isShowDialog = true;
+      this.loading = true;
+      this.cncTestDetail(testcaseId);
+    },
+    close() {
+      this.isShowDialog = false;
+      this.cncTestDetailSingle = null;
+    },
+    handleCommand(command) {
+      this.houseList.forEach(element => {
+        if (element.houseId === command) {
+          this.currentProject = element.houseName;
+          this.currentProjectHouseId = element.houseId;
+          this.fullscreenLoading = true;
+          this.getCncTestcaseList();
+          return true;
+        } else {
+          this.currentProjectHouseId = "";
+          return false;
+        }
+      });
+    },
+    useCurrentTest(item) {
+      let data = {
+        creator: "admin",
+        ownHouseName: item.houseName,
+        questionCount: item.questionCount,
+        title: item.title,
+        jsonString:
+          '{"pages":[{"elements":[]}],"createDate":1566357290066,"type":"h5","_id":"5d5cb72addd4fa1c047df1d5","title":"标题","description":"描述","canvasHeight":1334,"canvasWidth":750,"bgc":"#B1C096","btnColor":"#5f8a61","cover":"","animatedNameGlobal":"","bodyBackgroundColor":"rgba(255,255,255,0)","animatedNameBackgroundGlobal":"","backgroundAudio":"","loginId":"caodd@elab-plus.com","__v":0}'
+      };
+      let that = this;
+      api.createTest(data).then(res => {
+        if (res.success) {
+          that.$router.push({ path: "/h5editor", query: { itemId: res.id } });
+        }
+      });
     }
+  }
+};
 </script>
 <style lang="scss" scoped>
-    @import './cncTestLists.scss';
+@import "./cncTestLists.scss";
 </style>

src/views/myHistoryTest/myHistoryTest.html

@@ -31,7 +31,7 @@
     <div class="item" v-for="(item,index) in pageModel.resultSet" :key="item.created"
       :class="{ itemCopy: isCopy && index == 0 }">
       <!-- <img  mode="" :src="" alt=""> -->
-      <el-image class="item-img" :src="item.coverImg">
+      <el-image class="item-img" :src="item.coverImg" fit="cover">
         <div slot="error" class="outline">
           <img class="item-img-outline" src="../../assets/images/picture-error.png" alt="">
           <!-- <i class="el-icon-picture-outline"></i> -->