Browse Source

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/storeCheck-admin-html into develop

lilei 4 years ago
parent
commit
461cd3184c

+ 0 - 4
src/views/BasicSettings/Organization.vue

@@ -130,8 +130,6 @@ export default {
               _this.$message.success(res.message)
               _this.$refs.table.refresh(true)
               _this.visible = false
-            } else {
-              _this.$message.error(res.message)
             }
           })
         } else {
@@ -156,8 +154,6 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()
-            } else {
-              _this.$message.error(res.message)
             }
           })
         }

+ 0 - 8
src/views/BasicSettings/StoreAssociatedEquipmentModal.vue

@@ -153,8 +153,6 @@ export default {
         findVsDevice({ id: value }).then(res => {
           if (res.status == 200) {
             this.resultData = res.data
-          } else {
-            this.$message.error(res.message)
           }
         })
       } else {
@@ -184,8 +182,6 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.getStoreEquipment(_this.storeCode)
-            } else {
-              _this.$message.error(res.message)
             }
           })
         }
@@ -204,8 +200,6 @@ export default {
               _this.resultData = null
               _this.isFocus = false
               _this.getStoreEquipment(_this.storeCode)
-            } else {
-              _this.$message.error(res.message)
             }
           })
         }
@@ -229,8 +223,6 @@ export default {
               _this.$message.success(res.message)
               _this.visible = false
               _this.getDeviceChannels()
-            } else {
-              _this.$message.error(res.message)
             }
           })
         } else {

+ 4 - 4
src/views/BasicSettings/StoreManagement.vue

@@ -32,22 +32,22 @@
             <a-form-item class="search-item" label="门店类型">
               <v-select
                 id="store-type"
-                ref="STORE_TYPE"
+                ref="selfFlag"
                 allowClear
                 placeholder="请选择门店类型"
                 v-model="queryParam.selfFlag"
-                code="STORE_BUSINESS_STATUS"></v-select>
+                code="STORE_TYPE"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">
             <a-form-item class="search-item" label="启用状态">
               <v-select
                 id="store-status"
-                ref="ENABLE_FLAG"
+                ref="isEnable"
                 allowClear
                 placeholder="请选择启用状态"
                 v-model="queryParam.isEnable"
-                code="DEVICE_STATUS"></v-select>
+                code="ENABLE_FLAG"></v-select>
             </a-form-item>
           </a-col>
           <a-col :span="6">

+ 0 - 2
src/views/BasicSettings/StoreModal.vue

@@ -166,8 +166,6 @@ export default {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$emit('success')
-            } else {
-              _this.$message.error(res.message)
             }
           })
         } else {

+ 1 - 1
src/views/SupervisionAuth/role/roleList.vue

@@ -13,7 +13,7 @@
               <v-select code="ENABLE_FLAG" v-model="queryParam.isEnable" id="roleList-isEnable" allowClear placeholder="请选择状态" ></v-select>
             </a-form-item>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-button type="primary" @click="$refs.table.refresh(true)" style="margin-right: 10px;" id="roleList-handSubmit">查询</a-button>
             <a-button @click="reset" id="roleList-reset">重置</a-button>
           </a-col>

+ 1 - 1
src/views/SupervisionAuth/role/roleModal.vue

@@ -111,7 +111,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              this.$message.error(res.message)
+              // this.$message.error(res.message)
             }
           })
         }

+ 1 - 1
src/views/SupervisionAuth/user/userModal.vue

@@ -243,7 +243,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              _this.$message.error(res.message)
+              // _this.$message.error(res.message)
             }
           })
         }

+ 1 - 1
src/views/evaluation/evaluationItem/AddEvaIndexModal.vue

@@ -93,7 +93,7 @@ export default {
   computed: {
     // 弹框标题
     titleText () {
-      return this.itemId ? '编辑' : '新增'
+      return this.itemIndexId ? '编辑' : '新增'
     }
   },
   methods: {

+ 1 - 1
src/views/power/role/roleModal.vue

@@ -109,7 +109,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              this.$message.error(res.message)
+              // this.$message.error(res.message)
             }
           })
         }

+ 1 - 1
src/views/power/user/userModal.vue

@@ -181,7 +181,7 @@ export default {
                 _this.cancel()
               }, 300)
             } else {
-              this.$message.error(res.message)
+              // this.$message.error(res.message)
             }
           })
         }

+ 2 - 1
vue.config.js

@@ -108,7 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.100:9102/at-admin/',
+        // target: 'http://192.168.16.100:9102/at-admin/',
+        target: 'https://aitour.test.zyucgj.com/at-admin/',
         ws: false,
         changeOrigin: true,
         pathRewrite: {