SpaceOfCheng
/
admin
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Activity
Browse Source

xcx

许成详 6 years ago
parent
3aba178187 f0613be164
commit
bdc3a46734
7 changed files with 26 additions and 18 deletions
Unified View Show Diff Stats
  1. 0
    1
      dist/index.html
  2. BIN
      dist/static/fonts/element-icons.6f0a763.ttf
  3. 0
    2
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js
  4. 0
    1
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  5. 14
    5
      src/pages/system/courseManager/scheduleManager/index.vue
  6. 2
    2
      src/pages/system/newOrder/newOrderList/index.vue
  7. 10
    7
      src/store/course/schedule.js

+ 0
- 1
dist/index.html View File

1 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.827bc6417ac299d3cd91171f220ab4a8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.c991c916dd93a86d60ad.js></script></body></html>

BIN
dist/static/fonts/element-icons.6f0a763.ttf View File


+ 0
- 2
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js View File

1 
-!function(r){var n=window.webpackJsonp;window.webpackJsonp=function(e,u,c){for(var f,i,p,a=0,l=[];a<e.length;a++)i=e[a],o[i]&&l.push(o[i][0]),o[i]=0;for(f in u)Object.prototype.hasOwnProperty.call(u,f)&&(r[f]=u[f]);for(n&&n(e,u,c);l.length;)l.shift()();if(c)for(a=0;a<c.length;a++)p=t(t.s=c[a]);return p};var e={},o={2:0};function t(n){if(e[n])return e[n].exports;var o=e[n]={i:n,l:!1,exports:{}};return r[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=r,t.c=e,t.d=function(r,n,e){t.o(r,n)||Object.defineProperty(r,n,{configurable:!1,enumerable:!0,get:e})},t.n=function(r){var n=r&&r.__esModule?function(){return r.default}:function(){return r};return t.d(n,"a",n),n},t.o=function(r,n){return Object.prototype.hasOwnProperty.call(r,n)},t.p="./",t.oe=function(r){throw console.error(r),r}}([]);
2 
-//# sourceMappingURL=manifest.3ad1d5771e9b13dbdad2.js.map

+ 0
- 1
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map View File

1 
-{"version":3,"sources":["webpack:///webpack/bootstrap efdb85158705cc5d65ef"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap efdb85158705cc5d65ef"],"sourceRoot":""}

+ 14
- 5
src/pages/system/courseManager/scheduleManager/index.vue View File

125 
       courseid: '',
125 
       courseid: '',
126 
       currentCourseItem: {},
126 
       currentCourseItem: {},
127 
       centerDialogVisible: false,
127 
       centerDialogVisible: false,
128 
+      loaded: false,
128 
     }
129 
     }
129 
   },
130 
   },
130 
   computed: {
131 
   computed: {
141 
       },
142 
       },
142 
       set (val) {
143 
       set (val) {
143 
         this.caseid = val
144 
         this.caseid = val
144 
-        this.getList()
145 
+        if (this.loaded) {
146 
+          this.getList()
147 
+        }
145 
       }
148 
       }
146 
     },
149 
     },
147 
     fcEvents () {
150 
     fcEvents () {
148 
-      return this.details.map(x => {
151 
+      return this.loaded ? this.details.map(x => {
149 
         return {
152 
         return {
150 
           title: x.DetailName,
153 
           title: x.DetailName,
151 
           start: x.BeginDate,
154 
           start: x.BeginDate,
153 
           id: x.DetailId,
156 
           id: x.DetailId,
154 
           detail: x,
157 
           detail: x,
155 
         }
158 
         }
156 
-      })
159 
+      }) : []
157 
     },
160 
     },
158 
     CurrentMonth: {
161 
     CurrentMonth: {
159 
       get () {
162 
       get () {
184 
     },
187 
     },
185 
     changeMonth (start, end, current) {
188 
     changeMonth (start, end, current) {
186 
       this.CurrentMonth = this.toolClass.dateFormat(current, 'yyyy-MM')
189 
       this.CurrentMonth = this.toolClass.dateFormat(current, 'yyyy-MM')
187 
-      this.getList()
190 
+      if (this.loaded) {
191 
+        this.getList()
192 
+      }
188 
     },
193 
     },
189 
     search () { // 搜索
194 
     search () { // 搜索
190 
-      this.getList()
195 
+      if (this.loaded) {
196 
+        this.getList()
197 
+      }
191 
     },
198 
     },
192 
     getList () {
199 
     getList () {
193 
       if (this.CaseId !== '' || this.courseid !== '') {
200 
       if (this.CaseId !== '' || this.courseid !== '') {
195 
           caseid: this.CaseId,
202 
           caseid: this.CaseId,
196 
           date: this.CurrentMonth,
203 
           date: this.CurrentMonth,
197 
           courseid: this.courseid,
204 
           courseid: this.courseid,
205 
+        }).then(res => {
206 
+          this.loaded = true
198 
         })
207 
         })
199 
       } else {
208 
       } else {
200 
         this.SetListNull()
209 
         this.SetListNull()

+ 2
- 2
src/pages/system/newOrder/newOrderList/index.vue View File

247 
       this.websock.onclose = console.log
247 
       this.websock.onclose = console.log
248 
     },
248 
     },
249 
     websocketonmessage (e) {
249 
     websocketonmessage (e) {
250 
-      let oldList = this.list
250 
+      // let oldList = this.list
251 
       let newList = JSON.parse(e.data).data.refreshOnlineGoodsOrders
251 
       let newList = JSON.parse(e.data).data.refreshOnlineGoodsOrders
252 
-      let newinfo = newList.filter(x => oldList.filter(item => item.OrdersId === x.OrdersId).length === 0)
252 
+      let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
253 
       this.updateList({list: newList}).then(() => {
253 
       this.updateList({list: newList}).then(() => {
254 
         for (let i = 0; i < newinfo.length; i++) {
254 
         for (let i = 0; i < newinfo.length; i++) {
255 
           this.printPdf(`item_${newinfo[i].OrdersId}`)
255 
           this.printPdf(`item_${newinfo[i].OrdersId}`)

+ 10
- 7
src/store/course/schedule.js View File

21 
   },
 21 
   },
22 
   actions: {
 22 
   actions: {
23 
     GetDetailList ({ commit }, payload) {
 23 
     GetDetailList ({ commit }, payload) {
24 
-      ajax(api.course.detail.url, {
25 
-        method: api.course.detail.method,
26 
-        queryData: {
27 
-          ...payload,
28 
-        }
29 
-      }).then(res => {
30 
-        commit('updateList', res)
24 
+      return new Promise((resolve, reject) => {
25 
+        ajax(api.course.detail.url, {
26 
+          method: api.course.detail.method,
27 
+          queryData: {
28 
+            ...payload,
29 
+          }
30 
+        }).then(res => {
31 
+          commit('updateList', res)
32 
+          resolve(res)
33 
+        }).catch(reject)
31 
       })
 34 
       })
32 
     },
 35 
     },
33 
     GetScheduleList ({ commit }, payload) {
 36 
     GetScheduleList ({ commit }, payload) {