许成详 6 years ago
parent
commit
6c5315dedf
38 changed files with 317 additions and 104 deletions
  1. 2
    1
      config/index.js
  2. 8
    3
      src/pages/system/caseManager/caseAreaManager/add.vue
  3. 8
    3
      src/pages/system/caseManager/caseAreaManager/edit.vue
  4. 8
    2
      src/pages/system/caseManager/caseInfo/addCase/index.vue
  5. 8
    2
      src/pages/system/caseManager/caseInfo/editCase/index.vue
  6. 1
    1
      src/pages/system/caseManager/caseInfo/index.vue
  7. 8
    3
      src/pages/system/caseManager/caseTableManager/add.vue
  8. 8
    3
      src/pages/system/caseManager/caseTableManager/edit.vue
  9. 10
    3
      src/pages/system/channelManager/channelList/add.vue
  10. 10
    3
      src/pages/system/channelManager/channelList/edit.vue
  11. 8
    3
      src/pages/system/cmsManager/bannerManager/add.vue
  12. 8
    3
      src/pages/system/cmsManager/bannerManager/edit.vue
  13. 8
    3
      src/pages/system/cmsManager/indexMsg/add.vue
  14. 8
    3
      src/pages/system/cmsManager/indexMsg/edit.vue
  15. 8
    3
      src/pages/system/cmsManager/majorProjects/add.vue
  16. 8
    3
      src/pages/system/cmsManager/majorProjects/edit.vue
  17. 8
    3
      src/pages/system/cmsManager/newsManager/add.vue
  18. 8
    3
      src/pages/system/cmsManager/newsManager/edit.vue
  19. 1
    1
      src/pages/system/cmsManager/newsManager/index.vue
  20. 10
    3
      src/pages/system/courseManager/courseTag/add.vue
  21. 10
    3
      src/pages/system/courseManager/courseTag/edit.vue
  22. 8
    2
      src/pages/system/courseManager/fiveA/add.vue
  23. 8
    2
      src/pages/system/courseManager/fiveA/edit.vue
  24. 9
    7
      src/pages/system/courseManager/fiveA/index.vue
  25. 8
    3
      src/pages/system/goodsManager/goodsSpecManager/add.vue
  26. 8
    3
      src/pages/system/goodsManager/goodsSpecManager/edit.vue
  27. 8
    3
      src/pages/system/goodsManager/goodsTypeManager/add.vue
  28. 4
    1
      src/pages/system/systemSet/roleManager/add.vue
  29. 4
    1
      src/pages/system/systemSet/roleManager/edit.vue
  30. 7
    0
      src/pages/system/systemSet/roleManager/index.vue
  31. 8
    3
      src/pages/system/systemSet/userManager/add.vue
  32. 8
    3
      src/pages/system/systemSet/userManager/edit.vue
  33. 7
    1
      src/pages/system/systemSet/userManager/index.vue
  34. 32
    0
      src/pages/test/test.vue
  35. 4
    2
      src/store/index.js
  36. 12
    0
      src/store/user/index.js
  37. 24
    16
      src/util/ajax.js
  38. 2
    2
      src/util/api.js

+ 2
- 1
config/index.js View File

11
     assetsPublicPath: '/',
11
     assetsPublicPath: '/',
12
     proxyTable: {
12
     proxyTable: {
13
       '/api': {
13
       '/api': {
14
-        target: 'http://192.168.0.62:8080/api', // 接口的域名
14
+        target: 'https://dp.huiju360.com.cn/hj_operations',
15
+        // target: 'http://192.168.0.62:8080/api',
15
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
16
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
16
         pathRewrite: {
17
         pathRewrite: {
17
           '^/api': ''
18
           '^/api': ''

+ 8
- 3
src/pages/system/caseManager/caseAreaManager/add.vue View File

54
           </div>
54
           </div>
55
         </li>
55
         </li>
56
         <li style="text-align:center">
56
         <li style="text-align:center">
57
-          <el-button type="primary" size="mini">保存</el-button>
58
-          <el-button type="danger" size="mini">取消</el-button>
57
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
58
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
59
         </li>
59
         </li>
60
       </ul>
60
       </ul>
61
     </form>
61
     </form>
85
   },
85
   },
86
   components: {},
86
   components: {},
87
   methods: {
87
   methods: {
88
-
88
+    submit () {
89
+      console.log(this.postData)
90
+    },
91
+    cancel () {
92
+      this.$router.go(-1)
93
+    }
89
   },
94
   },
90
   mounted () {}
95
   mounted () {}
91
 }
96
 }

+ 8
- 3
src/pages/system/caseManager/caseAreaManager/edit.vue View File

54
           </div>
54
           </div>
55
         </li>
55
         </li>
56
         <li style="text-align:center">
56
         <li style="text-align:center">
57
-          <el-button type="primary" size="mini">保存</el-button>
58
-          <el-button type="danger" size="mini">取消</el-button>
57
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
58
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
59
         </li>
59
         </li>
60
       </ul>
60
       </ul>
61
     </form>
61
     </form>
85
   },
85
   },
