1

.env.development

@@ -5,9 +5,15 @@ ENV = 'development'
 # 测试线
 # VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+
+
  
+<<<<<<< HEAD
 VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
+=======
+>>>>>>> 95dccffa55e81b58dce6eb060e74e2f663d43a4a
 # VUE_APP_BASE_API = 'http://lhpc81.kptyun.com/'
  
 

src/views/shedProduction/dungScores/index.vue

@@ -763,66 +763,20 @@ export default {
       }
     },
     // 复制
-    handleCopy() {
-      console.log('点击了复制')
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
-      } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          this.requestParam.name = 'copyDungscore'
-          this.requestParam.parammaps = {}
-          this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
-          this.requestParam.parammaps.id = this.selectList[0].id
-          PostDataByName(this.requestParam).then(response => {
-            if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
-            }
-          })
-        }).catch(() => {
-          this.$message({ type: 'info', message: '已取消复制' })
-        })
-      } else {
-        this.$message({ type: 'error', message: '请选择一条粪便评分', duration: 2000 })
-      }
-    },
-
-
-    // 改成多条，后端接口未改正确，先注释
-    //  handleCopy() {
+    // handleCopy() {
     //   console.log('点击了复制')
     //   if (this.selectList.length == 0) {
     //     this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
-    //   } else  {
+    //   } else if (this.selectList.length == 1) {
     //     MessageBox.confirm('是否确认复制此信息?', {
     //       confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
     //     }).then(() => {
-     
-    //       var send_data = {
-    //         "common":{"returnmap":"0"},
-    //         "data":[
-    //           {
-    //             "name":"insertSpotList",
-    //             "resultmaps":{
-    //               "list":this.selectList
-    //             },
-    //             "children":[
-    //                 {
-    //                   "name":"copyDungscore","type":"e",
-    //                   "parammaps":{
-    //                     "pastureid":"@insertSpotList.pastureid"
-    //                   }
-    //                 }
-    //             ]
-    //           }
-    //         ]
-    //       }
-    //       ExecDataByConfig(send_data).then(response => {
-    //         if (response.msg === 'fail') {     
+    //       this.requestParam.name = 'copyDungscore'
+    //       this.requestParam.parammaps = {}
+    //       this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
+    //       this.requestParam.parammaps.id = this.selectList[0].id
+    //       PostDataByName(this.requestParam).then(response => {
+    //         if (response.msg === 'fail') {
     //           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
     //         } else {
     //           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -832,10 +786,56 @@ export default {
     //     }).catch(() => {
     //       this.$message({ type: 'info', message: '已取消复制' })
     //     })
-    //   } 
+    //   } else {
+    //     this.$message({ type: 'error', message: '请选择一条粪便评分', duration: 2000 })
+    //   }
     // },
 
 
+    // 改成多条，后端接口未改正确，先注释
+     handleCopy() {
+      console.log('点击了复制')
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
+      } else  {
+        MessageBox.confirm('是否确认复制此信息?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+     
+          var send_data = {
+            "common":{"returnmap":"0"},
+            "data":[
+              {
+                "name":"insertSpotList",
+                "resultmaps":{
+                  "list":this.selectList
+                },
+                "children":[
+                    {
+                      "name":"copyDungscore","type":"e",
+                      "parammaps":{
+                        "pastureid":"@insertSpotList.pastureid"
+                      }
+                    }
+                ]
+              }
+            ]
+          }
+          ExecDataByConfig(send_data).then(response => {
+            if (response.msg === 'fail') {     
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.$message({ type: 'info', message: '已取消复制' })
+        })
+      } 
+    },
+
+
     // 导出
     handleExport(item) {
       if (item == 1) {

src/views/shedProduction/fecalScreen/index.vue

@@ -722,66 +722,20 @@ export default {
       }
     },
     // 复制
-    handleCopy() {
-      console.log('点击了复制')
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
-      } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          this.requestParam.name = 'copyDungsieve'
-          this.requestParam.parammaps = {}
-          this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
-          this.requestParam.parammaps.id = this.selectList[0].id
-          PostDataByName(this.requestParam).then(response => {
-            if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
-            }
-          })
-        }).catch(() => {
-          this.$message({ type: 'info', message: '已取消复制' })
-        })
-      } else {
-        this.$message({ type: 'error', message: '请选择一条粪便筛', duration: 2000 })
-      }
-    },
-
-
-     // 改成多条，后端接口未改正确，先注释
-    //  handleCopy() {
+    // handleCopy() {
     //   console.log('点击了复制')
     //   if (this.selectList.length == 0) {
     //     this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
