diff --git a/.env.development b/.env.development index 292bbd2..09436bd 100644 --- a/.env.development +++ b/.env.development @@ -6,6 +6,7 @@ VUE_APP_BASE_API = '/prod-api' # VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/test-api' VUE_APP_BASE_TARGET = 'http://192.168.0.229:9999' +# VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999' # VUE_APP_BASE_TARGET = 'http://www.bjkeyware.com/prod-api' # VUE_APP_BASE_TARGET = 'http://192.168.0.129:9999' diff --git a/admin_prod.zip b/admin_prod.zip deleted file mode 100644 index 44ea6f3..0000000 Binary files a/admin_prod.zip and /dev/null differ diff --git a/admin_test.zip b/admin_test.zip deleted file mode 100644 index 7e3a6d4..0000000 Binary files a/admin_test.zip and /dev/null differ diff --git a/src/api/trainService/index.js b/src/api/trainService/index.js index a76b1f2..ff09d24 100644 --- a/src/api/trainService/index.js +++ b/src/api/trainService/index.js @@ -379,3 +379,18 @@ export function expLearnNum(courseId) { responseType: "blob", }); } + +export function assignHomeWork(data) { + return request({ + url: "course/admin/setting/homework", + method: "post", + data, + }); +} +// export function updateHomeWork(data) { +// return request({ +// url: "/course/admin/course/updateHomework", +// method: "post", +// data +// }); +// } diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 080f265..a999f88 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -65,6 +65,8 @@ export default { this.$emit('input', '') }, handleUploadSuccess(res) { + console.log(res); + this.$emit('input', res.fileName) this.loading.close() }, diff --git a/src/components/formatForm/drective.js b/src/components/formatForm/drective.js index e69de29..f987721 100644 --- a/src/components/formatForm/drective.js +++ b/src/components/formatForm/drective.js @@ -0,0 +1,47 @@ +/** + * 自定义拖拽指令 + * 生命周期指令包括: + * bind 第一次绑定在元素上时调用、只调用一次 + * inserted 元素被插入父节点时调用、 + * update + * componentUpdate 指令所在组件的 VNode 及其子 VNode 全部更新后调用。 + * unbind 解绑时调用 + * + * mouseEvent类型的事件有: + * client 提供事件发生时的应用客户端区域的水平坐标,也就是无论是否滚动都会,最上方都是0 + * ctrlKey 当 ctrl 键被按下,返回 true,否则返回 false。 + * layer 往上找有定位属性的父元素的左上角(自身有定位属性的话就是相对于自身),都没有的话,就是相对于body的左上角 + * metaKey mac为Mata,windows为windows键 + * movement 相当于上一次mouseMove的偏移量 + * offset 事件对象与目标节点的内填充边(padding edge)的偏移量。 + * page 相对于文档的坐标,如果向上滚动了200px,点击最上方的值为200 + * screen 提供鼠标在全局(屏幕)中的坐标(偏移量)。 + */ + +export default { + install(Vue) { + Vue.directive("dragme", { + // 指令全局命名为v-dragme + inserted(el) { + el.onmousedowm = function (ev) { + // 获取鼠标按下去时候变量 + const disX = ev.clientX - el.offsetLeft; + const disY = ev.clientY - el.offsetTop; + el.onmousemove = function (ev) { + const l = ev.clientX - disX; + const t = ev.clientY - disY; + // 实时设置元素位置 + el.style.left = l + "px"; + el.style.top = t + "px"; + // 获取鼠标移动时的变量 + }; + el.onmouseup = function () { + // 获取鼠标松开时,销毁所有变量 + document.onmousemove = null; + document.onmouseup = null; + }; + }; + }, + }); + }, +}; diff --git a/src/components/formatForm/formSource.vue b/src/components/formatForm/formSource.vue index 45545f4..ff88ebf 100644 --- a/src/components/formatForm/formSource.vue +++ b/src/components/formatForm/formSource.vue @@ -2,7 +2,7 @@

选择组件

-
+
diff --git a/src/utils/index.js b/src/utils/index.js index 701a6e7..851246e 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -390,3 +390,15 @@ export function isNumberStr(str) { +export function downPdf(val) { + fetch(val).then(respose => { + return respose.blob() + }).then(blob => { + const url = URL.createObjectURL(blob) + const a = document.createElement("a") + const name = val.substr(val.lastIndexOf('/') + 1, val.length) + a.href = url + a.download = name + a.click() + }) +} \ No newline at end of file diff --git a/src/views/components/CrowdsourceAudit.vue b/src/views/components/CrowdsourceAudit.vue index 3c78b76..1c54dfe 100644 --- a/src/views/components/CrowdsourceAudit.vue +++ b/src/views/components/CrowdsourceAudit.vue @@ -22,6 +22,7 @@ {{ task.area }} + {{ levelMap[task.level] }} {{ task.contactName }} {{ task.contactTel }} @@ -136,6 +137,13 @@ import TestType from './enum/TestType' import OnsiteType from './enum/OnsiteType' import TesterType from './enum/TesterType' +const levelMap = { + '0':'无门槛', + '1':'一级', + '2':'二级', + '3':'三级', +} + export default { name: 'CrowdsourceAudit', components: { TesterType, OnsiteType, TestType }, @@ -157,6 +165,8 @@ export default { form: {}, task: {}, rules: {}, + levelMap:levelMap + } }, methods: { diff --git a/src/views/components/TaskInfo.vue b/src/views/components/TaskInfo.vue index 6be5c47..d37b2d4 100644 --- a/src/views/components/TaskInfo.vue +++ b/src/views/components/TaskInfo.vue @@ -183,6 +183,10 @@
地域要求:
{{ task.area }}
+ 修改 删除 +