Merge commit '322d08aa4d06633a77f0e23f7ce3952fdc266951' into gzb

public/config.js

@@ -6,7 +6,7 @@ window._config = window.isTest
       showImageUrl: "//xhwebstatictest.xhkjedu.com/",
       axiosApiTimeout: 20, // 接口超时时间 单位秒
       axiosFileTimeout: 30, // 上传文件超时时间 单位秒
-      versionname: "测试 v3.8.6",
+      versionname: "测试 v1.0.0",
     }
   : {
       // 正式环境
@@ -14,5 +14,5 @@ window._config = window.isTest
       showImageUrl: "//xhwebstatic.xhkjedu.com/",
       axiosApiTimeout: 20, // 接口超时时间 单位秒
       axiosFileTimeout: 30, // 上传文件超时时间 单位秒
-      versionname: "测试 v3.8.6",
+      versionname: "测试 v1.0.0",
     };

src/components/MyDatePicker/index.vue

@@ -1,167 +0,0 @@
-<template>
-  <div>
-    <DatePicker
-      type="date"
-      :value="currentDate"
-      :options="timeOptions"
-      @on-change="timeChange"
-      :editable="false"
-      :clearable="Boolean(clearable)"
-      :placeholder="placeholder"
-    ></DatePicker>
-  </div>
-</template>
-
-<script>
-export default {
-  /* 
-  range 时间范围
-  current 传入时间
-  placeholder 占位符
-  history 时间范围是否为历史时间 默认false
-  clearable 清除
-  */
-  props: ["range", "current", "placeholder", "history", "clearable"],
-  data() {
-    return {
-      timeOptions: {},
-      currentDate: null
-    };
-  },
-  watch: {
-    range: {
-      handler(rangeArr) {
-        // rangeArr[开始日期, 结束日期]
-        if (rangeArr.length === 1) {
-          if (this.history) {
-            let [endDate] = rangeArr;
-            if (endDate) {
-              if (endDate instanceof String) {
-                endDate = this.setStringToDate(endDate);
-              } else {
-                endDate = new Date(endDate);
-              }
-              endDate.setHours(0);
-              endDate.setMinutes(0);
-              endDate.setSeconds(0);
-              endDate.setMilliseconds(0);
-            }
-            this.timeOptions = {
-              disabledDate: (date) => {
-                return date && endDate && date.valueOf() > endDate.getTime();
-              }
-            };
-          } else {
-            let [startDate] = rangeArr;
-            if (startDate) {
-              if (startDate instanceof String) {
-                startDate = this.setStringToDate(startDate);
-              } else {
-                startDate = new Date(startDate);
-              }
-              startDate.setHours(0);
-              startDate.setMinutes(0);
-              startDate.setSeconds(0);
-              startDate.setMilliseconds(0);
-            }
-            this.timeOptions = {
-              disabledDate: (date) => {
-                return (
-                  date && startDate && date.valueOf() < startDate.getTime()
-                );
-              }
-            };
-          }
-        } else if (rangeArr.length === 2) {
-          let [startDate, endDate] = rangeArr;
-          if (startDate) {
-            if (startDate instanceof String) {
-              startDate = this.setStringToDate(startDate);
-            } else {
-              startDate = new Date(startDate);
-            }
-            startDate.setHours(0);
-            startDate.setMinutes(0);
-            startDate.setSeconds(0);
-            startDate.setMilliseconds(0);
-          }
-          if (endDate) {
-            if (endDate instanceof String) {
-              endDate = this.setStringToDate(endDate);
-            } else {
-              endDate = new Date(endDate);
-            }
-            endDate.setHours(0);
-            endDate.setMinutes(0);
-            endDate.setSeconds(0);
-            endDate.setMilliseconds(0);
-          }
-          this.timeOptions = {
-            disabledDate: (date) => {
-              if (date) {
-                if (startDate && !endDate) {
-                  return date.valueOf() < startDate.getTime();
-                } else if (!startDate && endDate) {
-                  return date.valueOf() > endDate.getTime();
-                } else if (startDate && endDate) {
-                  return (
-                    date.valueOf() < startDate.getTime() ||
-                    date.valueOf() > endDate.getTime()
-                  );
-                }
-              }
-              return false;
-            }
-          };
-        } else {
-          this.timeOptions = {};
-        }
-      },
-      deep: true,
-      immediate: true
-    },
-    current: {
-      handler(date, oldDate) {
-        let currentDate = null;
-        if (date) {
-          if (date !== oldDate) {
-            if (date instanceof Date) {
-              currentDate = date;
-            } else if (date instanceof String) {
-              currentDate = this.setStringToDate(date);
-            }
-          }
-        }
-        this.$nextTick(() => {
-          this.currentDate = currentDate;
-        });
-      },
-      deep: true,
-      immediate: true
-    }
-  },
-  methods: {
-    setStringToDate(timeStr) {
-      // IE不能识别字符串日期
-      let splitArray = timeStr.split(" ");
-      let dateArray = splitArray[0].split("-");
-      let d = new Date();
-      d.setFullYear(dateArray[0], dateArray[1] - 1, dateArray[2]);
-      d.setHours(0);
-      d.setMinutes(0);
-      d.setSeconds(0);
-      d.setMilliseconds(0);
-      return d;
-    },
-    timeChange(date) {
-      if (date) {
-        this.$emit("change", new Date(date));
-      } else {
-        this.$emit("change", null);
-      }
-    }
-  }
-};
-</script>
-
-<style scoped></style>

