wangfei 6 years ago
parent
commit
aef5ffd4bc

+ 3
- 3
config/index.js View File

12
     proxyTable: {
12
     proxyTable: {
13
       '/api': {
13
       '/api': {
14
         // target: 'https://dp.huiju360.com.cn/hj_operations',
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
         // target: 'http://dev.ycjcjy.com/', //frp
17
         // target: 'http://dev.ycjcjy.com/', //frp
18
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
18
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
19
         // pathRewrite: {
19
         // pathRewrite: {
23
     },
23
     },
24
     // Various Dev Server settings
24
     // Various Dev Server settings
25
     host: '0.0.0.0', // can be overwritten by process.env.HOST
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
     autoOpenBrowser: false,
27
     autoOpenBrowser: false,
28
     errorOverlay: true,
28
     errorOverlay: true,
29
     notifyOnErrors: true,
29
     notifyOnErrors: true,

+ 1
- 1
src/pages/system/cmsManager/indexMsg/add.vue View File

77
         InfoUrl: '',
77
         InfoUrl: '',
78
         OrgId: '',
78
         OrgId: '',
79
         CaseId: '',
79
         CaseId: '',
80
-        LocationId: '1'
80
+        LocationId: 'index'
81
       }
81
       }
82
     }
82
     }
83
   },
83
   },

+ 1
- 1
src/pages/system/cmsManager/indexMsg/edit.vue View File

77
         InfoUrl: '',
77
         InfoUrl: '',
78
         OrgId: '',
78
         OrgId: '',
79
         CaseId: '',
79
         CaseId: '',
80
-        LocationId: '1'
80
+        LocationId: 'index'
81
       }
81
       }
82
     }
82
     }
83
   },
83
   },

+ 2
- 2
src/pages/system/cmsManager/majorProjects/edit.vue View File

286
     submit () {
286
     submit () {
287
       const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
287
       const imgs = this.imgsArr.map(x => x.response.result.url).join(',')
288
       const detailimgs = this.detailimgsArr.map(x => x.response.result.url).join(',')
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
       if (this.id === '') {
290
       if (this.id === '') {
291
         this.detail.OrgId = this.OrgId
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
           this.afterSave()
293
           this.afterSave()
294
         })
294
         })
295
       } else {
295
       } else {

+ 1
- 1
src/pages/system/cmsManager/majorProjects/index.vue View File

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

+ 1
- 1
src/pages/system/cmsManager/newsManager/add.vue View File

36
           <span>图片位置:</span>
36
           <span>图片位置:</span>
37
           <div class="flex-item">
37
           <div class="flex-item">
38
             <div style="width:50%">
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
                 <el-option
40
                 <el-option
41
                   v-for="item in positionList"
41
                   v-for="item in positionList"
42
                   :key="item.LocationId"
42
                   :key="item.LocationId"

+ 1
- 1
src/pages/system/cmsManager/newsManager/edit.vue View File

36
           <span>图片位置:</span>
36
           <span>图片位置:</span>
37
           <div class="flex-item">
37
           <div class="flex-item">
38
             <div style="width:50%">
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
                 <el-option
40
                 <el-option
41
                   v-for="item in positionList"
41
                   v-for="item in positionList"
42
                   :key="item.LocationId"
42
                   :key="item.LocationId"

+ 1
- 1
src/pages/system/courseManager/fiveA/add.vue View File

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

+ 1
- 1
src/pages/system/courseManager/fiveA/edit.vue View File

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

+ 1
- 1
src/pages/system/systemSet/userManager/add.vue View File

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

+ 1
- 1
src/pages/system/systemSet/userManager/edit.vue View File

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

+ 1
- 1
src/pages/system/systemSet/userManager/index.vue View File

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