86
   components: {},
86
   components: {},
87
   methods: {
87
   methods: {
88
-
88
+    submit () {
89
+      console.log(this.postData)
90
+    },
91
+    cancel () {
92
+      this.$router.go(-1)
93
+    }
89
   },
94
   },
90
   mounted () {}
95
   mounted () {}
91
 }
96
 }

+ 8
- 2
src/pages/system/caseManager/caseInfo/addCase/index.vue View File

88
           </div>
88
           </div>
89
         </li>
89
         </li>
90
         <li style="text-align:center">
90
         <li style="text-align:center">
91
-          <el-button type="primary" size="mini">保存</el-button>
92
-          <el-button type="danger" size="mini">取消</el-button>
91
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
92
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
93
         </li>
93
         </li>
94
       </ul>
94
       </ul>
95
     </form>
95
     </form>
141
         }
141
         }
142
         this.mapCenter = [center.lng, center.lat]
142
         this.mapCenter = [center.lng, center.lat]
143
       }
143
       }
144
+    },
145
+    submit () {
146
+      console.log(this.postData)
147
+    },
148
+    cancel () {
149
+      this.$router.go(-1)
144
     }
150
     }
145
   }
151
   }
146
 }
152
 }

+ 8
- 2
src/pages/system/caseManager/caseInfo/editCase/index.vue View File

88
           </div>
88
           </div>
89
         </li>
89
         </li>
90
         <li style="text-align:center">
90
         <li style="text-align:center">
91
-          <el-button type="primary" size="mini">保存</el-button>
92
-          <el-button type="danger" size="mini">取消</el-button>
91
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
92
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
93
         </li>
93
         </li>
94
       </ul>
94
       </ul>
95
     </form>
95
     </form>
141
         }
141
         }
142
         this.mapCenter = [center.lng, center.lat]
142
         this.mapCenter = [center.lng, center.lat]
143
       }
143
       }
144
+    },
145
+    submit () {
146
+      console.log(this.postData)
147
+    },
148
+    cancel () {
149
+      this.$router.go(-1)
144
     }
150
     }
145
   }
151
   }
146
 }
152
 }

+ 1
- 1
src/pages/system/caseManager/caseInfo/index.vue View File

51
             <el-button
51
             <el-button
52
               size="mini"
52
               size="mini"
53
               type="warning"
53
               type="warning"
54
-              @click="editItem(scope.$index, scope.row)">修改</el-button>
54
+              @click="editItem(scope.$index, scope.row)">编辑</el-button>
55
             <!-- <el-button
55
             <!-- <el-button
56
               size="mini"
56
               size="mini"
57
               type="success"
57
               type="success"

+ 8
- 3
src/pages/system/caseManager/caseTableManager/add.vue View File

30
           </div>
30
           </div>
31
         </li>
31
         </li>
32
         <li style="text-align:center">
32
         <li style="text-align:center">
33
-          <el-button type="primary" size="mini">保存</el-button>
34
-          <el-button type="danger" size="mini">取消</el-button>
33
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
34
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
35
         </li>
35
         </li>
36
       </ul>
36
       </ul>
37
     </form>
37
     </form>
57
   },
57
   },
58
   components: {},
58
   components: {},
59
   methods: {
59
   methods: {
60
-
60
+    submit () {
61
+      console.log(this.postData)
62
+    },
63
+    cancel () {
64
+      this.$router.go(-1)
65
+    }
61
   },
66
   },
62
   mounted () { }
67
   mounted () { }
63
 }
68
 }

+ 8
- 3
src/pages/system/caseManager/caseTableManager/edit.vue View File

30
           </div>
30
           </div>
31
         </li>
31
         </li>
32
         <li style="text-align:center">
32
         <li style="text-align:center">
33
-          <el-button type="primary" size="mini">保存</el-button>
34
-          <el-button type="danger" size="mini">取消</el-button>
33
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
34
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
35
         </li>
35
         </li>
36
       </ul>
36
       </ul>
37
     </form>
37
     </form>
57
   },
57
   },
58
   components: {},
58
   components: {},
59
   methods: {
59
   methods: {
60
-
60
+    submit () {
61
+      console.log(this.postData)
62
+    },
63
+    cancel () {
64
+      this.$router.go(-1)
65
+    }
61
   },
66
   },
