修改

src/assets/js/common.js

@@ -378,6 +378,147 @@ var HttpReq = function(){
 					data:data,
 				})
 			},
+			//区域管理——区域信息设置——品位设置
+			RegionalInformationGradeQuery: function(param){
+				return request({
+					url: '/api/AreaTaste',
+					method: 'get',
+					params:param,
+				})
+			},
+			RegionalInformationGradeAdd: function(data){
+				return request({
+					url: '/api/AreaTaste',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			RegionalInformationGradeUpdate: function(data){
+				return request({
+					url: '/api/AreaTaste',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			RegionalInformationGradeDel: function(data){
+				return request({
+					url: '/api/AreaTaste',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//视频监控——矿山监控管理——分区管理
+			mineMonitoringPartitionQuery: function(param){
+				return request({
+					url: '/camera/list',
+					method: 'get',
+					params:param,
+				})
+			},
+			mineMonitoringPartitionAdd: function(data){
+				return request({
+					url: '/camera/addCamera',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			mineMonitoringPartitionUpdate: function(data){
+				return request({
+					url: '/camera/updateCamera',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			mineMonitoringPartitionDel: function(data){
+				return request({
+					url: '/camera/delCamera',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//视频监控——矿山监控管理——摄像头详细管理
+			mineMonitoringCameraQuery: function(param){
+				return request({
+					url: '/cameraDetail/list',
+					method: 'get',
+					params:param,
+				})
+			},
+			mineMonitoringCameraAdd: function(data){
+				return request({
+					url: '/cameraDetail/addCameraDetail',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			mineMonitoringCameraDel: function(data){
+				return request({
+					url: '/cameraDetail/delCameraDetail',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//视频监控——车辆监控管理——车队管理
+			carMonitoringFleetQuery: function(param){
+				return request({
+					url: '/Car/list',
+					method: 'get',
+					params:param,
+				})
+			},
+			carMonitoringFleetAdd: function(data){
+				return request({
+					url: '/Car/addCamera',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carMonitoringFleetUpdate: function(data){
+				return request({
+					url: '/Car/updateCamera',
+					method: 'PUT',
+					data:data,
+				})
+			},
+			carMonitoringFleetDel: function(data){
+				return request({
+					url: '/Car/delCamera',
+					method: 'Delete',
+					data:data,
+				})
+			},
+			//视频监控——车辆监控管理——车辆详细管理
+			carMonitoringCarsQuery: function(param){
+				return request({
+					url: '/api/CarCamera',
+					method: 'get',
+					params:param,
+				})
+			},
+			carMonitoringCarsAdd: function(data){
+				return request({
+					url: '/api/CarCamera',
+					method: 'POST',
+					data:data,
+				}).then((res) => {
+					return res
+				})
+			},
+			carMonitoringCarsDel: function(data){
+				return request({
+					url: '/api/CarCamera',
+					method: 'Delete',
+					data:data,
+				})
+			},
 
 
 

src/views/monitoringManagement/carVideoSetUp/index.vue

@@ -12,7 +12,7 @@
         <div class="text item">
           <el-table :data="main_camera" border style="width: 100%" @row-click="gridClick">
             <el-table-column prop="id" label="NO." align="center" width="60"></el-table-column>
-            <el-table-column prop="name" label="分区名称" align="left"></el-table-column>
+            <el-table-column prop="name" label="车队名称" align="left"></el-table-column>
             <el-table-column label="操作" width="150" align="center">
               <template slot-scope="scope">
                 <el-button size="mini" round type="primary"  @click="zoneEdit('change',scope.row)">编辑</el-button>
@@ -25,7 +25,7 @@
 
       <el-dialog :title="zoneTitle" :visible.sync="zoneVisible" width="30%">
         <el-form ref="zoneData" :rules="rules" :model="zoneData" label-width="80px">
-          <el-form-item label="分区名称" style="margin-bottom:15px;" prop="name">
+          <el-form-item label="车队名称" style="margin-bottom:15px;" prop="name">
             <el-input v-model="zoneData.name" ></el-input>
           </el-form-item>
         </el-form>
@@ -53,9 +53,12 @@
         <div class="text item">
           <el-table :data="cameraDetail" border style="width: 100%" height="710">
             <el-table-column prop="id" label="NO." align="center" width="60"></el-table-column>
-            <el-table-column prop="cameraName" label="区域名称" align="left"></el-table-column>
-            <el-table-column prop="cameraIp" label="区域IP" align="left"></el-table-column>
-            <el-table-column prop="brand" :formatter="formatter" label="商标" align="center"></el-table-column>
+            <el-table-column prop="car" label="车辆名称" align="left"></el-table-column>
+            <el-table-column prop="carnumber" label="车牌号" align="left"></el-table-column>
+            <el-table-column prop="name" label="摄像头名称" align="center"></el-table-column>
+            <el-table-column prop="ip" label="ip" align="center"></el-table-column>
+            <el-table-column prop="port" label="端口" align="center"></el-table-column>
+            <el-table-column prop="card" label="商标" align="center"></el-table-column>
             <el-table-column label="操作" width="150" align="center">
               <template slot-scope="scope">
                 <el-button size="mini" round type="danger" @click="cameraDetaileDelete(scope.row)">删除</el-button>
@@ -66,17 +69,23 @@
       </el-card>
       <el-dialog :title="cameraDetailTitle" :visible.sync="cameraDetailVisible" width="30%">
         <el-form ref="cameraDetailData" :rules="rulesDetai" :model="cameraDetailData" label-width="80px">
-          <el-form-item label="名称" style="margin-bottom:15px;" prop="cameraName">
-            <el-input v-model="cameraDetailData.cameraName"></el-input>
+          <el-form-item label="车辆名称" style="margin-bottom:15px;" prop="car">
+            <el-input v-model="cameraDetailData.car"></el-input>
           </el-form-item>
-          <el-form-item label="IP" style="margin-bottom:15px;" prop="cameraIp">
-            <el-input v-model="cameraDetailData.cameraIp"></el-input>
+          <el-form-item label="车牌号" style="margin-bottom:15px;" prop="carnumber">
+            <el-input v-model="cameraDetailData.carnumber"></el-input>
+          </el-form-item>
+          <el-form-item label="摄像头名称" style="margin-bottom:15px;" prop="name">
+            <el-input v-model="cameraDetailData.name"></el-input>
+          </el-form-item>
+          <el-form-item label="IP" style="margin-bottom:15px;" prop="ip">
+            <el-input v-model="cameraDetailData.ip"></el-input>
           </el-form-item>
           <el-form-item label="端口" style="margin-bottom:15px;">
-            <el-input v-model="cameraDetailData.cameraPort"></el-input>
+            <el-input v-model="cameraDetailData.port"></el-input>
           </el-form-item>
-          <el-form-item label="商标" style="margin-bottom:15px;" prop="brand">
-            <el-input v-model="cameraDetailData.brand" placeholder="1(海康威视)   2(大华)"></el-input>
+          <el-form-item label="商标" style="margin-bottom:15px;" prop="card">
+            <el-input v-model="cameraDetailData.card"></el-input>
           </el-form-item>
         </el-form>
         <span slot="footer" class="dialog-footer">
@@ -97,8 +106,7 @@
 </template>
 
 <script>
-// import { httpGet,httpPostForJson,httpDelForJson,putForJson } from "@/common/httpBean.js"
-// import {mainCamera,delCamera,addCamera,updateCamera,mainCameraDetail,addCameraDetail,delCameraDetail} from "@/axios/api.js"
+import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
 export default {
   created(){
     this.getCode()
@@ -145,29 +153,28 @@ export default {
 		  return row.brand === 1? "海康威视" : "大华";
 	  },
     getCode() {
-      httpGet(mainCamera).then(res => {
+      let param = {};
+      HttpReq.truckDispatching.carMonitoringFleetQuery(param).then((res) => {
 				this.main_camera = res.content;
         if(res.content.length > 0){
           this.DetailTitle = res.content[0].name;
           this.getCode1(res.content[0].id);
         }
-      });
+			})
     },
     getCode1(id) {
-      let that = this;
-      httpGet(mainCameraDetail,{page:0,size:100,cameraId:id}).then(res => {
+      HttpReq.truckDispatching.carMonitoringCarsQuery({page:0,size:100,motorcadeId:id}).then((res) => {
         console.log("mainCameraDetail",res);
-        this.cameraDetail = res.content
-      });
+        this.cameraDetail = res.content;
+			})
     },
     //分区部分
     zonechecked(row){
-      //console.log(row);
       this.cameraDetailName = row.name + "分区详情表";
-      httpGet(mainCameraDetail,{page:0,size:100,cameraId:row.id}).then(res => {
+      HttpReq.truckDispatching.carMonitoringCarsQuery({page:0,size:100,motorcadeId:id}).then((res) => {
         console.log("mainCameraDetail",res);
-        this.cameraDetail = res.content
-      });
+        this.cameraDetail = res.content;
+			})
     },
     zoneEdit(type,row){
       this.zoneData = {};
@@ -185,24 +192,26 @@ export default {
           if (valid) {
             if(this.zoneType == "add"){
               console.log(this.zoneData);
-              httpPostForJson(addCamera,this.zoneData).then(res => {
+              let param = {};
+              HttpReq.truckDispatching.carMonitoringFleetAdd(this.zoneData).then((res) => {
                 this.$message.success('添加成功');
-                httpGet(mainCamera).then(res => {
+                HttpReq.truckDispatching.carMonitoringFleetQuery(param).then((res) => {
                   this.main_camera = res.content;
                   console.log("mainCamera",this.main_camera);
-                });
-              });
+                })
+              }).catch(function(error) { });
               this.zoneVisible = false;
               this.zoneData = {name: ''};
             }else if(this.zoneType == "change"){
               console.log(this.zoneData);
-              putForJson(updateCamera,this.zoneData).then(res => {
+              let param = {};
+              HttpReq.truckDispatching.carMonitoringFleetUpdate(this.zoneData).then((res) => {
                 this.$message.success('修改成功');
-                httpGet(mainCamera).then(res => {
+                HttpReq.truckDispatching.carMonitoringFleetQuery(param).then((res) => {
                   this.main_camera = res.content;
                   console.log("mainCamera",this.main_camera);
-                });
-              });
+                })
+              }).catch(function(error) { });
               this.zoneVisible = false;
               this.zoneData = {id:'',name: ''};
             }
@@ -222,15 +231,16 @@ export default {
       this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
           type: 'warning'
       }).then( () => {
-        httpDelForJson(delCamera,[row.id]).then( res => {
+        HttpReq.truckDispatching.carMonitoringFleetDel([row.id]).then((res) => {
           this.$message({
             message: "删除成功",
             type: 'success'
           });
-          httpGet(mainCamera).then(res => {
+          let param = {};
+          HttpReq.truckDispatching.carMonitoringFleetQuery(param).then((res) => {
             this.main_camera = res.content;
             console.log("mainCamera",this.main_camera);
-          });
+          })
         })
       })
     },
@@ -239,13 +249,14 @@ export default {
       let arrs = [];
       arrs.push(parseInt(that.zoneData.id));
       console.log(arrs);
-      httpDelForJson(delCamera,arrs).then(res => {
+      HttpReq.truckDispatching.carMonitoringFleetDel(arrs).then((res) => {
         this.$message.success('删除成功');
-        httpGet(mainCamera).then(res => {
+        let param = {};
+        HttpReq.truckDispatching.carMonitoringFleetQuery(param).then((res) => {
           this.main_camera = res.content;
           console.log("mainCamera",this.main_camera);
-        });
-      });
+        })
+      })
       this.zoneDeleteVisible = false;
     },
     cancelDeleteZone(){
@@ -270,15 +281,15 @@ export default {
       this.$refs['cameraDetailData'].validate((valid) => {
           if (valid) {
                 if(this.cameraDetailType == "add"){
-                  this.cameraDetailData.cameraId = this.camID;
+                  this.cameraDetailData.motorcadeId = this.camID;
                   console.log(this.cameraDetailData);
-                  httpPostForJson(addCameraDetail,this.cameraDetailData).then(res => {
+                  HttpReq.truckDispatching.carMonitoringCarsAdd(this.cameraDetailData).then((res) => {
                     this.$message.success('添加成功');
-                    httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => {
+                    HttpReq.truckDispatching.carMonitoringCarsQuery({page:0,size:100,motorcadeId:this.camID}).then((res) => {
                       console.log("mainCameraDetail",res);
-                      this.cameraDetail = res.content
-                    });
-                  });
+                      this.cameraDetail = res.content;
+                    })
+                  }).catch(function(error) { });
                   this.cameraDetailVisible = false;
                   this.cameraDetailData = {};
                 }else if(this.cameraDetailType == "change"){
@@ -293,7 +304,7 @@ export default {
                   })
                   this.cameraDetail = newData;
                   this.cameraDetailVisible = false;
-                  this.cameraDetailData = {id:"",cameraId:"",cameraName:"",cameraIp:"",cameraPort:"",cameraWay:""};
+                  this.cameraDetailData = {id:"",motorcadeId:"",cameraName:"",cameraIp:"",cameraPort:"",cameraWay:""};
                 }
           } else {
             console.log('error submit!!');
@@ -310,15 +321,15 @@ export default {
       this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
           type: 'warning'
       }).then( () => {
-        httpDelForJson(delCameraDetail,[row.id]).then( res => {
+        HttpReq.truckDispatching.carMonitoringCarsDel([row.id]).then((res) => {
           this.$message({
             message: "删除成功",
             type: 'success'
           });
-          httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => {
+          HttpReq.truckDispatching.carMonitoringCarsQuery({page:0,size:100,motorcadeId:this.camID}).then((res) => {
             console.log("mainCameraDetail",res);
-            this.cameraDetail = res.content
-          });
+            this.cameraDetail = res.content;
+          })
         })
       })
     },
@@ -327,13 +338,13 @@ export default {
       let arrs1 = [];
       arrs1.push(parseInt(that.cameraDetailData.id));
       console.log(arrs1);
-      httpDelForJson(delCameraDetail,arrs1).then(res => {
+      HttpReq.truckDispatching.carMonitoringCarsDel(arrs1).then((res) => {
         this.$message.success('删除成功');
-        httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => {
+        HttpReq.truckDispatching.carMonitoringCarsQuery({page:0,size:100,motorcadeId:this.camID}).then((res) => {
           console.log("mainCameraDetail",res);
-          this.cameraDetail = res.content
-        });
-      });
+          this.cameraDetail = res.content;
+        })
+      })
       this.cameraDetaileDeleteVisible = false;
       this.cameraDetailData = {};
     },
@@ -380,27 +391,22 @@ export default {
   height: 49.8%;
   border: 1px solid red;
 }
-</style>
-<style>
-  .text {
+.text {
   font-size: 14px;
-  }
-
-  .item {
+}
+.item {
   margin-bottom: 18px;
-  }
-
-  .clearfix:before,
-  .clearfix:after {
+}
+.clearfix:before,
+.clearfix:after {
   display: table;
   content: "";
-  }
-  .clearfix:after {
+}
+.clearfix:after {
   clear: both
-  }
-
-  .box-card {
+}
+.box-card {
   width: 380px;
   height: 100%;
-  }
+}
 </style>
\ No newline at end of file

src/views/monitoringManagement/mineVideoSetUp/index.vue

@@ -97,8 +97,7 @@
 </template>
 
 <script>
-// import { httpGet,httpPostForJson,httpDelForJson,putForJson } from "@/common/httpBean.js"
-// import {mainCamera,delCamera,addCamera,updateCamera,mainCameraDetail,addCameraDetail,delCameraDetail} from "@/axios/api.js"
+import { Tools, HttpReq, Dates} from '@/assets/js/common.js';
 export default {
   created(){
     this.getCode()
@@ -145,29 +144,28 @@ export default {
 		  return row.brand === 1? "海康威视" : "大华";
 	  },
     getCode() {
-      httpGet(mainCamera).then(res => {
+      let param = {};
+      HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
 				this.main_camera = res.content;
         if(res.content.length > 0){
           this.DetailTitle = res.content[0].name;
           this.getCode1(res.content[0].id);
         }
-      });
+			})
     },
     getCode1(id) {
-      let that = this;
-      httpGet(mainCameraDetail,{page:0,size:100,cameraId:id}).then(res => {
+      HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:id}).then((res) => {
         console.log("mainCameraDetail",res);
         this.cameraDetail = res.content
-      });
+			})
     },
     //分区部分
     zonechecked(row){
-      //console.log(row);
       this.cameraDetailName = row.name + "分区详情表";
-      httpGet(mainCameraDetail,{page:0,size:100,cameraId:row.id}).then(res => {
+      HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:id}).then((res) => {
         console.log("mainCameraDetail",res);
         this.cameraDetail = res.content
-      });
+			})
     },
     zoneEdit(type,row){
       this.zoneData = {};
@@ -185,24 +183,26 @@ export default {
           if (valid) {
             if(this.zoneType == "add"){
               console.log(this.zoneData);
-              httpPostForJson(addCamera,this.zoneData).then(res => {
+              let param = {};
+              HttpReq.truckDispatching.mineMonitoringPartitionAdd(this.zoneData).then((res) => {
                 this.$message.success('添加成功');
-                httpGet(mainCamera).then(res => {
+                HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
                   this.main_camera = res.content;
                   console.log("mainCamera",this.main_camera);
-                });
-              });
+                })
+              }).catch(function(error) { });
               this.zoneVisible = false;
               this.zoneData = {name: ''};
             }else if(this.zoneType == "change"){
               console.log(this.zoneData);
-              putForJson(updateCamera,this.zoneData).then(res => {
+              let param = {};
+              HttpReq.truckDispatching.mineMonitoringPartitionUpdate(this.zoneData).then((res) => {
                 this.$message.success('修改成功');
-                httpGet(mainCamera).then(res => {
+                HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
                   this.main_camera = res.content;
                   console.log("mainCamera",this.main_camera);
-                });
-              });
+                })
+              }).catch(function(error) { });
               this.zoneVisible = false;
               this.zoneData = {id:'',name: ''};
             }
@@ -222,15 +222,16 @@ export default {
       this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
           type: 'warning'
       }).then( () => {
-        httpDelForJson(delCamera,[row.id]).then( res => {
+        HttpReq.truckDispatching.mineMonitoringPartitionDel([row.id]).then((res) => {
           this.$message({
             message: "删除成功",
             type: 'success'
           });
-          httpGet(mainCamera).then(res => {
+          let param = {};
+          HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
             this.main_camera = res.content;
             console.log("mainCamera",this.main_camera);
-          });
+          })
         })
       })
     },
@@ -239,13 +240,14 @@ export default {
       let arrs = [];
       arrs.push(parseInt(that.zoneData.id));
       console.log(arrs);
-      httpDelForJson(delCamera,arrs).then(res => {
+      HttpReq.truckDispatching.mineMonitoringPartitionDel(arrs).then((res) => {
         this.$message.success('删除成功');
-        httpGet(mainCamera).then(res => {
+        let param = {};
+        HttpReq.truckDispatching.mineMonitoringPartitionQuery(param).then((res) => {
           this.main_camera = res.content;
           console.log("mainCamera",this.main_camera);
-        });
-      });
+        })
+      })
       this.zoneDeleteVisible = false;
     },
     cancelDeleteZone(){
@@ -272,13 +274,13 @@ export default {
                 if(this.cameraDetailType == "add"){
                   this.cameraDetailData.cameraId = this.camID;
                   console.log(this.cameraDetailData);
-                  httpPostForJson(addCameraDetail,this.cameraDetailData).then(res => {
+                  HttpReq.truckDispatching.mineMonitoringCameraAdd(this.cameraDetailData).then((res) => {
                     this.$message.success('添加成功');
-                    httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => {
+                    HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:this.camID}).then((res) => {
                       console.log("mainCameraDetail",res);
                       this.cameraDetail = res.content
-                    });
-                  });
+                    })
+                  }).catch(function(error) { });
                   this.cameraDetailVisible = false;
                   this.cameraDetailData = {};
                 }else if(this.cameraDetailType == "change"){
@@ -310,15 +312,15 @@ export default {
       this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
           type: 'warning'
       }).then( () => {
-        httpDelForJson(delCameraDetail,[row.id]).then( res => {
+        HttpReq.truckDispatching.mineMonitoringCameraDel([row.id]).then((res) => {
           this.$message({
             message: "删除成功",
             type: 'success'
           });
-          httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => {
+          HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:this.camID}).then((res) => {
             console.log("mainCameraDetail",res);
             this.cameraDetail = res.content
-          });
+          })
         })
       })
     },
@@ -327,13 +329,13 @@ export default {
       let arrs1 = [];
       arrs1.push(parseInt(that.cameraDetailData.id));
       console.log(arrs1);
-      httpDelForJson(delCameraDetail,arrs1).then(res => {
+      HttpReq.truckDispatching.mineMonitoringCameraDel(arrs1).then((res) => {
         this.$message.success('删除成功');
-        httpGet(mainCameraDetail,{page:0,size:100,cameraId:this.camID}).then(res => {
+        HttpReq.truckDispatching.mineMonitoringCameraQuery({page:0,size:100,cameraId:this.camID}).then((res) => {
           console.log("mainCameraDetail",res);
           this.cameraDetail = res.content
-        });
-      });
+        })
+      })
       this.cameraDetaileDeleteVisible = false;
       this.cameraDetailData = {};
     },
@@ -380,27 +382,22 @@ export default {
   height: 49.8%;
   border: 1px solid red;
 }
-</style>
-<style>
-  .text {
+.text {
   font-size: 14px;
-  }
-
-  .item {
+}
+.item {
   margin-bottom: 18px;
-  }
-
-  .clearfix:before,
-  .clearfix:after {
+}
+.clearfix:before,
+.clearfix:after {
   display: table;
   content: "";
-  }
-  .clearfix:after {
+}
+.clearfix:after {
   clear: both
-  }
-
-  .box-card {
+}
+.box-card {
   width: 380px;
   height: 100%;
-  }
+}
 </style>
\ No newline at end of file

src/views/regionalManagement/regionalInformation/index.vue

@@ -27,7 +27,7 @@
 									<template slot-scope="scope">
 										<el-button size="mini" type="primary" icon="el-icon-edit" @click="toEdit(scope.row)"></el-button>
 										<el-button size="mini" type="danger" icon="el-icon-delete" @click="toDelete(scope.row)"></el-button>
-										<el-button size="mini" type="success" icon="el-icon-view" v-show="scope.row.areaore == '是'"></el-button>
+										<el-button size="mini" type="success" icon="el-icon-view" v-show="scope.row.areaore == '是'" @click="showGradeTable(scope.row)"></el-button>
 									</template>
 								</el-table-column>
 							</el-table>
@@ -132,6 +132,42 @@
 
 		</el-dialog>
 
+		<!-- 品位设置 -->
+		<el-dialog title="品位设置" :visible.sync="dialogTableVisible">
+			<div class="toolbar" style="margin-bottom:15px;">
+				<el-button size="mini" type="primary" icon="el-icon-plus" @click="gradeToAdd">新增</el-button>
+			</div>
+			<el-table :data="gridData" border v-loading="gradeLoading">
+				<el-table-column property="name" label="品位名称" align="center"></el-table-column>
+				<el-table-column property="content" label="含量" align="center"></el-table-column>
+				<el-table-column property="unit" label="单位" align="center"></el-table-column>
+				<el-table-column label="操作" align="center" fixed="right">
+					<template slot-scope="scope">
+						<el-button size="mini" type="primary" icon="el-icon-edit" @click="gradeToEdit(scope.row)"></el-button>
+						<el-button size="mini" type="danger" icon="el-icon-delete" @click="gradeToDelete(scope.row)"></el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-dialog>
+
+		<!-- 品位设置表单 -->
+		<el-dialog :title="gradeFrom.title" :before-close="gradeCancelForm" :visible.sync="gradeFrom.visible" width="700px">
+			<el-form :model="gradeFrom.item" :inline="true" ref="form2" size="small" label-width="150px">
+				<el-form-item label="品位名称">
+					<el-input v-model="gradeFrom.item.name" style="width:260px;" placeholder="请输入品位名称"></el-input>
+				</el-form-item>
+				<el-form-item label="含量">
+					<el-input v-model="gradeFrom.item.content" style="width:260px;" placeholder="请输入含量"></el-input>
+				</el-form-item>
+				<el-form-item label="单位">
+					<el-input v-model="gradeFrom.item.unit" style="width:260px;" placeholder="请输入单位"></el-input>
+				</el-form-item>
+			</el-form>
+			<div slot="footer" class="dialog-footer">
+				<el-button @click="gradeCancelForm">取 消</el-button>
+				<el-button :loading="gradeFrom.status.cu === 2" type="primary" @click="gradeSubmitForm('form2', gradeFrom.item)">确 定</el-button>
+			</div>
+		</el-dialog>
 
 	</div>
 </template>
@@ -170,6 +206,20 @@ export default {
 				// 	{required: true, message: '请输入区域信息', trigger: 'blur' }
 				// ],
 			},
+
+
+			//品味设置数据
+			dialogTableVisible: false,
+			gridData: [],
+			gradeLoading: false,
+			gradeQueryId:0,
+			gradeFrom:{
+				title:'新增品位',
+				visible:false,
+				reqType:'add',
+				status:{cu:0},
+				item:{},
+			}
 		}
 	},
 	mounted() {
@@ -179,6 +229,7 @@ export default {
 		})
 	},
 	methods: {
+		//获取区域信息数据
 		loadData() {
 			var sort = 'createTime,desc';
 			var param = this.query;
@@ -383,6 +434,145 @@ export default {
 				console.log(error);
 			});
 		},
+
+
+		//品味设置方法
+		showGradeTable(row){
+			this.dialogTableVisible = true;
+			this.gradeQueryId = row.id;
+			this.loadGradeData();
+		},
+		//获取品味设置数据
+		loadGradeData(){
+			var sort = 'id,desc';
+			var param = {};
+			param.sort = sort;
+			param.areaId = this.gradeQueryId;
+			
+			this.$nextTick(()=>{
+				HttpReq.truckDispatching.RegionalInformationGradeQuery(param).then((res) => {
+					if(res.code == 200){
+						this.gradeLoading = false;
+						this.gridData = res.data.content;
+					}
+				})
+			})
+		},
+		gradeCancelForm(a, b, c){
+			this.gradeFrom.visible = false;
+		},
+		gradeSubmitForm(validateName, item){
+			if(!this.gradeFrom.status.cu){
+				this.gradeFrom.status.cu = 2;
+				this.$refs[validateName].validate(valid => {
+					if(valid){
+						if(this.gradeFrom.reqType === 'add'){
+							this.gradeReqAddItem(this.gradeFrom, item)
+						}else{
+							this.gradeReqUpdateItem(this.gradeFrom, item)
+						}
+					}else{
+						this.gradeFrom.status.cu = 0
+					}
+				});
+			};
+		},
+		gradeToAdd() {
+			// 请除表单验证
+			this.$refs['form2'] && this.$refs['form2'].clearValidate();
+			this.gradeFrom.title = '新增品味';
+			this.gradeFrom.status.cu = 0;
+			this.gradeFrom.visible = true;
+			this.gradeFrom.reqType = 'add';
+			this.gradeFrom.item = {};
+		},
+		gradeToEdit(item) {
+			// 请除表单验证
+			this.$refs['form2'] && this.$refs['form2'].clearValidate();
+			this.gradeFrom.title = '修改品位设置';
+			this.gradeFrom.status.cu = 0;
+			this.gradeFrom.visible = true;
+			this.gradeFrom.item = {...item};
+			this.gradeFrom.reqType = 'edit';
+		},
+		gradeToDelete(item) {
+			var id = item.id;
+			this.$confirm('确认删除该条数据吗?', '提示', {
+				confirmButtonText: '确定',
+				cancelButtonText: '取消',
+				type: 'warning'
+			}).then((e) => {
+				this.gradeReqRemoveProject([id])
+			}).catch((e) => {})
+		},
+		//新增品味设置
+		gradeReqAddItem(gradeFrom, item){
+			let lastData = {...item};
+			lastData.areaId = this.gradeQueryId;
+			HttpReq.truckDispatching.RegionalInformationGradeAdd(lastData).then((res) => {
+				gradeFrom.visible = false;
+				if(res.code == 200){
+					this.$notify({
+						title: '品味设置新增成功！',
+						type: 'success',
+						duration: 2500
+					});
+					this.loadGradeData()
+				}else{
+					this.$notify({
+						title: res.msg,
+						type: 'error',
+						duration: 2500
+					})
+				}
+			}).catch(function(error) {
+				gradeFrom.status.cu = 0
+			});
+		},
+		//修改品味设置
+		gradeReqUpdateItem(gradeFrom, item){
+			let lastData = {...item};
+			HttpReq.truckDispatching.RegionalInformationGradeUpdate(lastData).then((res) => {
+				gradeFrom.visible = false;
+				if(res.code == 200){
+					this.$notify({
+						title: '品味设置修改成功！',
+						type: 'success',
+						duration: 2500
+					});
+					this.loadGradeData()
+				}else{
+					this.$notify({
+						title: res.msg,
+						type: 'error',
+						duration: 2500
+					})
+					this.loadGradeData()
+				}
+			}).catch(function(error) {
+				gradeFrom.status.cu = 0
+			});
+		},
+		//删除品味设置
+		gradeReqRemoveProject(item){
+			HttpReq.truckDispatching.RegionalInformationGradeDel(item).then((res) => {
+				if(res.status == 400){
+					this.$notify({
+						title: res.msg,
+						type: 'error',
+						duration: 2500
+					})
+				}else{
+					this.$notify({
+						title: '删除成功！',
+						type: 'success',
+						duration: 2500
+					});
+				}
+				this.loadGradeData();
+			})
+		},
+
 	}
 }
 </script>