src/utils/fileConfig.js

@@ -1,90 +1,2 @@
-//文件上传格式
-export const ACCEPT_CONFIG = {
-  image: [".png", ".jpg", ".jpeg"], // ".gif", ".bmp"
-  client: [".exe"],
-  app: [".apk"],
-  audio: [".mp3", ".wav"],
-  video: [".mp4", ".flv"],
-  document: [".doc", ".docx", ".ppt", ".pptx", ".pdf"],
-  // ".class", ".dsc",
-  documentClass: [".doc", ".docx", ".ppt", ".pptx", ".pdf"],
-  zipFile: [".zip", ".rar"],
-  getPreview() {
-    return [...this.document, ...this.image, ...this.audio, ...this.video];
-  },
-  getAll() {
-    return [
-      ...this.image,
-      ...this.video,
-      ...this.document,
-      ...this.audio,
-      ...this.documentClass,
-      ...this.zipFile
-    ];
-  },
-  getClient() {
-    return [...this.client];
-  },
-  getApp() {
-    return [...this.app];
-  },
-  getImg() {
-    return [...this.image];
-  },
-  getAudio() {
-    return [...this.audio];
-  },
-  getVideo() {
-    return [...this.video];
-  },
-  getDocument() {
-    return [...this.document];
-  },
-  getDocumentClass() {
-    return [...this.documentClass];
-  },
-  getZipFile() {
-    return [...this.zipFile];
-  }
-};
-//定义分片大小
-export const CHUNK_SIZE = {
-  chunkSize: 5 * 1024 * 1024,
-  getSize() {
-    return this.chunkSize;
-  }
-};
-export const CONFIG_SUFFIX = {
-  image: ["png", "jpg", "jpeg"], // "gif", "bmp"
-  audio: ["mp3", "wav"],
-  video: ["mp4", "flv"],
-  document: ["doc", "docx", "ppt", "pptx", "pdf"],
-  documentClass: ["class", "dsc", "doc", "docx", "ppt", "pptx", "pdf"],
-  zipFile: ["zip", "rar"],
-
-  getImg() {
-    return [...this.image];
-  },
-  getAudio() {
-    return [...this.audio];
-  },
-  getVideo() {
-    return [...this.video];
-  },
-  getDocument() {
-    return [...this.document];
-  },
-  getDocumentClass() {
-    return [...this.documentClass];
-  },
-  getZipFile() {
-    return [...this.zipFile];
-  }
-};
-//教材上传封面格式
-export const MATERIAL_IMG_SUFFIX = {
-  image: ["png", "jpg", "jpeg"],
-  getImg() {
-    return [...this.image];
-  }
-};
+//图片上传格式
+export const pictureFormat = ["jpg", "jpeg", "png", "bmp", "jfif", "webp"];

src/views/history/index.vue