62
   mounted () { }
67
   mounted () { }
63
 }
68
 }

+ 10
- 3
src/pages/system/channelManager/channelList/add.vue View File

27
           </div>
27
           </div>
28
         </li>
28
         </li>
29
         <li style="text-align:center">
29
         <li style="text-align:center">
30
-          <el-button type="primary" size="mini">保存</el-button>
31
-          <el-button type="danger" size="mini">取消</el-button>
30
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
31
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
32
         </li>
32
         </li>
33
       </ul>
33
       </ul>
34
     </form>
34
     </form>
47
     }
47
     }
48
   },
48
   },
49
   components: {},
49
   components: {},
50
-  methods: {},
50
+  methods: {
51
+    submit () {
52
+      console.log(this.postData)
53
+    },
54
+    cancel () {
55
+      this.$router.go(-1)
56
+    }
57
+  },
51
   mounted () {}
58
   mounted () {}
52
 }
59
 }
53
 </script>
60
 </script>

+ 10
- 3
src/pages/system/channelManager/channelList/edit.vue View File

27
           </div>
27
           </div>
28
         </li>
28
         </li>
29
         <li style="text-align:center">
29
         <li style="text-align:center">
30
-          <el-button type="primary" size="mini">保存</el-button>
31
-          <el-button type="danger" size="mini">取消</el-button>
30
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
31
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
32
         </li>
32
         </li>
33
       </ul>
33
       </ul>
34
     </form>
34
     </form>
47
     }
47
     }
48
   },
48
   },
49
   components: {},
49
   components: {},
50
-  methods: {},
50
+  methods: {
51
+    submit () {
52
+      console.log(this.postData)
53
+    },
54
+    cancel () {
55
+      this.$router.go(-1)
56
+    }
57
+  },
51
   mounted () {}
58
   mounted () {}
52
 }
59
 }
53
 </script>
60
 </script>

+ 8
- 3
src/pages/system/cmsManager/bannerManager/add.vue View File

72
           </div>
72
           </div>
73
         </li>
73
         </li>
74
         <li style="text-align:center">
74
         <li style="text-align:center">
75
-          <el-button type="primary" size="mini">保存</el-button>
76
-          <el-button type="danger" size="mini">取消</el-button>
75
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
76
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
77
         </li>
77
         </li>
78
       </ul>
78
       </ul>
79
     </form>
79
     </form>
117
   },
117
   },
118
   components: {},
118
   components: {},
119
   methods: {
119
   methods: {
120
-
120
+    submit () {
121
+      console.log(this.postData)
122
+    },
123
+    cancel () {
124
+      this.$router.go(-1)
125
+    }
121
   },
126
   },
122
   mounted () {}
127
   mounted () {}
123
 }
128
 }

+ 8
- 3
src/pages/system/cmsManager/bannerManager/edit.vue View File

72
           </div>
72
           </div>
73
         </li>
73
         </li>
74
         <li style="text-align:center">
74
         <li style="text-align:center">
75
-          <el-button type="primary" size="mini">保存</el-button>
76
-          <el-button type="danger" size="mini">取消</el-button>
75
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
76
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
77
         </li>
77
         </li>
78
       </ul>
78
       </ul>
79
     </form>
79
     </form>
117
   },
117
   },
118
   components: {},
118
   components: {},
119
   methods: {
119
   methods: {
120
-
120
+    submit () {
121
+      console.log(this.postData)
122
+    },
123
+    cancel () {
124
+      this.$router.go(-1)
125
+    }
121
   },
126
   },
122
   mounted () { }
127
   mounted () { }
123
 }
128
 }

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

27
           </div>
27
           </div>
28
         </li>
28
         </li>
29
         <li style="text-align:center">
29
         <li style="text-align:center">
30
-          <el-button type="primary" size="mini">保存</el-button>
31
-          <el-button type="danger" size="mini">取消</el-button>
30
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
31
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
32
         </li>
32
         </li>
33
       </ul>
33
       </ul>
34
     </form>
34
     </form>
48
   },
48
   },
49
   components: {},
49
   components: {},
50
   methods: {
50
   methods: {
51
-
51
+    submit () {
52
+      console.log(this.postData)
53
+    },
54
+    cancel () {
55
+      this.$router.go(-1)
56
+    }
52
   },
57
   },
53
   mounted () { }
58
   mounted () { }
54
 }
59
 }

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

27
           </div>
27
           </div>
28
         </li>
28
         </li>
29
         <li style="text-align:center">
29
         <li style="text-align:center">
30
-          <el-button type="primary" size="mini">保存</el-button>
31
-          <el-button type="danger" size="mini">取消</el-button>
30
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
31
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
32
         </li>
