许成详 6 years ago
parent
commit
068f185aab
27 changed files with 42 additions and 34 deletions
  1. 1
    1
      config/index.js
  2. 1
    1
      dist/static/js/app.f3f484966c7795e437dd.js.map
  3. 1
    1
      src/pages/system/caseManager/caseAreaManager/index.vue
  4. 1
    1
      src/pages/system/caseManager/caseTableManager/index.vue
  5. 1
    1
      src/pages/system/caseManager/deviceManager/add.vue
  6. 1
    1
      src/pages/system/caseManager/keyManager/index.vue
  7. 1
    1
      src/pages/system/caseManager/tagManager/add.vue
  8. 1
    1
      src/pages/system/caseManager/tagManager/edit.vue
  9. 1
    1
      src/pages/system/caseManager/tagManager/index.vue
  10. 1
    1
      src/pages/system/channelManager/channelList/add.vue
  11. 1
    1
      src/pages/system/channelManager/channelList/edit.vue
  12. 1
    1
      src/pages/system/channelManager/channelList/index.vue
  13. 1
    1
      src/pages/system/cmsManager/majorProjects/index.vue
  14. 1
    1
      src/pages/system/courseManager/courseTag/index.vue
  15. 1
    1
      src/pages/system/goodsManager/goodManager/edit.vue
  16. 1
    1
      src/pages/system/goodsManager/goodManager/index.vue
  17. 1
    1
      src/pages/system/goodsManager/goodsSpecManager/add.vue
  18. 1
    1
      src/pages/system/goodsManager/goodsSpecManager/edit.vue
  19. 1
    1
      src/pages/system/goodsManager/goodsSpecManager/index.vue
  20. 1
    1
      src/pages/system/goodsManager/goodsTypeManager/add.vue
  21. 1
    1
      src/pages/system/goodsManager/goodsTypeManager/edit.vue
  22. 1
    1
      src/pages/system/goodsManager/goodsTypeManager/index.vue
  23. 1
    1
      src/pages/system/systemSet/userManager/add.vue
  24. 1
    1
      src/pages/system/systemSet/userManager/edit.vue
  25. 8
    8
      src/pages/system/systemSet/userManager/index.vue
  26. 9
    0
      src/style/main.css
  27. 1
    2
      src/util/ajax.js

+ 1
- 1
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://localhost:8080', //wf
15
+        target: 'http://192.168.0.62:8080', //wf
16
         // target: 'http://192.168.0.11:8088', //zys
16
         // target: 'http://192.168.0.11:8088', //zys
17
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
17
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
18
         // pathRewrite: {
18
         // pathRewrite: {

+ 1
- 1
dist/static/js/app.f3f484966c7795e437dd.js.map
File diff suppressed because it is too large
View File


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

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

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

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

+ 1
- 1
src/pages/system/caseManager/deviceManager/add.vue View File

3
     <form class="mainForm">
3
     <form class="mainForm">
4
       <ul>
4
       <ul>
5
          <li class="flex-h">
5
          <li class="flex-h">
6
-          <span>选择案场:</span>
6
+          <!-- <span>选择案场:</span> -->
7
           <div class="flex-item">
7
           <div class="flex-item">
8
             <div style="width:50%">
8
             <div style="width:50%">
9
               <el-select v-model="Case" placeholder="请选择">
9
               <el-select v-model="Case" placeholder="请选择">

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

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

+ 1
- 1
src/pages/system/caseManager/tagManager/add.vue View File

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li class="flex-h">
17
         <li class="flex-h">
18
-          <span>选择案场:</span>
18
+          <!-- <span>选择案场:</span> -->
19
           <div class="flex-item">
19
           <div class="flex-item">
20
             <div>
20
             <div>
21
               <el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">
21
               <el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">

+ 1
- 1
src/pages/system/caseManager/tagManager/edit.vue View File

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li class="flex-h">
17
         <li class="flex-h">
18
-          <span>选择案场:</span>
18
+          <!-- <span>选择案场:</span> -->
19
           <div class="flex-item">
19
           <div class="flex-item">
20
             <div>
20
             <div>
21
               <el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">
21
               <el-checkbox-group v-model="checkedList" @change="handleCheckedCitiesChange">

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

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

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

3
     <form class="mainForm">
3
     <form class="mainForm">
4
       <ul>
4
       <ul>
5
         <li class="flex-h">
5
         <li class="flex-h">
6
-          <span>选择案场:</span>
6
+          <!-- <span>选择案场:</span> -->
7
           <div class="flex-item">
7
           <div class="flex-item">
8
             <div style="width:50%">
8
             <div style="width:50%">
9
               <el-select v-model="CaseId" placeholder="请选择">
9
               <el-select v-model="CaseId" placeholder="请选择">

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

3
     <form class="mainForm">
3
     <form class="mainForm">
4
       <ul>
4
       <ul>
5
         <li class="flex-h">
5
         <li class="flex-h">
6
-          <span>选择案场:</span>
6
+          <!-- <span>选择案场:</span> -->
7
           <div class="flex-item">
7
           <div class="flex-item">
8
             <div style="width:50%">
8
             <div style="width:50%">
9
               <el-select v-model="CaseId" placeholder="请选择">
9
               <el-select v-model="CaseId" placeholder="请选择">

+ 1
- 1
src/pages/system/channelManager/channelList/index.vue View File

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

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

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="tableSearch.caseId" placeholder="请选择">
11
             <el-select v-model="tableSearch.caseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
               value=""
13
               value=""

+ 1
- 1
src/pages/system/courseManager/courseTag/index.vue View File

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="tableSearch.caseId" placeholder="请选择">
11
             <el-select v-model="tableSearch.caseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in caseList"
