wangfei 6 年之前
父節點
當前提交
aef5ffd4bc

+ 3
- 3
config/index.js 查看文件

@@ -12,8 +12,8 @@ module.exports = {
12 12
     proxyTable: {
13 13
       '/api': {
14 14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
15
-        // target: 'http://192.168.0.62:8080', //wf
16
-        target: 'http://192.168.0.11', //ys
15
+        target: 'http://localhost:8080', //wf
16
+        // target: 'http://192.168.0.11', //ys
17 17
         // target: 'http://dev.ycjcjy.com/', //frp
18 18
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
19 19
         // pathRewrite: {
@@ -23,7 +23,7 @@ module.exports = {
23 23
     },
24 24
     // Various Dev Server settings
25 25
     host: '0.0.0.0', // can be overwritten by process.env.HOST
26
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
26
+    port: 8081, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
27 27
     autoOpenBrowser: false,
28 28
     errorOverlay: true,
29 29
     notifyOnErrors: true,

+ 1
- 1
src/pages/system/cmsManager/indexMsg/add.vue 查看文件

@@ -77,7 +77,7 @@ export default {
77 77
         InfoUrl: '',
78 78
         OrgId: '',
79 79
         CaseId: '',
80
-        LocationId: '1'
80
+        LocationId: 'index'
81 81
       }
82 82
     }
83 83
   },

+ 1
- 1
src/pages/system/cmsManager/indexMsg/edit.vue 查看文件

@@ -77,7 +77,7 @@ export default {
77 77
         InfoUrl: '',
78 78
         OrgId: '',
79 79
         CaseId: '',
80
-        LocationId: '1'
80
+        LocationId: 'index'
81 81
       }
82 82
     }
83 83
   },

+ 2
- 2
src/pages/system/cmsManager/majorProjects/edit.vue 查看文件

@@ -286,10 +286,10 @@ export default {
286 286
     submit () {
287 287
       const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
288 288
       const detailimgs = this.detailimgsArr.map(x => x.response.result.url).join(',')
289
-      const courseids = this.detail.Courses.map(x => x.CourseId).join(',')
289
+      const courseids = (this.detail.Courses || []).map(x => x.CourseId).join(',')
290 290
       if (this.id === '') {
291 291
         this.detail.OrgId = this.OrgId
292
-        this.AddCaseInfo({...this.detail, imgs, detailimgs, courseids}).then(res => {
292
+        this.AddCaseInfo({...this.detail, OrgId: this.OrgId, imgs, detailimgs, courseids}).then(res => {
293 293
           this.afterSave()
294 294
         })
295 295
       } else {

+ 1
- 1
src/pages/system/cmsManager/majorProjects/index.vue 查看文件

@@ -168,7 +168,7 @@ export default {
168 168
       this.getList()
169 169
     },
170 170
     addMajorProjects () {
171
-      this.$router.push({ name: 'addIndexCase' })
171
+      this.$router.push({ name: 'editIndexCase' })
172 172
     },
173 173
     getList () {
174 174
       this.tableData = []

+ 1
- 1
src/pages/system/cmsManager/newsManager/add.vue 查看文件

@@ -36,7 +36,7 @@
36 36
           <span>图片位置:</span>
37 37
           <div class="flex-item">
38 38
             <div style="width:50%">
39
-              <el-select v-model="postData.LocationIds" multiple placeholder="请选择">
39
+              <el-select style="width:100%" v-model="postData.LocationIds" multiple placeholder="请选择">
40 40
                 <el-option
41 41
                   v-for="item in positionList"
42 42
                   :key="item.LocationId"

+ 1
- 1
src/pages/system/cmsManager/newsManager/edit.vue 查看文件

@@ -36,7 +36,7 @@
36 36
           <span>图片位置:</span>
37 37
           <div class="flex-item">
38 38
             <div style="width:50%">
39
-              <el-select v-model="postData.LocationIds" multiple placeholder="请选择">
39
+              <el-select style="width:100%" v-model="postData.LocationIds" multiple placeholder="请选择">
40 40
                 <el-option
41 41
                   v-for="item in positionList"
42 42
                   :key="item.LocationId"

+ 1
- 1
src/pages/system/courseManager/fiveA/add.vue 查看文件

@@ -39,7 +39,7 @@
39 39
           </div>
40 40
         </li>
41 41
         <li class="flex-h">
42
-          <span>课程图片:</span>
42
+          <span>图片:</span>
43 43
           <div class="flex-item">
44 44
             <el-upload
45 45
               :action="$api.file.image.url"

+ 1
- 1
src/pages/system/courseManager/fiveA/edit.vue 查看文件

@@ -51,7 +51,7 @@
51 51
           </div>
52 52
         </li> -->
53 53
         <li class="flex-h">
54
-          <span>课程图片:</span>
54
+          <span>图片:</span>
55 55
           <div class="flex-item">
56 56
             <el-upload
57 57
               :action="$api.file.image.url"

+ 1
- 1
src/pages/system/systemSet/userManager/add.vue 查看文件

@@ -103,7 +103,7 @@
103 103
           </div>
104 104
         </li>
105 105
         <li class="flex-h">
106
-          <!-- <span>选择案场:</span> -->
106
+          <span>选择案场:</span>
107 107
           <div class="flex-item">
108 108
             <el-select v-model="CaseId" placeholder="请选择">
109 109
               <el-option

+ 1
- 1
src/pages/system/systemSet/userManager/edit.vue 查看文件

@@ -103,7 +103,7 @@
103 103
           </div>
104 104
         </li>
105 105
         <li class="flex-h">
106
-          <!-- <span>选择案场:</span> -->
106
+          <span>选择案场:</span>
107 107
           <div class="flex-item">
108 108
             <el-select v-model="CaseId" placeholder="请选择">
109 109
               <el-option

+ 1
- 1
src/pages/system/systemSet/userManager/index.vue 查看文件

@@ -290,7 +290,7 @@ export default {
290 290
         method: this.$api.systemSet.getUserList.method,
291 291
         queryData: { ...this.postData, caseid: this.CaseId, typeid: this.usertype, username: this.name }
292 292
       }).then(res => {
293
-        for (var n = 0; n < res.list.length; n++) {
293
+        for (var n = 0; n < (res.list || []).length; n++) {
294 294
           res.list[n].CreateDate = this.returnTime(res.list[n].CreateDate)
295 295
         }
296 296
         this.currentList = res.list