32
         </li>
33
       </ul>
33
       </ul>
34
     </form>
34
     </form>
48
   },
48
   },
49
   components: {},
49
   components: {},
50
   methods: {
50
   methods: {
51
-
51
+    submit () {
52
+      console.log(this.postData)
53
+    },
54
+    cancel () {
55
+      this.$router.go(-1)
56
+    }
52
   },
57
   },
53
   mounted () { }
58
   mounted () { }
54
 }
59
 }

+ 8
- 3
src/pages/system/cmsManager/majorProjects/add.vue View File

89
           </div>
89
           </div>
90
         </li>
90
         </li>
91
         <li style="text-align:center">
91
         <li style="text-align:center">
92
-          <el-button type="primary" size="mini">保存</el-button>
93
-          <el-button type="danger" size="mini">取消</el-button>
92
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
93
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
94
         </li>
94
         </li>
95
       </ul>
95
       </ul>
96
     </form>
96
     </form>
123
   },
123
   },
124
   components: {},
124
   components: {},
125
   methods: {
125
   methods: {
126
-
126
+    submit () {
127
+      console.log(this.postData)
128
+    },
129
+    cancel () {
130
+      this.$router.go(-1)
131
+    }
127
   },
132
   },
128
   mounted () { }
133
   mounted () { }
129
 }
134
 }

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

89
           </div>
89
           </div>
90
         </li>
90
         </li>
91
         <li style="text-align:center">
91
         <li style="text-align:center">
92
-          <el-button type="primary" size="mini">保存</el-button>
93
-          <el-button type="danger" size="mini">取消</el-button>
92
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
93
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
94
         </li>
94
         </li>
95
       </ul>
95
       </ul>
96
     </form>
96
     </form>
123
   },
123
   },
124
   components: {},
124
   components: {},
125
   methods: {
125
   methods: {
126
-
126
+    submit () {
127
+      console.log(this.postData)
128
+    },
129
+    cancel () {
130
+      this.$router.go(-1)
131
+    }
127
   },
132
   },
128
   mounted () { }
133
   mounted () { }
129
 }
134
 }

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

81
           </div>
81
           </div>
82
         </li>
82
         </li>
83
         <li style="text-align:center">
83
         <li style="text-align:center">
84
-          <el-button type="primary" size="mini">保存</el-button>
85
-          <el-button type="danger" size="mini">取消</el-button>
84
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
85
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
86
         </li>
86
         </li>
87
       </ul>
87
       </ul>
88
     </form>
88
     </form>
118
   },
118
   },
119
   components: {},
119
   components: {},
120
   methods: {
120
   methods: {
121
-
121
+    submit () {
122
+      console.log(this.postData)
123
+    },
124
+    cancel () {
125
+      this.$router.go(-1)
126
+    }
122
   },
127
   },
123
   mounted () { }
128
   mounted () { }
124
 }
129
 }

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

81
           </div>
81
           </div>
82
         </li>
82
         </li>
83
         <li style="text-align:center">
83
         <li style="text-align:center">
84
-          <el-button type="primary" size="mini">保存</el-button>
85
-          <el-button type="danger" size="mini">取消</el-button>
84
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
85
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
86
         </li>
86
         </li>
87
       </ul>
87
       </ul>
88
     </form>
88
     </form>
118
   },
118
   },
119
   components: {},
119
   components: {},
120
   methods: {
120
   methods: {
121
-
121
+    submit () {
122
+      console.log(this.postData)
123
+    },
124
+    cancel () {
125
+      this.$router.go(-1)
126
+    }
122
   },
127
   },
123
   mounted () { }
128
   mounted () { }
124
 }
129
 }

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

28
         </el-table-column>
28
         </el-table-column>
29
         <el-table-column
29
         <el-table-column
30
           prop="isShow"
30
           prop="isShow"
31
-          label="是否显示">
31
+          label="是否发布">
32
         </el-table-column>
32
         </el-table-column>
33
         <el-table-column
33
         <el-table-column
34
           prop="toIndex"
34
           prop="toIndex"

+ 10
- 3
src/pages/system/courseManager/courseTag/add.vue View File

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li style="text-align:center">
17
         <li style="text-align:center">
18
-          <el-button type="primary" size="mini">保存</el-button>
19
-          <el-button type="danger" size="mini">取消</el-button>
18
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
19
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
20
         </li>
20
         </li>
21
       </ul>
21
       </ul>
22
     </form>
22
     </form>
34
     }
34
     }
35
   },
35
   },
36
   components: {},
36
   components: {},
