Browse Source

修复 Bug

keyman1995 6 years ago
parent
commit
def6067bb7

+ 2
- 2
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://127.0.0.1:8080', 
15
+        // target: 'http://192.168.0.62:8080', //wf
16
+        target: 'http://127.0.0.1:8080', 
17
         // target: 'http://192.168.0.11', //ys
17
         // target: 'http://192.168.0.11', //ys
18
         // target: 'http://192.168.0.125:8080', //hyq
18
         // target: 'http://192.168.0.125:8080', //hyq
19
         // target: 'http://dev.ycjcjy.com/', //frp
19
         // target: 'http://dev.ycjcjy.com/', //frp

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

123
       if (this.postData.AreaIcon === '') {
123
       if (this.postData.AreaIcon === '') {
124
         this.$message({
124
         this.$message({
125
           type: 'error',
125
           type: 'error',
126
-          message: '区域图标不能为空'
126
+          message: '请上传区域图片'
127
         })
127
         })
128
         return false
128
         return false
129
       }
129
       }
130
       if (this.postData.AreaIconWhite === '') {
130
       if (this.postData.AreaIconWhite === '') {
131
         this.$message({
131
         this.$message({
132
           type: 'error',
132
           type: 'error',
133
-          message: '区域图标灰白不能为空'
133
+          message: '请上传区域黑白图片'
134
         })
134
         })
135
         return false
135
         return false
136
       }
136
       }

+ 7
- 0
src/pages/system/caseManager/caseTableManager/add.vue View File

118
         })
118
         })
119
         return false
119
         return false
120
       }
120
       }
121
+      if (this.postData.AreaId === '' || this.CaseId === '') {
122
+        this.$message({
123
+          type: 'error',
124
+          message: '请选择案场/区域'
125
+        })
126
+        return false
127
+      }
121
       this.postData.OrgId = this.OrgId
128
       this.postData.OrgId = this.OrgId
122
       this.$ajax(this.$api.caseManager.addCaseTable.url, {
129
       this.$ajax(this.$api.caseManager.addCaseTable.url, {
123
         method: this.$api.caseManager.addCaseTable.method,
130
         method: this.$api.caseManager.addCaseTable.method,

+ 5
- 2
src/pages/system/caseManager/keyManager/add.vue View File

24
               <el-input
24
               <el-input
25
                 placeholder="请输入数字"
25
                 placeholder="请输入数字"
26
                 v-model="postData.beginnum"
26
                 v-model="postData.beginnum"
27
-                clearable>
27
+                clearable
28
+                onkeyup="value=value.replace(/[^\d]/g,'')">
28
               </el-input>
29
               </el-input>
29
             </div>
30
             </div>
30
           </div>
31
           </div>
36
               <el-input
37
               <el-input
37
                 placeholder="请输入数字"
38
                 placeholder="请输入数字"
38
                 v-model="postData.endnum"
39
                 v-model="postData.endnum"
39
-                clearable>
40
+                clearable
41
+                onkeyup="value=value.replace(/[^\d]/g,'')">
40
               </el-input>
42
               </el-input>
41
             </div>
43
             </div>
42
           </div>
44
           </div>
113
         })
115
         })
114
         return false
116
         return false
115
       }
117
       }
118
+      console.log('柜子编号:' + this.postData.beginnum + ' ' + this.postData.endnum)
116
       this.postData.orgid = this.OrgId
119
       this.postData.orgid = this.OrgId
117
       this.$ajax(this.$api.caseManager.addKey.url, {
120
       this.$ajax(this.$api.caseManager.addKey.url, {
118
         method: this.$api.caseManager.addKey.method,
121
         method: this.$api.caseManager.addKey.method,

+ 4
- 2
src/pages/system/caseManager/signinManager/index.vue View File

30
         </el-select>
30
         </el-select>
31
     </div>
31
     </div>
32
     <div class="button-div">
32
     <div class="button-div">
33
-      <el-button type="success" icon="el-icon-search" style="float: right;">导出excel</el-button>
33
+      <el-button type="success" icon="el-icon-search" style="float: right;" @click="excelSignin">导出excel</el-button>
34
       <el-button type="warning" icon="el-icon-search" style="float: right;" @click="reset">重置</el-button>
34
       <el-button type="warning" icon="el-icon-search" style="float: right;" @click="reset">重置</el-button>
35
       <el-button type="primary" icon="el-icon-search" style="float: right; margin-right: -10px;" @click="getList">搜索</el-button>
35
       <el-button type="primary" icon="el-icon-search" style="float: right; margin-right: -10px;" @click="getList">搜索</el-button>
36
     </div>
36
     </div>
179
     FormatDate (date) {
179
     FormatDate (date) {
180
       return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
180
       return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
181
     },
181
     },
182
-
182
+    excelSignin () { // 导出Excel
183
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')
184
+    }
183
   },
185
   },
184
   computed: {
186
   computed: {
185
     ...mapState({
187
     ...mapState({

+ 4
- 0
src/util/api.js View File

212
     getSignin: { // 获取签到列表
212
     getSignin: { // 获取签到列表
213
       method: 'get',
213
       method: 'get',
214
       url: `${baseUrl}${common}/case/signin`
214
       url: `${baseUrl}${common}/case/signin`
215
+    },
216
+    getExcelSignin: { // 获取签到列表
217
+      method: 'get',
218
+      url: `${baseUrl}${common}/case/excelSignin`
215
     }
219
     }
216
   },
220
   },
217
   goodsManager: {
221
   goodsManager: {