-    //   } else  {
+    //   } else if (this.selectList.length == 1) {
     //     MessageBox.confirm('是否确认复制此信息?', {
     //       confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
     //     }).then(() => {
-     
-    //       var send_data = {
-    //         "common":{"returnmap":"0"},
-    //         "data":[
-    //           {
-    //             "name":"insertSpotList",
-    //             "resultmaps":{
-    //               "list":this.selectList
-    //             },
-    //             "children":[
-    //                 {
-    //                   "name":"copyDungsieve","type":"e",
-    //                   "parammaps":{
-    //                     "pastureid":"@insertSpotList.pastureid"
-    //                   }
-    //                 }
-    //             ]
-    //           }
-    //         ]
-    //       }
-    //       ExecDataByConfig(send_data).then(response => {
-    //         if (response.msg === 'fail') {     
+    //       this.requestParam.name = 'copyDungsieve'
+    //       this.requestParam.parammaps = {}
+    //       this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
+    //       this.requestParam.parammaps.id = this.selectList[0].id
+    //       PostDataByName(this.requestParam).then(response => {
+    //         if (response.msg === 'fail') {
     //           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
     //         } else {
     //           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -791,8 +745,54 @@ export default {
     //     }).catch(() => {
     //       this.$message({ type: 'info', message: '已取消复制' })
     //     })
-    //   } 
+    //   } else {
+    //     this.$message({ type: 'error', message: '请选择一条粪便筛', duration: 2000 })
+    //   }
     // },
+
+
+     // 改成多条，后端接口未改正确，先注释
+     handleCopy() {
+      console.log('点击了复制')
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
+      } else  {
+        MessageBox.confirm('是否确认复制此信息?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+     
+          var send_data = {
+            "common":{"returnmap":"0"},
+            "data":[
+              {
+                "name":"insertSpotList",
+                "resultmaps":{
+                  "list":this.selectList
+                },
+                "children":[
+                    {
+                      "name":"copyDungsieve","type":"e",
+                      "parammaps":{
+                        "pastureid":"@insertSpotList.pastureid"
+                      }
+                    }
+                ]
+              }
+            ]
+          }
+          ExecDataByConfig(send_data).then(response => {
+            if (response.msg === 'fail') {     
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.$message({ type: 'info', message: '已取消复制' })
+        })
+      } 
+    },
     // 导出
     handleExport(item) {
       if (item == 1) {

src/views/shedProduction/formulaDryMatter/index.vue

@@ -718,70 +718,19 @@ export default {
       }
     },
     // 复制
-    handleCopy() {
-      console.log('点击了复制')
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
-      } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          this.requestParam.name = 'copyFtdry'
-          this.requestParam.parammaps = {}
-          this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
-          this.requestParam.parammaps.id = this.selectList[0].id
-          PostDataByName(this.requestParam).then(response => {
-            if (response.msg === 'fail') {
-              const barid = new RegExp("key 'barid'")
-              if (barid.test(response.data)) {
-                this.$notify({ type: 'warning', message: '该栏舍该班次今日配方干物质已存在，不可重复生成', duration: 2000 })
-                return
-              }
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
-            }
-          })
-        }).catch(() => {
-          this.$message({ type: 'info', message: '已取消复制' })
-        })
-      } else {
-        this.$message({ type: 'error', message: '请选择一条配方干物质', duration: 2000 })
-      }
-    },
-
-
-    // 改成多条，后端接口未改正确，先注释
-    //  handleCopy() {
+    // handleCopy() {
     //   console.log('点击了复制')
     //   if (this.selectList.length == 0) {
     //     this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
-    //   } else  {
+    //   } else if (this.selectList.length == 1) {
     //     MessageBox.confirm('是否确认复制此信息?', {
     //       confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
     //     }).then(() => {
-     
-    //       var send_data = {
-    //         "common":{"returnmap":"0"},
-    //         "data":[
-    //           {
-    //             "name":"insertSpotList",
-    //             "resultmaps":{
-    //               "list":this.selectList
-    //             },
-    //             "children":[
-    //                 {
-    //                   "name":"copyFtdry","type":"e",
-    //                   "parammaps":{
-    //                     "pastureid":"@insertSpotList.pastureid"
-    //                   }
-    //                 }
-    //             ]
-    //           }
-    //         ]
-    //       }
-    //       ExecDataByConfig(send_data).then(response => {
+    //       this.requestParam.name = 'copyFtdry'
+    //       this.requestParam.parammaps = {}
+    //       this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
+    //       this.requestParam.parammaps.id = this.selectList[0].id
+    //       PostDataByName(this.requestParam).then(response => {
     //         if (response.msg === 'fail') {
     //           const barid = new RegExp("key 'barid'")
     //           if (barid.test(response.data)) {