37
-  methods: {},
37
+  methods: {
38
+    submit () {
39
+      console.log(this.postData)
40
+    },
41
+    cancel () {
42
+      this.$router.go(-1)
43
+    }
44
+  },
38
   mounted () {}
45
   mounted () {}
39
 }
46
 }
40
 </script>
47
 </script>

+ 10
- 3
src/pages/system/courseManager/courseTag/edit.vue View File

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li style="text-align:center">
17
         <li style="text-align:center">
18
-          <el-button type="primary" size="mini">保存</el-button>
19
-          <el-button type="danger" size="mini">取消</el-button>
18
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
19
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
20
         </li>
20
         </li>
21
       </ul>
21
       </ul>
22
     </form>
22
     </form>
34
     }
34
     }
35
   },
35
   },
36
   components: {},
36
   components: {},
37
-  methods: {},
37
+  methods: {
38
+    submit () {
39
+      console.log(this.postData)
40
+    },
41
+    cancel () {
42
+      this.$router.go(-1)
43
+    }
44
+  },
38
   mounted () {}
45
   mounted () {}
39
 }
46
 }
40
 </script>
47
 </script>

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

89
           </div>
89
           </div>
90
         </li>
90
         </li>
91
         <li style="text-align:center">
91
         <li style="text-align:center">
92
-          <el-button type="primary" size="mini">保存</el-button>
93
-          <el-button type="danger" size="mini">取消</el-button>
92
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
93
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
94
         </li>
94
         </li>
95
       </ul>
95
       </ul>
96
     </form>
96
     </form>
161
     handleNodeClick (node) {
161
     handleNodeClick (node) {
162
       this.postData.label = node.label
162
       this.postData.label = node.label
163
       this.dialogTableVisible = false
163
       this.dialogTableVisible = false
164
+    },
165
+    submit () {
166
+      console.log(this.postData)
167
+    },
168
+    cancel () {
169
+      this.$router.go(-1)
164
     }
170
     }
165
   },
171
   },
166
   mounted () {
172
   mounted () {

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

89
           </div>
89
           </div>
90
         </li>
90
         </li>
91
         <li style="text-align:center">
91
         <li style="text-align:center">
92
-          <el-button type="primary" size="mini">保存</el-button>
93
-          <el-button type="danger" size="mini">取消</el-button>
92
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
93
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
94
         </li>
94
         </li>
95
       </ul>
95
       </ul>
96
     </form>
96
     </form>
164
     },
164
     },
165
     init () {
165
     init () {
166
       console.log('请求初始化数据')
166
       console.log('请求初始化数据')
167
+    },
168
+    submit () {
169
+      console.log(this.postData)
170
+    },
171
+    cancel () {
172
+      this.$router.go(-1)
167
     }
173
     }
168
   },
174
   },
169
   mounted () {
175
   mounted () {

+ 9
- 7
src/pages/system/courseManager/fiveA/index.vue View File

38
         label: '根目录',
38
         label: '根目录',
39
         rank: '0',
39
         rank: '0',
40
         img: '',
40
         img: '',
41
+        deleteCancel: true,
41
         children: [{
42
         children: [{
42
           label: '共享课程&书吧',
43
           label: '共享课程&书吧',
43
-          rank: '0',
44
+          rank: '1',
45
+          deleteCancel: true,
44
           img: '',
46
           img: '',
45
           children: [{
47
           children: [{
46
             label: '健身',
48
             label: '健身',
47
-            rank: '0',
49
+            rank: '2',
48
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163306109741.png',
50
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163306109741.png',
49
           }, {
51
           }, {
50
             label: '健康',
52
             label: '健康',
51
-            rank: '0',
53
+            rank: '3',
52
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163325263583.png',
54
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163325263583.png',
53
           }, {
55
           }, {
54
             label: '艺术',
56
             label: '艺术',
55
-            rank: '0',
57
+            rank: '4',
56
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/104118813781.png',
58
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/104118813781.png',
57
           }, {
59
           }, {
58
             label: '社交',
60
             label: '社交',
59
-            rank: '0',
61
+            rank: '5',
60
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163339496588.png',
62
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163339496588.png',
61
           }, {
63
           }, {
62
             label: '教育',
64
             label: '教育',
63
-            rank: '0',
65
+            rank: '6',
64
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163351586373.png',
66
             img: 'http://jingcheng-resourceplat.oss-cn-shanghai.aliyuncs.com/upload/163351586373.png',
65
           }]
67
           }]
66
         }]
68
         }]
116
           <div class='tree-node-item'>
118
           <div class='tree-node-item'>
117
             <el-button size="mini" type="primary" on-click={() => this.handleNodeClick(node, data)}>添加下级课程类型</el-button>
119
             <el-button size="mini" type="primary" on-click={() => this.handleNodeClick(node, data)}>添加下级课程类型</el-button>
118
             <el-button size="mini" type="warning" on-click={() => this.handleEdit(node, data)}>编辑</el-button>
120
             <el-button size="mini" type="warning" on-click={() => this.handleEdit(node, data)}>编辑</el-button>
119
-            <el-button size="mini" type="danger" on-click={() => this.handleDelete(node, data)}>删除</el-button>
121
+            {node.data.deleteCancel ? (<div></div>) : (<el-button size="mini" type="danger" on-click={() => this.handleDelete(node, data)}>删除</el-button>)}
120
           </div>
122
           </div>
121
         </span>)
123
         </span>)