13
                 v-for="item in caseList"

+ 1
- 1
src/pages/system/goodsManager/goodManager/edit.vue View File

3
     <form class="mainForm">
3
     <form class="mainForm">
4
       <ul>
4
       <ul>
5
          <li class="flex-h">
5
          <li class="flex-h">
6
-          <span>选择案场:</span>
6
+          <!-- <span>选择案场:</span> -->
7
           <div class="flex-item">
7
           <div class="flex-item">
8
             <div style="width:50%">
8
             <div style="width:50%">
9
               <el-select v-model="Case" placeholder="请选择">
9
               <el-select v-model="Case" placeholder="请选择">

+ 1
- 1
src/pages/system/goodsManager/goodManager/index.vue View File

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

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

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li class="flex-h">
17
         <li class="flex-h">
18
-          <span>选择案场:</span>
18
+          <!-- <span>选择案场:</span> -->
19
           <div class="flex-item">
19
           <div class="flex-item">
20
             <div style="width:50%">
20
             <div style="width:50%">
21
               <el-select v-model="CaseId" placeholder="请选择">
21
               <el-select v-model="CaseId" placeholder="请选择">

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

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li class="flex-h">
17
         <li class="flex-h">
18
-          <span>选择案场:</span>
18
+          <!-- <span>选择案场:</span> -->
19
           <div class="flex-item">
19
           <div class="flex-item">
20
             <div style="width:50%">
20
             <div style="width:50%">
21
               <el-select v-model="CaseId" placeholder="请选择">
21
               <el-select v-model="CaseId" placeholder="请选择">

+ 1
- 1
src/pages/system/goodsManager/goodsSpecManager/index.vue View File

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

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

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li class="flex-h">
17
         <li class="flex-h">
18
-          <span>选择案场:</span>
18
+          <!-- <span>选择案场:</span> -->
19
           <div class="flex-item">
19
           <div class="flex-item">
20
             <div style="width:50%">
20
             <div style="width:50%">
21
               <el-select v-model="CaseId" placeholder="请选择">
21
               <el-select v-model="CaseId" placeholder="请选择">

+ 1
- 1
src/pages/system/goodsManager/goodsTypeManager/edit.vue View File

15
           </div>
15
           </div>
16
         </li>
16
         </li>
17
         <li class="flex-h">
17
         <li class="flex-h">
18
-          <span>选择案场:</span>
18
+          <!-- <span>选择案场:</span> -->
19
           <div class="flex-item">
19
           <div class="flex-item">
20
             <div style="width:50%">
20
             <div style="width:50%">
21
               <el-select v-model="CaseId" placeholder="请选择">
21
               <el-select v-model="CaseId" placeholder="请选择">

+ 1
- 1
src/pages/system/goodsManager/goodsTypeManager/index.vue View File

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"

+ 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

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

7
         </div>
7
         </div>
8
         <ul>
8
         <ul>
9
           <li>
9
           <li>
10
-            <span>选择案场:</span>
10
+            <!-- <span>选择案场:</span> -->
11
             <el-select v-model="CaseId" placeholder="请选择">
11
             <el-select v-model="CaseId" placeholder="请选择">
12
               <el-option
12
               <el-option
13
                 v-for="item in cases"
13
                 v-for="item in cases"
17
               </el-option>
17
               </el-option>
18
             </el-select>
18
             </el-select>
19
           </li>
19
           </li>
20
-          <li>
21
-            <el-input
22
-              placeholder="请输入用户名"
23
-              v-model="name"
24
-            >
25
-            </el-input>
26
-          </li>
27
           <li>
20
           <li>
28
             <el-select v-model="usertype" placeholder="请选择用户类型">
21
             <el-select v-model="usertype" placeholder="请选择用户类型">
29
               <el-option
22
               <el-option
40
               </el-option>
33
               </el-option>
41
             </el-select>
34
             </el-select>
42
           </li>
35
           </li>
36
+          <li>
37
+            <el-input
38
+              placeholder="请输入用户名"
39
+              v-model="name"
40
+            >
41
+            </el-input>
42
+          </li>
43
         </ul>
43
         </ul>
44
         <el-button
44
         <el-button
45
           size="mini"
45
           size="mini"

+ 9
- 0
src/style/main.css View File

287
   z-index: 2;
287
   z-index: 2;
288
 }
288
 }
289
 
289
 
290
+.system-table-search ul{
291
+  font-size: 0;
292
+  white-space: nowrap;
293
+}
294
+
295
+.system-table-search ul>li{
296
+  display: inline-block;
297
+}
298
+
290
 .switch,.radio {
299
 .switch,.radio {
291
   display: flex;
300
   display: flex;
292
   align-items: center;
301
   align-items: center;

+ 1
- 2
src/util/ajax.js View File

1
 import axios from 'axios'
1
 import axios from 'axios'
2
-import { Message } from 'element-ui'
3
 import qs from 'qs'
2
 import qs from 'qs'
4
 import router from '../router'
3
 import router from '../router'
5
 
4
 
70
   return new Promise((resolve, reject) => {
69
   return new Promise((resolve, reject) => {
71
     Axios(...args).then(({ data }) => {
70
     Axios(...args).then(({ data }) => {
72
       // console.log(111)
71
       // console.log(111)
73
-      const { code, message, result } = data
72
+      const { code, result } = data
74
       if (code === 200) {
73
       if (code === 200) {
75
         resolve(result)
74
         resolve(result)
76
       } else if (code === 401) {
75
       } else if (code === 401) {