@@ -797,8 +746,59 @@ export default {
     //     }).catch(() => {
     //       this.$message({ type: 'info', message: '已取消复制' })
     //     })
-    //   } 
+    //   } else {
+    //     this.$message({ type: 'error', message: '请选择一条配方干物质', duration: 2000 })
+    //   }
     // },
+
+
+    // 改成多条，后端接口未改正确，先注释
+     handleCopy() {
+      console.log('点击了复制')
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
+      } else  {
+        MessageBox.confirm('是否确认复制此信息?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+     
+          var send_data = {
+            "common":{"returnmap":"0"},
+            "data":[
+              {
+                "name":"insertSpotList",
+                "resultmaps":{
+                  "list":this.selectList
+                },
+                "children":[
+                    {
+                      "name":"copyFtdry","type":"e",
+                      "parammaps":{
+                        "pastureid":"@insertSpotList.pastureid"
+                      }
+                    }
+                ]
+              }
+            ]
+          }
+          ExecDataByConfig(send_data).then(response => {
+            if (response.msg === 'fail') {
+              const barid = new RegExp("key 'barid'")
+              if (barid.test(response.data)) {
+                this.$notify({ type: 'warning', message: '该栏舍该班次今日配方干物质已存在，不可重复生成', duration: 2000 })
+                return
+              }
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.$message({ type: 'info', message: '已取消复制' })
+        })
+      } 
+    },
  
 
 

src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -767,65 +767,20 @@ export default {
       }
     },
     // 复制
-    handleCopy() {
-      console.log('点击了复制')
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择宾州筛', duration: 2000 })
-      } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          this.requestParam.name = 'copyPennsieve'
-          this.requestParam.parammaps = {}
-          this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
-          this.requestParam.parammaps.id = this.selectList[0].id
-          PostDataByName(this.requestParam).then(response => {
-            if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
-            }
-          })
-        }).catch(() => {
-          this.$message({ type: 'info', message: '已取消复制' })
-        })
-      } else {
-        this.$message({ type: 'error', message: '请选择一条宾州筛', duration: 2000 })
-      }
-    },
-
-    // 改成多条，后端接口未改正确，先注释
-    //  handleCopy() {
+    // handleCopy() {
     //   console.log('点击了复制')
     //   if (this.selectList.length == 0) {
-    //     this.$message({ type: 'error', message: '请选择宾州筛质', duration: 2000 })
-    //   } else  {
+    //     this.$message({ type: 'error', message: '请选择宾州筛', duration: 2000 })
+    //   } else if (this.selectList.length == 1) {
     //     MessageBox.confirm('是否确认复制此信息?', {
     //       confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
     //     }).then(() => {
-     
-    //       var send_data = {
-    //         "common":{"returnmap":"0"},
-    //         "data":[
-    //           {
-    //             "name":"insertSpotList",
-    //             "resultmaps":{
-    //               "list":this.selectList
-    //             },
-    //             "children":[
-    //                 {
-    //                   "name":"copyPennsieve","type":"e",
-    //                   "parammaps":{
-    //                     "pastureid":"@insertSpotList.pastureid"
-    //                   }
-    //                 }
-    //             ]
-    //           }
-    //         ]
-    //       }
-    //       ExecDataByConfig(send_data).then(response => {
-    //         if (response.msg === 'fail') {     
+    //       this.requestParam.name = 'copyPennsieve'
+    //       this.requestParam.parammaps = {}
+    //       this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
+    //       this.requestParam.parammaps.id = this.selectList[0].id
+    //       PostDataByName(this.requestParam).then(response => {
+    //         if (response.msg === 'fail') {
     //           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
     //         } else {
     //           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -835,9 +790,54 @@ export default {
     //     }).catch(() => {
     //       this.$message({ type: 'info', message: '已取消复制' })
     //     })
-    //   } 
+    //   } else {
+    //     this.$message({ type: 'error', message: '请选择一条宾州筛', duration: 2000 })
+    //   }
     // },
 