122
     }
124
     }

+ 8
- 3
src/pages/system/goodsManager/goodsSpecManager/add.vue View File

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li style="text-align:center">
17
         <li style="text-align:center">
18
-          <el-button type="primary" size="mini">保存</el-button>
19
-          <el-button type="danger" size="mini">取消</el-button>
18
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
19
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
20
         </li>
20
         </li>
21
       </ul>
21
       </ul>
22
     </form>
22
     </form>
35
   },
35
   },
36
   components: {},
36
   components: {},
37
   methods: {
37
   methods: {
38
-
38
+    submit () {
39
+      console.log(this.postData)
40
+    },
41
+    cancel () {
42
+      this.$router.go(-1)
43
+    }
39
   },
44
   },
40
   mounted () { }
45
   mounted () { }
41
 }
46
 }

+ 8
- 3
src/pages/system/goodsManager/goodsSpecManager/edit.vue View File

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li style="text-align:center">
17
         <li style="text-align:center">
18
-          <el-button type="primary" size="mini">保存</el-button>
19
-          <el-button type="danger" size="mini">取消</el-button>
18
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
19
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
20
         </li>
20
         </li>
21
       </ul>
21
       </ul>
22
     </form>
22
     </form>
35
   },
35
   },
36
   components: {},
36
   components: {},
37
   methods: {
37
   methods: {
38
-
38
+    submit () {
39
+      console.log(this.postData)
40
+    },
41
+    cancel () {
42
+      this.$router.go(-1)
43
+    }
39
   },
44
   },
40
   mounted () { }
45
   mounted () { }
41
 }
46
 }

+ 8
- 3
src/pages/system/goodsManager/goodsTypeManager/add.vue View File

27
           </div>
27
           </div>
28
         </li>
28
         </li>
29
         <li style="text-align:center">
29
         <li style="text-align:center">
30
-          <el-button type="primary" size="mini">保存</el-button>
31
-          <el-button type="danger" size="mini">取消</el-button>
30
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
31
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
32
         </li>
32
         </li>
33
       </ul>
33
       </ul>
34
     </form>
34
     </form>
54
   },
54
   },
55
   components: {},
55
   components: {},
56
   methods: {
56
   methods: {
57
-
57
+    submit () {
58
+      console.log(this.postData)
59
+    },
60
+    cancel () {
61
+      this.$router.go(-1)
62
+    }
58
   },
63
   },
59
   mounted () { }
64
   mounted () { }
60
 }
65
 }

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

69
         </li>
69
         </li>
70
         <li style="text-align:center">
70
         <li style="text-align:center">
71
           <el-button type="primary" size="mini" @click='submit'>保存</el-button>
71
           <el-button type="primary" size="mini" @click='submit'>保存</el-button>
72
-          <el-button type="danger" size="mini">取消</el-button>
72
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
73
         </li>
73
         </li>
74
       </ul>
74
       </ul>
75
     </form>
75
     </form>
104
   methods: {
104
   methods: {
105
     submit () {
105
     submit () {
106
       console.log(this.postData)
106
       console.log(this.postData)
107
+    },
108
+    cancel () {
109
+      this.$router.go(-1)
107
     }
110
     }
108
   },
111
   },
109
   mounted () { }
112
   mounted () { }

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

69
         </li>
69
         </li>
70
         <li style="text-align:center">
70
         <li style="text-align:center">
71
           <el-button type="primary" size="mini" @click='submit'>保存</el-button>
71
           <el-button type="primary" size="mini" @click='submit'>保存</el-button>
72
-          <el-button type="danger" size="mini">取消</el-button>
72
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
73
         </li>
73
         </li>
74
       </ul>
74
       </ul>
75
     </form>
75
     </form>
104
   methods: {
104
   methods: {
105
     submit () {
105
     submit () {
106
       console.log(this.postData)
106
       console.log(this.postData)
107
+    },
108
+    cancel () {
109
+      this.$router.go(-1)
107
     }
110
     }
108
   },
111
   },