@@ -269,7 +269,7 @@ export default {
         content: "您确定删除选中数据吗?",
         onOk: () => {
           dh_remove({ dhid }).then((res) => {
-            if (res.code == 0) {
+            if (res.code === 0) {
               this.$Message.success(res.msg);
               this.searchList();
             }

src/views/news/index.vue

@@ -77,7 +77,24 @@
             <Radio :label="2">英文</Radio>
           </RadioGroup>
         </FormItem>
-        <FormItem label="封面" prop="newspic"></FormItem>
+        <FormItem label="封面" prop="newspic">
+          <Upload
+            :format="pictureFormat"
+            :max-size="10 * 1024"
+            action
+            :before-upload="
+              (file) => {
+                beforeUploadPicture(file, addForm);
+                return false;
+              }
+            "
+            :accept="getPictureAccept()"
+            :show-upload-list="false"
+          >
+            <img v-if="addForm.newspic" :src="$api.showImageUrl" />
+            <Button v-else icon="ios-cloud-upload-outline">上传封面</Button>
+          </Upload>
+        </FormItem>
         <FormItem label="置顶" prop="newsup">
           <RadioGroup v-model="addForm.newsup">
             <Radio :label="1">置顶</Radio>
@@ -116,12 +133,15 @@
 </template>
 
 <script>
-import { n_list, n_save, n_update, n_remove, n_detail } from "@/api";
+import axios from "axios";
+import { n_list, n_save, n_update, n_remove } from "@/api";
 import { dateFormat } from "@/utils";
+import { pictureFormat } from "@/utils/fileConfig";
 export default {
   data() {
     return {
       dateFormat,
+      pictureFormat,
       newsSearch: {
         ltype: 1,
         newstitle: "",
@@ -259,6 +279,16 @@ export default {
         newsup: 2,
         newsorder: 1,
         newscontent: ""
+      },
+      detailInfo: {
+        show: false,
+        ltype: 1,
+        newspic: "",
+        newstitle: "",
+        newssummary: "",
+        newsup: 2,
+        newsorder: 1,
+        newscontent: ""
       }
     };
   },
@@ -267,6 +297,30 @@ export default {
     this.getNewsList();
   },
   methods: {
+    beforeUploadPicture(file, formObj) {
+      let formData = new FormData();
+      formData.append("files", file);
+      formData.append("savefolder", "news");
+      axios
+        .post(this.$api.baseUrl + "file/upload", formData, {
+          timeout: 1000 * window._config.axiosFileTimeout
+        })
+        .then((res) => {
+          if (res.data.code === 0) {
+            formObj.newspic = res.data.obj;
+          } else {
+            this.$Message.error(res.data.msg);
+          }
+        })
+        .catch(() => {});
+    },
+    getPictureAccept() {
+      return this.pictureFormat
+        .map((v) => {
+          return `.${v}`;
+        })
+        .join(",");
+    },
     searchList() {
       this.newsSearch.page = 1;
       this.getNewsList();
@@ -306,7 +360,25 @@ export default {
         newscontent: ""
       };
     },
-    toSaveAdd() {},
+    toSaveAdd() {
+      n_save({
+        newstitle: this.addForm.newstitle,
+        newscontent: this.addForm.newscontent,
+        newssummary: this.addForm.newssummary,
+        newspic: this.addForm.newspic,
+        ltype: this.addForm.ltype,
+        newsorder: this.addForm.newsorder,
+        newsup: this.addForm.newsup,
+        createid: this.userInfo.userid
+      }).then((res) => {
+        if (res.code === 0) {
+          this.$Message.success(res.msg);
+          this.searchList();
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     toModify(row) {
       this.modifyForm = {
         show: true,
@@ -319,7 +391,24 @@ export default {
         newscontent: row.newscontent
       };
     },
-    toSaveModify() {},
+    toSaveModify() {
+      n_update({
+        newstitle: this.modifyForm.newstitle,
+        newscontent: this.modifyForm.newscontent,
+        newssummary: this.modifyForm.newssummary,
+        newspic: this.modifyForm.newspic,
+        newsorder: this.modifyForm.newsorder,
+        newsup: this.modifyForm.newsup,
+        newsid: this.modifyForm.newsid
+      }).then((res) => {
+        if (res.code === 0) {
+          this.$Message.success(res.msg);
+          this.searchList();
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
+    },
     toDel(newsid) {
       this.$Modal.confirm({
         title: "提示",
@@ -329,6 +418,8 @@ export default {
             if (res.code == 0) {
               this.$Message.success(res.msg);
               this.searchList();
+            } else {
+              this.$Message.error(res.msg);
             }
           });
         },
@@ -337,6 +428,16 @@ export default {
     },
     toViewDetail(row) {
       console.log("toViewDetail", row);
+      this.detailInfo = {
+        show: true,
+        ltype: row.ltype,
+        newspic: row.newspic,
+        newstitle: row.newstitle,
+        newssummary: row.newssummary,
+        newsup: row.newsup,
+        newsorder: row.newsorder,
+        newscontent: row.newscontent
+      };
     }
   }
 };

src/views/users/index.vue

@@ -324,7 +324,7 @@ export default {
         content: "您确定删除选中数据吗?",
         onOk: () => {
           user_del({ userid }).then((res) => {
-            if (res.code == 0) {
+            if (res.code === 0) {
               this.$Message.success(res.msg);
               this.searchList();
             }