+    // 改成多条，后端接口未改正确，先注释
+     handleCopy() {
+      console.log('点击了复制')
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择宾州筛质', duration: 2000 })
+      } else  {
+        MessageBox.confirm('是否确认复制此信息?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+     
+          var send_data = {
+            "common":{"returnmap":"0"},
+            "data":[
+              {
+                "name":"insertSpotList",
+                "resultmaps":{
+                  "list":this.selectList
+                },
+                "children":[
+                    {
+                      "name":"copyPennsieve","type":"e",
+                      "parammaps":{
+                        "pastureid":"@insertSpotList.pastureid"
+                      }
+                    }
+                ]
+              }
+            ]
+          }
+          ExecDataByConfig(send_data).then(response => {
+            if (response.msg === 'fail') {     
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.$message({ type: 'info', message: '已取消复制' })
+        })
+      } 
+    },
+
     // 导出
     handleExport(item) {
       if (item == 1) {

src/views/shedProduction/physicalConditionScore/index.vue

@@ -791,66 +791,20 @@ export default {
       }
     },
     // 复制
-    handleCopy() {
-      console.log('点击了复制')
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
-      } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          this.requestParam.name = 'copyBodyscore'
-          this.requestParam.parammaps = {}
-          this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
-          this.requestParam.parammaps.id = this.selectList[0].id
-          PostDataByName(this.requestParam).then(response => {
-            if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
-            }
-          })
-        }).catch(() => {
-          this.$message({ type: 'info', message: '已取消复制' })
-        })
-      } else {
-        this.$message({ type: 'error', message: '请选择一条体况评分', duration: 2000 })
-      }
-    },
-
-
-    // 改成多条，后端接口未改正确，先注释
-    //  handleCopy() {
+    // handleCopy() {
     //   console.log('点击了复制')
     //   if (this.selectList.length == 0) {
     //     this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
-    //   } else  {
+    //   } else if (this.selectList.length == 1) {
     //     MessageBox.confirm('是否确认复制此信息?', {
     //       confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
     //     }).then(() => {
-     
-    //       var send_data = {
-    //         "common":{"returnmap":"0"},
-    //         "data":[
-    //           {
-    //             "name":"insertSpotList",
-    //             "resultmaps":{
-    //               "list":this.selectList
-    //             },
-    //             "children":[
-    //                 {
-    //                   "name":"copyBodyscore","type":"e",
-    //                   "parammaps":{
-    //                     "pastureid":"@insertSpotList.pastureid"
-    //                   }
-    //                 }
-    //             ]
-    //           }
-    //         ]
-    //       }
-    //       ExecDataByConfig(send_data).then(response => {
-    //         if (response.msg === 'fail') {     
+    //       this.requestParam.name = 'copyBodyscore'
+    //       this.requestParam.parammaps = {}
+    //       this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
+    //       this.requestParam.parammaps.id = this.selectList[0].id
+    //       PostDataByName(this.requestParam).then(response => {
+    //         if (response.msg === 'fail') {
     //           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
     //         } else {
     //           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -860,10 +814,56 @@ export default {
     //     }).catch(() => {
     //       this.$message({ type: 'info', message: '已取消复制' })
     //     })
-    //   } 
+    //   } else {
+    //     this.$message({ type: 'error', message: '请选择一条体况评分', duration: 2000 })
+    //   }
     // },
 
 