109
   mounted () { }
112
   mounted () { }

+ 7
- 0
src/pages/system/systemSet/roleManager/index.vue View File

38
         :data="treeData"
38
         :data="treeData"
39
         :default-expand-all="true"
39
         :default-expand-all="true"
40
         :expand-on-click-node="false"
40
         :expand-on-click-node="false"
41
+        ref="tree"
41
         show-checkbox
42
         show-checkbox
42
         @node-click="handleNodeClick"></el-tree>
43
         @node-click="handleNodeClick"></el-tree>
44
+        <div class="flex-h" style="justify-content: flex-end;margin-top: 1rem">
45
+          <el-button type='success' @click="getCheckedNodes">确定</el-button>
46
+        </div>
43
     </el-dialog>
47
     </el-dialog>
44
   </div>
48
   </div>
45
 </template>
49
 </template>
190
     },
194
     },
191
     addRole () {
195
     addRole () {
192
       this.$router.push({ name: 'addRole' })
196
       this.$router.push({ name: 'addRole' })
197
+    },
198
+    getCheckedNodes () { // 获取选中的节点
199
+      console.log(this.$refs.tree.getCheckedNodes())
193
     }
200
     }
194
   }
201
   }
195
 }
202
 }

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

153
           </div>
153
           </div>
154
         </li>
154
         </li>
155
         <li style="text-align:center">
155
         <li style="text-align:center">
156
-          <el-button type="primary" size="mini">保存</el-button>
157
-          <el-button type="danger" size="mini">取消</el-button>
156
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
157
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
158
         </li>
158
         </li>
159
       </ul>
159
       </ul>
160
     </form>
160
     </form>
189
     })
189
     })
190
   },
190
   },
191
   methods: {
191
   methods: {
192
-
192
+    submit () {
193
+      console.log(this.postData)
194
+    },
195
+    cancel () {
196
+      this.$router.go(-1)
197
+    }
193
   },
198
   },
194
   mounted () {}
199
   mounted () {}
195
 }
200
 }

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

153
           </div>
153
           </div>
154
         </li>
154
         </li>
155
         <li style="text-align:center">
155
         <li style="text-align:center">
156
-          <el-button type="primary" size="mini">保存</el-button>
157
-          <el-button type="danger" size="mini">取消</el-button>
156
+          <el-button type="primary" size="mini" @click="submit">保存</el-button>
157
+          <el-button type="danger" size="mini" @click="cancel">取消</el-button>
158
         </li>
158
         </li>
159
       </ul>
159
       </ul>
160
     </form>
160
     </form>
189
     })
189
     })
190
   },
190
   },
191
   methods: {
191
   methods: {
192
-
192
+    submit () {
193
+      console.log(this.postData)
194
+    },
195
+    cancel () {
196
+      this.$router.go(-1)
197
+    }
193
   },
198
   },
194
   mounted () {}
199
   mounted () {}
195
 }
200
 }

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

89
             <div class="flex-item">
89
             <div class="flex-item">
90
               <div>
90
               <div>
91
                 <el-input
91
                 <el-input
92
-                  placeholder="请输入角色"
92
+                  placeholder="请输入角色名称并按回车搜索"
93
                   v-model="postData.searchData"
93
                   v-model="postData.searchData"
94
+                  @change='getRole'
94
                   clearable>
95
                   clearable>
95
                 </el-input>
96
                 </el-input>
96
               </div>
97
               </div>
218
     },
219
     },
219
     ...mapUserActions(['upDateRoleList']),
220
     ...mapUserActions(['upDateRoleList']),
220
     addTag (tag) {
221
     addTag (tag) {
222
+      // 调用添加绑定角色接口
223
+      this.tags.push(tag)
221
       this.upDateRoleList(tag)
224
       this.upDateRoleList(tag)
225
+    },
226
+    getRole () { // 绑定角色搜索事件,发送请求搜索角色列表
227
+      console.log(this.postData.searchData)
222
     }
228
     }
223
   }
229
   }
224
 }
230
 }

+ 32
- 0
src/pages/test/test.vue View File

1
+<style lang="sass" scoped>
2
+
3
+</style>
4
+
5
+<template>
6
+  <div>123</div>
7
+</template>
8
+
9
+<script>
10
+export default {
11
+  data () {
12
+    return {
13
+
14
+    }
15
+  },
16
+  mounted () {
17
+    console.log(this)
18
+    this.$ajax(this.$api.test.area.url, {
19
+      method: this.$api.test.area.method,
20
+      data: {
21
+        caseid: 1,
22
+        id: 2
23
+      }
24
+    })
25
+      .then(res => {
26
+        console.log(res)
27
+      }).catch(msg => {
28
+        return false
29
+      })
30
+  }
31
+}
32
+</script>

+ 4
- 2
src/store/index.js View File

1
 import Vue from 'vue'
1
 import Vue from 'vue'
2
 import Vuex from 'vuex'
2
 import Vuex from 'vuex'
3
-
3
+import Ajax from '../util/ajax'
4
+import api from '../util/api'
4
 Vue.use(Vuex)
5
 Vue.use(Vuex)
5
 
6
 
6
 const store = new Vuex.Store({
7
 const store = new Vuex.Store({
8
     loadding: false,
9
     loadding: false,
9
   }
10
   }
10
 })
11
 })
11
-
12
+Vuex.Store.prototype.$api = api
13
+Vuex.Store.prototype.$ajax = Ajax
12
 export const modules = {
14
 export const modules = {
13
   app: () => require('./app').default,
15
   app: () => require('./app').default,
14
   case: () => require('./case').default,
16
   case: () => require('./case').default,

+ 12
- 0
src/store/user/index.js View File

24
   },
24
   },
25
   mutations: {
25
   mutations: {
26
     deleteRoleListItem (state, index) { // 这里的state对应着上面这个state
26
     deleteRoleListItem (state, index) { // 这里的state对应着上面这个state
27
+      this.$ajax(this.$api.test.area.url, {
28
+        method: this.$api.test.area.method,
29
+        data: {
30
+          caseid: 1,
31
+          id: 2
32
+        }
33
+      })
34
+        .then((res) => {
35
+          console.log(res)
36
+        }).catch(msg => {
37
+          return false
38
+        })
27
       state.roleList.splice(state.roleList.indexOf(index), 1) // 你还可以在这里执行其他的操作改变state
39
       state.roleList.splice(state.roleList.indexOf(index), 1) // 你还可以在这里执行其他的操作改变state
28
     }
40
     }
29
   },
41
   },

+ 24
- 16
src/util/ajax.js View File

10
 })
10
 })
11
 
11
 
12
 Axios.interceptors.request.use((config) => {
12
 Axios.interceptors.request.use((config) => {
13
-  console.log(config)
14
-  config.data = qs.stringify(config.data)
13
+  // 处理请求data,若为get请求,拼到url后面,若为post请求,直接添加到body中
14
+  let data = qs.stringify(config.data)
15
+  if (config.method === 'get' || config.method === 'GET') {
16
+    // 判断是通过斜杠传参还是通过query传参
17
+    if (config.url.indexOf(':') > -1) {
18
+      if (typeof config.data === 'object') {
19
+        config.url = Object.keys(config.data).reduce((url, k) => { // 此方法对每个元素进行处理
20
+          const re = new RegExp(`:${k}(?!w)`, 'i')
21
+          return url.replace(re, config.data[k])
22
+        }, config.url)
23
+      } else {
24
+        config.url = config.url.slice(0, config.url.indexOf(':')) + data
25
+      }
26
+    } else {
27
+      config.url += '?' + data
28
+    }
29
+  }
15
   return config
30
   return config
16
 }, (error) => {
31
 }, (error) => {
17
   console.log(error)
32
   console.log(error)
18
 })
33
 })
19
 
34
 
20
 Axios.interceptors.response.use((res) => {
35
 Axios.interceptors.response.use((res) => {
21
-  if (res.data.code === 1) {
22
-    return res
23
-  } else if (res.data.code === 2) {
24
-    Message({
25
-      message: res.data.message,
26
-      position: 'bottom',
27
-      duration: 2000
28
-    })
29
-    return res.data.code
30
-  } else if (res.data.code === 0) {
36
+  console.log(res)
37
+  if (res.status === 200) {
38
+    return res.data
39
+  } else {
31
     Message({
40
     Message({
32
-      message: res.data.message,
33
-      position: 'bottom',
34
-      duration: 2000
41
+      message: res.data.msg,
42
+      type: 'error'
35
     })
43
     })
36
-    return res.data.code
44
+    return res.data
37
   }
45
   }
38
 }, (error) => {
46
 }, (error) => {
39
   console.log(error)
47
   console.log(error)

+ 2
- 2
src/util/api.js View File

3
 const $api = {
3
 const $api = {
4
   test: { // 测试接口
4
   test: { // 测试接口
5
     area: {
5
     area: {
6
-      method: 'get',
7
-      url: `${baseUrl}/common/goodstype`
6
+      method: 'post',
7
+      url: `${baseUrl}/machine/area`
8
     }
8
     }
9
   }
9
   }
10
 }
10
 }