+    // 改成多条，后端接口未改正确，先注释
+     handleCopy() {
+      console.log('点击了复制')
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
+      } else  {
+        MessageBox.confirm('是否确认复制此信息?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+     
+          var send_data = {
+            "common":{"returnmap":"0"},
+            "data":[
+              {
+                "name":"insertSpotList",
+                "resultmaps":{
+                  "list":this.selectList
+                },
+                "children":[
+                    {
+                      "name":"copyBodyscore","type":"e",
+                      "parammaps":{
+                        "pastureid":"@insertSpotList.pastureid"
+                      }
+                    }
+                ]
+              }
+            ]
+          }
+          ExecDataByConfig(send_data).then(response => {
+            if (response.msg === 'fail') {     
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            } else {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.$message({ type: 'info', message: '已取消复制' })
+        })
+      } 
+    },
+
+
     // 导出
     handleExport(item) {
       if (item == 1) {

src/views/systemManagement/customboard2/Addboard2/index.vue

@@ -1,48 +1,82 @@
 <template>
 
   <div   class="container">
+    <el-row>
+      <div class="tool-bar">
+        <div>
+          <span class="title-name">仪表盘标题</span>
+          <span>解释信息</span>
+        </div>
+        <div>
+          <el-button class="miniSuccess" @click="control_edit()">编辑</el-button>
+          <el-button class="successBorder" @click="handleLinkChart">
+            添加图表
+          </el-button>
+        </div>
+      
+    </div>
+    </el-row>
 
-
-    <div class="tool-bar">
+    <el-row>
       <div>
-        <span class="title-name">仪表盘标题</span>
-        <span>解释信息</span>
-      </div>
-      <div  style="position:absolute;top:170px;right:100px;z-index:1">
-        <el-button class="miniSuccess" @click="control_edit()">编辑</el-button>
-        <el-button class="successBorder" @click="handleLinkChart">
-          添加图表
-        </el-button>
-      </div>
-     
-    </div>
+        <draggable v-model="boardList" group="itxst"   animation="300" :group="{name: 'dashboard',pull: true}" @start="onStart" @end="onEnd">
+          <transition-group>
 
-    <div>
-      <draggable v-model="boardList" group="itxst"   animation="300" :group="{name: 'dashboard',pull: true}" @start="onStart" @end="onEnd">
-        <transition-group>
+          <el-card class="box-card board-card" key="1" v-for="item in boardList">
+            <div slot="header" class="clearfix">
+              <span>{{item.title}}</span>
+        
 
-        <el-card class="box-card board-card" key="1" v-for="item in boardList">
-          <div slot="header" class="clearfix">
-            <span>{{item.title}}</span>
-       
+              <div  style="float: right; padding: 3px 0;display:inline-block;">
+                <i  class="el-icon-edit" style="color:#009C69;cursor:pointer;" />
+                <i  class="el-icon-delete" style="color:#009C69;cursor:pointer;"  />
 
-            <div  style="float: right; padding: 3px 0;display:inline-block;">
-              <i  class="el-icon-edit" style="color:#009C69;cursor:pointer;" />
-              <i  class="el-icon-delete" style="color:#009C69;cursor:pointer;"  />
+              </div>
 
             </div>
+            <div  class="text item"> 
+              图表内容
+            </div>
+          </el-card>
+                    
+                        
+          </transition-group>
+        </draggable>
 
-          </div>
-          <div  class="text item"> 
-            图表内容
-          </div>
-        </el-card>
-                  
-                       
-        </transition-group>
-    </draggable>
+      </div>
+    </el-row>
 
-    </div>
+    <el-row>
+
+    </el-row>
+
+    
+
+    
+
+
+    <el-dialog  title="我的图表" :visible.sync="showChartList">
+      <!-- <el-button type="primary" size="mini" @click="$router.push({ name: 'ChartPanel', params: { id: 'create' , isEdit: 'edit'}})">
+        创建新的图表
+      </el-button> -->
+
+      <el-button class="save" style="margin-bottom: 10px;" @click="jumpCreate()"> 创建新的图表 </el-button>
+
+      <el-table :data="myChartList" border>
+        <el-table-column :label="$t('common.name')" width="200" prop="chart_name" />
+        <el-table-column :label="$t('common.desc')" prop="desc" />
+        <el-table-column :label="$t('common.operation')" align="center">
+          <template slot-scope="scope">
+            <el-button class="miniPrimary" :disabled="isExisted(scope.row)" @click="linkChart(scope.row)">添加</el-button>
+            <el-button size="mini" type="warning" style="padding: 6px 10px !important;font-size:14px;" @click="jumpEdit2(scope.row)">  编辑 </el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="cancelClose1" @click="showChartList = false">关闭</el-button>
+      </div>
+    </el-dialog>
  
     
   </div>
@@ -63,12 +97,25 @@ export default {
       isRoleEdit: [],
 
       boardList: [
-
-        {title:'图标1'},
-        {title:'图标2'},
-        {title:'图标3'},
+        {
+          title:'图表1',boardId:1,boardtype:'line',
+          boardtext:[]
+        },
+        {title:'图表2'},
+        {title:'图表3'},
+        {title:'图表3'},
+        {title:'图表3'},
+
+        {title:'图表3'},
+        {title:'图表3'},
        ],
 
+       myChartList: [],
+      showChartList: false,
+      chartLoading: {},
+
+
+
       isEdit: 'view',
       dashboardList: [],
       currentDashboard: undefined,
@@ -122,7 +169,8 @@ export default {
 
      
     },
-       handleLinkChart() {
+    //添加图表
+    handleLinkChart() {
       var send_data = {
         name: 'getChartListV2',
         page: 1,