diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
new file mode 100644
index 0000000..dc993d4
--- /dev/null
+++ b/src/utils/fullScreenUrl.ts
@@ -0,0 +1,17 @@
+// 山海经数据可视化大屏地址
+export function getDataUrl() {
+  return [
+    {
+      name: '碳足迹监测',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
+    },
+    {
+      name: '碳足迹评价',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
+    },
+    {
+      name: '碳足迹预警',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
+    },
+  ]
+}

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
new file mode 100644
index 0000000..dc993d4
--- /dev/null
+++ b/src/utils/fullScreenUrl.ts
@@ -0,0 +1,17 @@
+// 山海经数据可视化大屏地址
+export function getDataUrl() {
+  return [
+    {
+      name: '碳足迹监测',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
+    },
+    {
+      name: '碳足迹评价',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
+    },
+    {
+      name: '碳足迹预警',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
+    },
+  ]
+}
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 99ae787..0450150 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -42,11 +42,20 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  b: [{ required: true, message: '请输入支路电纳标幺值', trigger: ['blur', 'change'] }],
+  branchNumber: [{ required: true, message: '请输入支路编号', trigger: ['blur', 'change'] }],
+  fbusId: [{ required: true, message: '请选择支路首端节点', trigger: ['blur', 'change'] }],
+  tbusId: [{ required: true, message: '请选择支路末端节点', trigger: ['blur', 'change'] }],
+  r: [{ required: true, message: '请输入支路电阻标幺值', trigger: ['blur', 'change'] }],
+  ratea: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  rateb: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  ratec: [{ required: true, message: '请输入紧急距离输电容量', trigger: ['blur', 'change'] }],
+  x: [{ required: true, message: '请输入支路电抗标幺值', trigger: ['blur', 'change'] }],
+  angle: [{ required: true, message: '请输入支路相位角', trigger: ['blur', 'change'] }],
+  angmax: [{ required: true, message: '请输入支路最大相位角', trigger: ['blur', 'change'] }],
+  angmin: [{ required: true, message: '请输入支路最小相位角', trigger: ['blur', 'change'] }],
+  ratio: [{ required: true, message: '请输入支路变比', trigger: ['blur', 'change'] }],
+  status2: [{ required: true, message: '请选择支路状态', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取节点列表
 const nodeList = ref<any[]>([])
@@ -85,7 +94,6 @@
 }
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any, id: string) => {
-  console.log(row)
   fetchNodeList(id)
   dialogStatus.value = dialogStatusValue
   dialogFormVisible.value = true
@@ -177,7 +185,7 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路编号:" prop="branchNumber">
-            <el-input v-model="areaForm.branchNumber" :placeholder="dialogStatus === 'create' ? '请输入支路编号' : ''" />
+            <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -185,7 +193,7 @@
         <el-col :span="20">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
-              v-model="areaForm.fbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路首端节点' : ''"
+              v-model="areaForm.fbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -198,7 +206,7 @@
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
-              v-model="areaForm.tbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路末端节点' : ''"
+              v-model="areaForm.tbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -209,49 +217,49 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电阻标幺值:" prop="r">
-            <el-input v-model="areaForm.r" :placeholder="dialogStatus === 'create' ? '请输入支路电阻标幺值' : ''" />
+            <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电纳标幺值:" prop="b">
-            <el-input v-model="areaForm.b" :placeholder="dialogStatus === 'create' ? '请输入支路电纳标幺值' : ''" />
+            <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="长距离输电容量:" prop="ratea">
-            <el-input v-model="areaForm.ratea" :placeholder="dialogStatus === 'create' ? '请输入长距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="短距离输电容量:" prop="rateb">
-            <el-input v-model="areaForm.rateb" :placeholder="dialogStatus === 'create' ? '请输入短距离输电容量' : ''" />
+            <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
-            <el-input v-model="areaForm.ratec" :placeholder="dialogStatus === 'create' ? '请输入紧急距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路变比:" prop="ratio">
-            <el-input v-model="areaForm.ratio" :placeholder="dialogStatus === 'create' ? '请输入支路变比' : ''" />
+            <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="角度:" prop="angle">
-            <el-input v-model="areaForm.angle" :placeholder="dialogStatus === 'create' ? '请输入角度' : ''" />
+          <el-form-item label="支路相位角:" prop="angle">
+            <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -259,14 +267,14 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最小相位角:" prop="angmin">
-            <el-input v-model="areaForm.angmin" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最大相位角:" prop="angmax">
-            <el-input v-model="areaForm.angmax" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -274,7 +282,7 @@
         <el-col :span="20">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
-              v-model="areaForm.status2" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路状态' : ''"
+              v-model="areaForm.status2" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
new file mode 100644
index 0000000..dc993d4
--- /dev/null
+++ b/src/utils/fullScreenUrl.ts
@@ -0,0 +1,17 @@
+// 山海经数据可视化大屏地址
+export function getDataUrl() {
+  return [
+    {
+      name: '碳足迹监测',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
+    },
+    {
+      name: '碳足迹评价',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
+    },
+    {
+      name: '碳足迹预警',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
+    },
+  ]
+}
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 99ae787..0450150 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -42,11 +42,20 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  b: [{ required: true, message: '请输入支路电纳标幺值', trigger: ['blur', 'change'] }],
+  branchNumber: [{ required: true, message: '请输入支路编号', trigger: ['blur', 'change'] }],
+  fbusId: [{ required: true, message: '请选择支路首端节点', trigger: ['blur', 'change'] }],
+  tbusId: [{ required: true, message: '请选择支路末端节点', trigger: ['blur', 'change'] }],
+  r: [{ required: true, message: '请输入支路电阻标幺值', trigger: ['blur', 'change'] }],
+  ratea: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  rateb: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  ratec: [{ required: true, message: '请输入紧急距离输电容量', trigger: ['blur', 'change'] }],
+  x: [{ required: true, message: '请输入支路电抗标幺值', trigger: ['blur', 'change'] }],
+  angle: [{ required: true, message: '请输入支路相位角', trigger: ['blur', 'change'] }],
+  angmax: [{ required: true, message: '请输入支路最大相位角', trigger: ['blur', 'change'] }],
+  angmin: [{ required: true, message: '请输入支路最小相位角', trigger: ['blur', 'change'] }],
+  ratio: [{ required: true, message: '请输入支路变比', trigger: ['blur', 'change'] }],
+  status2: [{ required: true, message: '请选择支路状态', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取节点列表
 const nodeList = ref<any[]>([])
@@ -85,7 +94,6 @@
 }
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any, id: string) => {
-  console.log(row)
   fetchNodeList(id)
   dialogStatus.value = dialogStatusValue
   dialogFormVisible.value = true
@@ -177,7 +185,7 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路编号:" prop="branchNumber">
-            <el-input v-model="areaForm.branchNumber" :placeholder="dialogStatus === 'create' ? '请输入支路编号' : ''" />
+            <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -185,7 +193,7 @@
         <el-col :span="20">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
-              v-model="areaForm.fbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路首端节点' : ''"
+              v-model="areaForm.fbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -198,7 +206,7 @@
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
-              v-model="areaForm.tbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路末端节点' : ''"
+              v-model="areaForm.tbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -209,49 +217,49 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电阻标幺值:" prop="r">
-            <el-input v-model="areaForm.r" :placeholder="dialogStatus === 'create' ? '请输入支路电阻标幺值' : ''" />
+            <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电纳标幺值:" prop="b">
-            <el-input v-model="areaForm.b" :placeholder="dialogStatus === 'create' ? '请输入支路电纳标幺值' : ''" />
+            <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="长距离输电容量:" prop="ratea">
-            <el-input v-model="areaForm.ratea" :placeholder="dialogStatus === 'create' ? '请输入长距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="短距离输电容量:" prop="rateb">
-            <el-input v-model="areaForm.rateb" :placeholder="dialogStatus === 'create' ? '请输入短距离输电容量' : ''" />
+            <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
-            <el-input v-model="areaForm.ratec" :placeholder="dialogStatus === 'create' ? '请输入紧急距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路变比:" prop="ratio">
-            <el-input v-model="areaForm.ratio" :placeholder="dialogStatus === 'create' ? '请输入支路变比' : ''" />
+            <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="角度:" prop="angle">
-            <el-input v-model="areaForm.angle" :placeholder="dialogStatus === 'create' ? '请输入角度' : ''" />
+          <el-form-item label="支路相位角:" prop="angle">
+            <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -259,14 +267,14 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最小相位角:" prop="angmin">
-            <el-input v-model="areaForm.angmin" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最大相位角:" prop="angmax">
-            <el-input v-model="areaForm.angmax" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -274,7 +282,7 @@
         <el-col :span="20">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
-              v-model="areaForm.status2" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路状态' : ''"
+              v-model="areaForm.status2" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index e453c24..39b0f25 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -74,19 +74,19 @@
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
   busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
-  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
-  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
-  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
-  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
-  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
-  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
-  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
-  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
-  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
-  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
-  lng: [{ required: true, message: '节点经度', trigger: ['blur', 'change'] }],
-  lat: [{ required: true, message: '节点纬度', trigger: ['blur', 'change'] }],
-  nodeName: [{ required: true, message: '节点名称', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '请输入节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '请输入节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '请输入母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '请输入节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '请输入节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '请输入母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '请输入节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '请输入节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '请输入负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '请输入负荷无功功率', trigger: ['blur', 'change'] }],
+  lng: [{ required: true, message: '请输入节点经度', trigger: ['blur', 'change'] }],
+  lat: [{ required: true, message: '请输入节点纬度', trigger: ['blur', 'change'] }],
+  nodeName: [{ required: true, message: '请输入节点名称', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 重置表单
 const resetForm = () => {
@@ -212,7 +212,7 @@
       <el-col :span="20">
         <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''"
+            v-model="areaForm.type" class="m-2"
             style="width: 100%;"
           >
             <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -222,96 +222,96 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点编号:" prop="busId">
-            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" :placeholder="dialogStatus === 'create' ? '请输入节点名称' : ''" />
+            <el-input v-model="areaForm.nodeName" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lng" />
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lat" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
-            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+            <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电纳:" prop="bs">
-            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+            <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线断面号:" prop="area">
-            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+            <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始幅值:" prop="vm">
-            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+            <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始相位角:" prop="va">
-            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+            <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线省损耗区域:" prop="zone">
-            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+            <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最大电压:" prop="vmax">
-            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+            <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最小电压:" prop="vmin">
-            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+            <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷有功功率:" prop="pd">
-            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+            <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷无功功率:" prop="qd">
-            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+            <el-input v-model="areaForm.qd" />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
new file mode 100644
index 0000000..dc993d4
--- /dev/null
+++ b/src/utils/fullScreenUrl.ts
@@ -0,0 +1,17 @@
+// 山海经数据可视化大屏地址
+export function getDataUrl() {
+  return [
+    {
+      name: '碳足迹监测',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
+    },
+    {
+      name: '碳足迹评价',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
+    },
+    {
+      name: '碳足迹预警',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
+    },
+  ]
+}
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 99ae787..0450150 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -42,11 +42,20 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  b: [{ required: true, message: '请输入支路电纳标幺值', trigger: ['blur', 'change'] }],
+  branchNumber: [{ required: true, message: '请输入支路编号', trigger: ['blur', 'change'] }],
+  fbusId: [{ required: true, message: '请选择支路首端节点', trigger: ['blur', 'change'] }],
+  tbusId: [{ required: true, message: '请选择支路末端节点', trigger: ['blur', 'change'] }],
+  r: [{ required: true, message: '请输入支路电阻标幺值', trigger: ['blur', 'change'] }],
+  ratea: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  rateb: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  ratec: [{ required: true, message: '请输入紧急距离输电容量', trigger: ['blur', 'change'] }],
+  x: [{ required: true, message: '请输入支路电抗标幺值', trigger: ['blur', 'change'] }],
+  angle: [{ required: true, message: '请输入支路相位角', trigger: ['blur', 'change'] }],
+  angmax: [{ required: true, message: '请输入支路最大相位角', trigger: ['blur', 'change'] }],
+  angmin: [{ required: true, message: '请输入支路最小相位角', trigger: ['blur', 'change'] }],
+  ratio: [{ required: true, message: '请输入支路变比', trigger: ['blur', 'change'] }],
+  status2: [{ required: true, message: '请选择支路状态', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取节点列表
 const nodeList = ref<any[]>([])
@@ -85,7 +94,6 @@
 }
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any, id: string) => {
-  console.log(row)
   fetchNodeList(id)
   dialogStatus.value = dialogStatusValue
   dialogFormVisible.value = true
@@ -177,7 +185,7 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路编号:" prop="branchNumber">
-            <el-input v-model="areaForm.branchNumber" :placeholder="dialogStatus === 'create' ? '请输入支路编号' : ''" />
+            <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -185,7 +193,7 @@
         <el-col :span="20">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
-              v-model="areaForm.fbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路首端节点' : ''"
+              v-model="areaForm.fbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -198,7 +206,7 @@
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
-              v-model="areaForm.tbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路末端节点' : ''"
+              v-model="areaForm.tbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -209,49 +217,49 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电阻标幺值:" prop="r">
-            <el-input v-model="areaForm.r" :placeholder="dialogStatus === 'create' ? '请输入支路电阻标幺值' : ''" />
+            <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电纳标幺值:" prop="b">
-            <el-input v-model="areaForm.b" :placeholder="dialogStatus === 'create' ? '请输入支路电纳标幺值' : ''" />
+            <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="长距离输电容量:" prop="ratea">
-            <el-input v-model="areaForm.ratea" :placeholder="dialogStatus === 'create' ? '请输入长距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="短距离输电容量:" prop="rateb">
-            <el-input v-model="areaForm.rateb" :placeholder="dialogStatus === 'create' ? '请输入短距离输电容量' : ''" />
+            <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
-            <el-input v-model="areaForm.ratec" :placeholder="dialogStatus === 'create' ? '请输入紧急距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路变比:" prop="ratio">
-            <el-input v-model="areaForm.ratio" :placeholder="dialogStatus === 'create' ? '请输入支路变比' : ''" />
+            <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="角度:" prop="angle">
-            <el-input v-model="areaForm.angle" :placeholder="dialogStatus === 'create' ? '请输入角度' : ''" />
+          <el-form-item label="支路相位角:" prop="angle">
+            <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -259,14 +267,14 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最小相位角:" prop="angmin">
-            <el-input v-model="areaForm.angmin" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最大相位角:" prop="angmax">
-            <el-input v-model="areaForm.angmax" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -274,7 +282,7 @@
         <el-col :span="20">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
-              v-model="areaForm.status2" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路状态' : ''"
+              v-model="areaForm.status2" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index e453c24..39b0f25 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -74,19 +74,19 @@
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
   busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
-  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
-  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
-  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
-  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
-  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
-  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
-  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
-  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
-  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
-  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
-  lng: [{ required: true, message: '节点经度', trigger: ['blur', 'change'] }],
-  lat: [{ required: true, message: '节点纬度', trigger: ['blur', 'change'] }],
-  nodeName: [{ required: true, message: '节点名称', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '请输入节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '请输入节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '请输入母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '请输入节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '请输入节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '请输入母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '请输入节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '请输入节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '请输入负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '请输入负荷无功功率', trigger: ['blur', 'change'] }],
+  lng: [{ required: true, message: '请输入节点经度', trigger: ['blur', 'change'] }],
+  lat: [{ required: true, message: '请输入节点纬度', trigger: ['blur', 'change'] }],
+  nodeName: [{ required: true, message: '请输入节点名称', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 重置表单
 const resetForm = () => {
@@ -212,7 +212,7 @@
       <el-col :span="20">
         <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''"
+            v-model="areaForm.type" class="m-2"
             style="width: 100%;"
           >
             <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -222,96 +222,96 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点编号:" prop="busId">
-            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" :placeholder="dialogStatus === 'create' ? '请输入节点名称' : ''" />
+            <el-input v-model="areaForm.nodeName" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lng" />
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lat" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
-            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+            <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电纳:" prop="bs">
-            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+            <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线断面号:" prop="area">
-            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+            <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始幅值:" prop="vm">
-            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+            <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始相位角:" prop="va">
-            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+            <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线省损耗区域:" prop="zone">
-            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+            <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最大电压:" prop="vmax">
-            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+            <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最小电压:" prop="vmin">
-            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+            <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷有功功率:" prop="pd">
-            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+            <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷无功功率:" prop="qd">
-            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+            <el-input v-model="areaForm.qd" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index f35cade..1d6e914 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -99,7 +99,6 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -163,42 +162,42 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="配电网名称:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.electricityName" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="基准功率:" prop="basePower">
-            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.basePower" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统节点数:" prop="codeNum">
-            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.codeNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机数:" prop="genNum">
-            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.genNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统负荷数:" prop="loadNum">
-            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.loadNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点之间支路数:" prop="branchNum">
-            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.branchNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
new file mode 100644
index 0000000..dc993d4
--- /dev/null
+++ b/src/utils/fullScreenUrl.ts
@@ -0,0 +1,17 @@
+// 山海经数据可视化大屏地址
+export function getDataUrl() {
+  return [
+    {
+      name: '碳足迹监测',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
+    },
+    {
+      name: '碳足迹评价',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
+    },
+    {
+      name: '碳足迹预警',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
+    },
+  ]
+}
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 99ae787..0450150 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -42,11 +42,20 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  b: [{ required: true, message: '请输入支路电纳标幺值', trigger: ['blur', 'change'] }],
+  branchNumber: [{ required: true, message: '请输入支路编号', trigger: ['blur', 'change'] }],
+  fbusId: [{ required: true, message: '请选择支路首端节点', trigger: ['blur', 'change'] }],
+  tbusId: [{ required: true, message: '请选择支路末端节点', trigger: ['blur', 'change'] }],
+  r: [{ required: true, message: '请输入支路电阻标幺值', trigger: ['blur', 'change'] }],
+  ratea: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  rateb: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  ratec: [{ required: true, message: '请输入紧急距离输电容量', trigger: ['blur', 'change'] }],
+  x: [{ required: true, message: '请输入支路电抗标幺值', trigger: ['blur', 'change'] }],
+  angle: [{ required: true, message: '请输入支路相位角', trigger: ['blur', 'change'] }],
+  angmax: [{ required: true, message: '请输入支路最大相位角', trigger: ['blur', 'change'] }],
+  angmin: [{ required: true, message: '请输入支路最小相位角', trigger: ['blur', 'change'] }],
+  ratio: [{ required: true, message: '请输入支路变比', trigger: ['blur', 'change'] }],
+  status2: [{ required: true, message: '请选择支路状态', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取节点列表
 const nodeList = ref<any[]>([])
@@ -85,7 +94,6 @@
 }
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any, id: string) => {
-  console.log(row)
   fetchNodeList(id)
   dialogStatus.value = dialogStatusValue
   dialogFormVisible.value = true
@@ -177,7 +185,7 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路编号:" prop="branchNumber">
-            <el-input v-model="areaForm.branchNumber" :placeholder="dialogStatus === 'create' ? '请输入支路编号' : ''" />
+            <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -185,7 +193,7 @@
         <el-col :span="20">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
-              v-model="areaForm.fbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路首端节点' : ''"
+              v-model="areaForm.fbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -198,7 +206,7 @@
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
-              v-model="areaForm.tbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路末端节点' : ''"
+              v-model="areaForm.tbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -209,49 +217,49 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电阻标幺值:" prop="r">
-            <el-input v-model="areaForm.r" :placeholder="dialogStatus === 'create' ? '请输入支路电阻标幺值' : ''" />
+            <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电纳标幺值:" prop="b">
-            <el-input v-model="areaForm.b" :placeholder="dialogStatus === 'create' ? '请输入支路电纳标幺值' : ''" />
+            <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="长距离输电容量:" prop="ratea">
-            <el-input v-model="areaForm.ratea" :placeholder="dialogStatus === 'create' ? '请输入长距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="短距离输电容量:" prop="rateb">
-            <el-input v-model="areaForm.rateb" :placeholder="dialogStatus === 'create' ? '请输入短距离输电容量' : ''" />
+            <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
-            <el-input v-model="areaForm.ratec" :placeholder="dialogStatus === 'create' ? '请输入紧急距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路变比:" prop="ratio">
-            <el-input v-model="areaForm.ratio" :placeholder="dialogStatus === 'create' ? '请输入支路变比' : ''" />
+            <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="角度:" prop="angle">
-            <el-input v-model="areaForm.angle" :placeholder="dialogStatus === 'create' ? '请输入角度' : ''" />
+          <el-form-item label="支路相位角:" prop="angle">
+            <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -259,14 +267,14 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最小相位角:" prop="angmin">
-            <el-input v-model="areaForm.angmin" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最大相位角:" prop="angmax">
-            <el-input v-model="areaForm.angmax" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -274,7 +282,7 @@
         <el-col :span="20">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
-              v-model="areaForm.status2" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路状态' : ''"
+              v-model="areaForm.status2" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index e453c24..39b0f25 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -74,19 +74,19 @@
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
   busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
-  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
-  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
-  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
-  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
-  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
-  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
-  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
-  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
-  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
-  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
-  lng: [{ required: true, message: '节点经度', trigger: ['blur', 'change'] }],
-  lat: [{ required: true, message: '节点纬度', trigger: ['blur', 'change'] }],
-  nodeName: [{ required: true, message: '节点名称', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '请输入节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '请输入节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '请输入母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '请输入节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '请输入节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '请输入母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '请输入节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '请输入节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '请输入负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '请输入负荷无功功率', trigger: ['blur', 'change'] }],
+  lng: [{ required: true, message: '请输入节点经度', trigger: ['blur', 'change'] }],
+  lat: [{ required: true, message: '请输入节点纬度', trigger: ['blur', 'change'] }],
+  nodeName: [{ required: true, message: '请输入节点名称', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 重置表单
 const resetForm = () => {
@@ -212,7 +212,7 @@
       <el-col :span="20">
         <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''"
+            v-model="areaForm.type" class="m-2"
             style="width: 100%;"
           >
             <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -222,96 +222,96 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点编号:" prop="busId">
-            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" :placeholder="dialogStatus === 'create' ? '请输入节点名称' : ''" />
+            <el-input v-model="areaForm.nodeName" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lng" />
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lat" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
-            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+            <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电纳:" prop="bs">
-            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+            <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线断面号:" prop="area">
-            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+            <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始幅值:" prop="vm">
-            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+            <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始相位角:" prop="va">
-            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+            <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线省损耗区域:" prop="zone">
-            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+            <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最大电压:" prop="vmax">
-            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+            <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最小电压:" prop="vmin">
-            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+            <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷有功功率:" prop="pd">
-            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+            <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷无功功率:" prop="qd">
-            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+            <el-input v-model="areaForm.qd" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index f35cade..1d6e914 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -99,7 +99,6 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -163,42 +162,42 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="配电网名称:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.electricityName" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="基准功率:" prop="basePower">
-            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.basePower" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统节点数:" prop="codeNum">
-            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.codeNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机数:" prop="genNum">
-            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.genNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统负荷数:" prop="loadNum">
-            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.loadNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点之间支路数:" prop="branchNum">
-            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.branchNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 65d85fe..f2a6f6b 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -14,9 +14,7 @@
 const searchQuery = reactive({
   offset: 1,
   limit: 20,
-  deviceNo: '',
-  startTime: '',
-  endTime: '',
+  stationName: '',
   type: props.stationType,
 })
 // 查询时间段范围
@@ -30,6 +28,7 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
+  { text: '机组名称', value: 'stationName', align: 'center' },
   { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
   { text: '发电机有功/MW', value: 'pg', align: 'center' },
   { text: '发电机无功', value: 'qg', align: 'center' },
@@ -94,12 +93,9 @@
 }
 // 重置
 const reset = () => {
-  TimeRanges.value = []
-  searchQuery.deviceNo = ''
+  searchQuery.stationName = ''
   searchQuery.offset = 1
   searchQuery.limit = 20
-  searchQuery.startTime = ''
-  searchQuery.endTime = ''
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -134,18 +130,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.deviceNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="TimeRanges"
-          type="datetimerange"
-          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          range-separator="至"
-          start-placeholder="上传开始时间"
-          end-placeholder="上传结束时间"
-          clearable
-        />
+        <el-input v-model="searchQuery.stationName" placeholder="机组名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
     </search-area>
     <table-container>

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
new file mode 100644
index 0000000..dc993d4
--- /dev/null
+++ b/src/utils/fullScreenUrl.ts
@@ -0,0 +1,17 @@
+// 山海经数据可视化大屏地址
+export function getDataUrl() {
+  return [
+    {
+      name: '碳足迹监测',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
+    },
+    {
+      name: '碳足迹评价',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
+    },
+    {
+      name: '碳足迹预警',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
+    },
+  ]
+}
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 99ae787..0450150 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -42,11 +42,20 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  b: [{ required: true, message: '请输入支路电纳标幺值', trigger: ['blur', 'change'] }],
+  branchNumber: [{ required: true, message: '请输入支路编号', trigger: ['blur', 'change'] }],
+  fbusId: [{ required: true, message: '请选择支路首端节点', trigger: ['blur', 'change'] }],
+  tbusId: [{ required: true, message: '请选择支路末端节点', trigger: ['blur', 'change'] }],
+  r: [{ required: true, message: '请输入支路电阻标幺值', trigger: ['blur', 'change'] }],
+  ratea: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  rateb: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  ratec: [{ required: true, message: '请输入紧急距离输电容量', trigger: ['blur', 'change'] }],
+  x: [{ required: true, message: '请输入支路电抗标幺值', trigger: ['blur', 'change'] }],
+  angle: [{ required: true, message: '请输入支路相位角', trigger: ['blur', 'change'] }],
+  angmax: [{ required: true, message: '请输入支路最大相位角', trigger: ['blur', 'change'] }],
+  angmin: [{ required: true, message: '请输入支路最小相位角', trigger: ['blur', 'change'] }],
+  ratio: [{ required: true, message: '请输入支路变比', trigger: ['blur', 'change'] }],
+  status2: [{ required: true, message: '请选择支路状态', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取节点列表
 const nodeList = ref<any[]>([])
@@ -85,7 +94,6 @@
 }
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any, id: string) => {
-  console.log(row)
   fetchNodeList(id)
   dialogStatus.value = dialogStatusValue
   dialogFormVisible.value = true
@@ -177,7 +185,7 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路编号:" prop="branchNumber">
-            <el-input v-model="areaForm.branchNumber" :placeholder="dialogStatus === 'create' ? '请输入支路编号' : ''" />
+            <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -185,7 +193,7 @@
         <el-col :span="20">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
-              v-model="areaForm.fbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路首端节点' : ''"
+              v-model="areaForm.fbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -198,7 +206,7 @@
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
-              v-model="areaForm.tbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路末端节点' : ''"
+              v-model="areaForm.tbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -209,49 +217,49 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电阻标幺值:" prop="r">
-            <el-input v-model="areaForm.r" :placeholder="dialogStatus === 'create' ? '请输入支路电阻标幺值' : ''" />
+            <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电纳标幺值:" prop="b">
-            <el-input v-model="areaForm.b" :placeholder="dialogStatus === 'create' ? '请输入支路电纳标幺值' : ''" />
+            <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="长距离输电容量:" prop="ratea">
-            <el-input v-model="areaForm.ratea" :placeholder="dialogStatus === 'create' ? '请输入长距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="短距离输电容量:" prop="rateb">
-            <el-input v-model="areaForm.rateb" :placeholder="dialogStatus === 'create' ? '请输入短距离输电容量' : ''" />
+            <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
-            <el-input v-model="areaForm.ratec" :placeholder="dialogStatus === 'create' ? '请输入紧急距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路变比:" prop="ratio">
-            <el-input v-model="areaForm.ratio" :placeholder="dialogStatus === 'create' ? '请输入支路变比' : ''" />
+            <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="角度:" prop="angle">
-            <el-input v-model="areaForm.angle" :placeholder="dialogStatus === 'create' ? '请输入角度' : ''" />
+          <el-form-item label="支路相位角:" prop="angle">
+            <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -259,14 +267,14 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最小相位角:" prop="angmin">
-            <el-input v-model="areaForm.angmin" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最大相位角:" prop="angmax">
-            <el-input v-model="areaForm.angmax" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -274,7 +282,7 @@
         <el-col :span="20">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
-              v-model="areaForm.status2" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路状态' : ''"
+              v-model="areaForm.status2" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index e453c24..39b0f25 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -74,19 +74,19 @@
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
   busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
-  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
-  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
-  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
-  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
-  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
-  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
-  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
-  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
-  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
-  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
-  lng: [{ required: true, message: '节点经度', trigger: ['blur', 'change'] }],
-  lat: [{ required: true, message: '节点纬度', trigger: ['blur', 'change'] }],
-  nodeName: [{ required: true, message: '节点名称', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '请输入节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '请输入节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '请输入母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '请输入节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '请输入节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '请输入母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '请输入节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '请输入节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '请输入负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '请输入负荷无功功率', trigger: ['blur', 'change'] }],
+  lng: [{ required: true, message: '请输入节点经度', trigger: ['blur', 'change'] }],
+  lat: [{ required: true, message: '请输入节点纬度', trigger: ['blur', 'change'] }],
+  nodeName: [{ required: true, message: '请输入节点名称', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 重置表单
 const resetForm = () => {
@@ -212,7 +212,7 @@
       <el-col :span="20">
         <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''"
+            v-model="areaForm.type" class="m-2"
             style="width: 100%;"
           >
             <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -222,96 +222,96 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点编号:" prop="busId">
-            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" :placeholder="dialogStatus === 'create' ? '请输入节点名称' : ''" />
+            <el-input v-model="areaForm.nodeName" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lng" />
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lat" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
-            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+            <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电纳:" prop="bs">
-            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+            <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线断面号:" prop="area">
-            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+            <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始幅值:" prop="vm">
-            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+            <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始相位角:" prop="va">
-            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+            <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线省损耗区域:" prop="zone">
-            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+            <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最大电压:" prop="vmax">
-            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+            <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最小电压:" prop="vmin">
-            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+            <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷有功功率:" prop="pd">
-            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+            <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷无功功率:" prop="qd">
-            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+            <el-input v-model="areaForm.qd" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index f35cade..1d6e914 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -99,7 +99,6 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -163,42 +162,42 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="配电网名称:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.electricityName" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="基准功率:" prop="basePower">
-            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.basePower" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统节点数:" prop="codeNum">
-            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.codeNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机数:" prop="genNum">
-            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.genNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统负荷数:" prop="loadNum">
-            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.loadNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点之间支路数:" prop="branchNum">
-            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.branchNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 65d85fe..f2a6f6b 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -14,9 +14,7 @@
 const searchQuery = reactive({
   offset: 1,
   limit: 20,
-  deviceNo: '',
-  startTime: '',
-  endTime: '',
+  stationName: '',
   type: props.stationType,
 })
 // 查询时间段范围
@@ -30,6 +28,7 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
+  { text: '机组名称', value: 'stationName', align: 'center' },
   { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
   { text: '发电机有功/MW', value: 'pg', align: 'center' },
   { text: '发电机无功', value: 'qg', align: 'center' },
@@ -94,12 +93,9 @@
 }
 // 重置
 const reset = () => {
-  TimeRanges.value = []
-  searchQuery.deviceNo = ''
+  searchQuery.stationName = ''
   searchQuery.offset = 1
   searchQuery.limit = 20
-  searchQuery.startTime = ''
-  searchQuery.endTime = ''
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -134,18 +130,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.deviceNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="TimeRanges"
-          type="datetimerange"
-          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          range-separator="至"
-          start-placeholder="上传开始时间"
-          end-placeholder="上传结束时间"
-          clearable
-        />
+        <el-input v-model="searchQuery.stationName" placeholder="机组名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index f4c41a3..f3616c1 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -65,7 +65,7 @@
     deviceId: '',
   }
 }
-const statusTypeList = ref([])
+const statusTypeList = ref<any[]>([])
 // 获取运行状态
 const fetchStatusType = () => {
   getDictByCode('station_status').then((res) => {
@@ -176,16 +176,15 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="名称:" prop="stationName">
-            <el-input v-model="areaForm.stationName" :placeholder="dialogStatus === 'create' ? '请输入名称' : ''" />
+            <el-input v-model="areaForm.stationName" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备列表:" prop="deviceId">
-            <!-- <el-input v-model="areaForm.status" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" /> -->
             <el-select
-              v-model="areaForm.deviceId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备' : ''"
+              v-model="areaForm.deviceId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in deviceList" :key="item.id" :label="item.deviceName" :value="item.id" />
@@ -196,58 +195,57 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机组对应节点数:" prop="nodeId">
-            <el-input v-model="areaForm.nodeId" :placeholder="dialogStatus === 'create' ? '请输入发电机组对应节点数' : ''" />
+            <el-input v-model="areaForm.nodeId" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机有功/MW:" prop="pg">
-            <el-input v-model="areaForm.pg" :placeholder="dialogStatus === 'create' ? '请输入发电机有功/MW' : ''" />
+            <el-input v-model="areaForm.pg" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机无功:" prop="qg">
-            <el-input v-model="areaForm.qg" :placeholder="dialogStatus === 'create' ? '请输入发电机无功' : ''" />
+            <el-input v-model="areaForm.qg" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="最大无功:" prop="qmax">
-            <el-input v-model="areaForm.qmax" :placeholder="dialogStatus === 'create' ? '请输入最大无功' : ''" />
+            <el-input v-model="areaForm.qmax" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="最小无功:" prop="qmin">
-            <el-input v-model="areaForm.qmin" :placeholder="dialogStatus === 'create' ? '请输入最小无功' : ''" />
+            <el-input v-model="areaForm.qmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压:" prop="vg">
-            <el-input v-model="areaForm.vg" :placeholder="dialogStatus === 'create' ? '请输入节点电压' : ''" />
+            <el-input v-model="areaForm.vg" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机容量:" prop="mbase">
-            <el-input v-model="areaForm.mbase" :placeholder="dialogStatus === 'create' ? '请输入发电机容量' : ''" />
+            <el-input v-model="areaForm.mbase" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="运行状态:" prop="status">
-            <!-- <el-input v-model="areaForm.status" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" /> -->
             <el-select
-              v-model="areaForm.status" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择运行状态' : ''"
+              v-model="areaForm.status" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusTypeList" :key="item.id" :label="item.name" :value="item.value" />

diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
deleted file mode 100644
index a4cc107..0000000
--- a/src/plugins/preload.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-function All() {}
-All.prototype = {
-  // 将负责人的姓名挑出来做成字符串
-  arrToStr(arr: any) {
-    if (arr) {
-      return arr.map((item: any) => { return item.name }).toString()
-    }
-  },
-  toggleClass(arr: any, elem: any, key = 'id') {
-    return arr.some((item: any) => { return item[key] == elem[key] })
-  },
-  toChecked(arr: any, elem: any, key = 'id') {
-    console.log('toChecked')
-    var isIncludes = this.toggleClass(arr, elem, key)
-    !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
-  },
-  removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
-    arr.map((item: any, index: any) => {
-      if (item[key] == elem[key]) {
-        includesIndex = index
-      }
-    })
-    arr.splice(includesIndex, 1)
-  },
-  // 设置审批节点的文字
-  setApproverStr(nodeConfig: any) {
-    if (nodeConfig.settype == 1 || nodeConfig.settype == 11) {
-      if (nodeConfig.nodeUserList.length == 1) {
-        return nodeConfig.nodeUserList[0].name
-      }
-      else if (nodeConfig.nodeUserList.length > 1) {
-        if (nodeConfig.examineMode == 1) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（依次审批）`
-        }
-        else if (nodeConfig.examineMode == 2) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（会签）`
-        }
-        else if (nodeConfig.examineMode == 3) {
-          return `由${this.arrToStr(nodeConfig.nodeUserList)}负责（或签）`
-        }
-      }
-    }
-    else if (nodeConfig.settype == 2) {
-      const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
-      if (nodeConfig.examineMode == 1) {
-        return level
-      }
-      else if (nodeConfig.examineMode == 2) {
-        return `${level}会签`
-      }
-    }
-    else if (nodeConfig.settype == 7) {
-      return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
-    }
-  },
-  dealStr(str: any, obj: any) {
-    const arr = [] as any
-    const list = str.split(',')
-    for (var elem in obj) {
-      list.map((item: any) => {
-        if (item == elem) {
-          arr.push(obj[elem].value)
-        }
-      })
-    }
-    return arr.join('或')
-  },
-  // 设置条件节点的文字
-  conditionStr(nodeConfig: any, index: any) {
-    var { conditionList, nodeUserList } = nodeConfig.conditionNodes[index]
-    if (conditionList.length == 0) {
-      return (index == nodeConfig.conditionNodes.length - 1) && nodeConfig.conditionNodes[0].conditionList.length != 0 ? '其他条件进入此流程' : '请设置条件'
-    }
-    else {
-      let str = ''
-      for (var i = 0; i < conditionList.length; i++) {
-        var { columnId } = conditionList[i]
-        if (columnId == 0) {
-          if (nodeUserList.length != 0) {
-            str += '发起人属于：'
-            str += `${nodeUserList.map((item: any) => { return item.name }).join('、')} `
-          }
-        }
-      }
-      // return str ? str.substring(0, str.length - 4) : '请设置条件'
-      return str || '请设置条件'
-    }
-  },
-  // 设置抄送人节点文字
-  copyerStr(nodeConfig: any) {
-    if (nodeConfig.nodeUserList && nodeConfig.nodeUserList.length != 0) {
-      console.log(this.arrToStr(nodeConfig.nodeUserList))
-      return this.arrToStr(nodeConfig.nodeUserList)
-    }
-  },
-  toggleStrClass(item: any, key: any) {
-    const a = item.zdy1 ? item.zdy1.split(',') : []
-    return a.some((item: any) => { return item == key })
-  },
-}
-
-export default new (All as any)()
diff --git a/src/router/modules/carbonCount.ts b/src/router/modules/carbonCount.ts
index 8b64153..37807a0 100644
--- a/src/router/modules/carbonCount.ts
+++ b/src/router/modules/carbonCount.ts
@@ -32,25 +32,25 @@
         component: () => import('@/views/count/electric.vue'),
         meta: {
           title: '电力碳核算',
-          auth: '/count/electric',
-          // sidebar: false,
-          // breadcrumb: true,
-          activeMenu: '/carbonCount',
-        },
-      },
-      {
-        path: 'electricresult',
-        name: 'electricresult',
-        component: () => import('@/views/count/components/result.vue'),
-        meta: {
-          title: '电力碳核算',
-          auth: '/count/electric',
+          auth: '/count',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/carbonCount',
         },
       },
       // {
+      //   path: 'electricresult',
+      //   name: 'electricresult',
+      //   component: () => import('@/views/count/components/result.vue'),
+      //   meta: {
+      //     title: '电力碳核算',
+      //     auth: '/count/electric',
+      //     sidebar: false,
+      //     breadcrumb: true,
+      //     activeMenu: '/carbonCount',
+      //   },
+      // },
+      // {
       //   path: 'heatingcount',
       //   name: 'Heatingcount',
       //   component: () => import('@/views/count/heating.vue'),
diff --git a/src/router/modules/data.ts b/src/router/modules/data.ts
index cf486d4..2c5a8fb 100644
--- a/src/router/modules/data.ts
+++ b/src/router/modules/data.ts
@@ -59,7 +59,7 @@
               auth: '/data/electricity',
               sidebar: false,
               breadcrumb: true,
-              activeMenu: '/dataCollect',
+              activeMenu: '/dataElectricity',
             },
           },
         ],
diff --git a/src/utils/common b/src/utils/common
deleted file mode 100644
index e69de29..0000000
--- a/src/utils/common
+++ /dev/null
diff --git a/src/utils/fullScreenUrl.ts b/src/utils/fullScreenUrl.ts
new file mode 100644
index 0000000..dc993d4
--- /dev/null
+++ b/src/utils/fullScreenUrl.ts
@@ -0,0 +1,17 @@
+// 山海经数据可视化大屏地址
+export function getDataUrl() {
+  return [
+    {
+      name: '碳足迹监测',
+      url: 'https://share.shanhaibi.com/645b6b3674e29/',
+    },
+    {
+      name: '碳足迹评价',
+      url: 'https://share.shanhaibi.com/645b6ba377610/',
+    },
+    {
+      name: '碳足迹预警',
+      url: 'https://share.shanhaibi.com/645b6c6749576/',
+    },
+  ]
+}
diff --git a/src/views/data/electricity/components/branchAdd.vue b/src/views/data/electricity/components/branchAdd.vue
index 99ae787..0450150 100644
--- a/src/views/data/electricity/components/branchAdd.vue
+++ b/src/views/data/electricity/components/branchAdd.vue
@@ -42,11 +42,20 @@
 } // 表头显示标题
 const btnLoading = ref(false) // 保存按钮的加载中状态
 const rules: FormRules = {
-  electricityName: [{ required: true, message: '请输入配电网名称', trigger: ['blur', 'change'] }],
-  electricityArea: [{ required: true, message: '请输入配电网区域', trigger: ['blur', 'change'] }],
-  uploader: [{ required: true, message: '请选择上传人', trigger: ['blur', 'change'] }],
-  uploadTime: [{ required: true, message: '请选择上传时间', trigger: ['blur', 'change'] }],
-  electricityDetail: [{ required: true, message: '请上传附件', trigger: ['blur', 'change'] }],
+  b: [{ required: true, message: '请输入支路电纳标幺值', trigger: ['blur', 'change'] }],
+  branchNumber: [{ required: true, message: '请输入支路编号', trigger: ['blur', 'change'] }],
+  fbusId: [{ required: true, message: '请选择支路首端节点', trigger: ['blur', 'change'] }],
+  tbusId: [{ required: true, message: '请选择支路末端节点', trigger: ['blur', 'change'] }],
+  r: [{ required: true, message: '请输入支路电阻标幺值', trigger: ['blur', 'change'] }],
+  ratea: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  rateb: [{ required: true, message: '请输入长距离输电容量', trigger: ['blur', 'change'] }],
+  ratec: [{ required: true, message: '请输入紧急距离输电容量', trigger: ['blur', 'change'] }],
+  x: [{ required: true, message: '请输入支路电抗标幺值', trigger: ['blur', 'change'] }],
+  angle: [{ required: true, message: '请输入支路相位角', trigger: ['blur', 'change'] }],
+  angmax: [{ required: true, message: '请输入支路最大相位角', trigger: ['blur', 'change'] }],
+  angmin: [{ required: true, message: '请输入支路最小相位角', trigger: ['blur', 'change'] }],
+  ratio: [{ required: true, message: '请输入支路变比', trigger: ['blur', 'change'] }],
+  status2: [{ required: true, message: '请选择支路状态', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 获取节点列表
 const nodeList = ref<any[]>([])
@@ -85,7 +94,6 @@
 }
 // 初始化对话框
 const initDialog = (dialogStatusValue: string, row: any, id: string) => {
-  console.log(row)
   fetchNodeList(id)
   dialogStatus.value = dialogStatusValue
   dialogFormVisible.value = true
@@ -177,7 +185,7 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路编号:" prop="branchNumber">
-            <el-input v-model="areaForm.branchNumber" :placeholder="dialogStatus === 'create' ? '请输入支路编号' : ''" />
+            <el-input v-model="areaForm.branchNumber" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -185,7 +193,7 @@
         <el-col :span="20">
           <el-form-item label="支路首端节点:" prop="fbusId">
             <el-select
-              v-model="areaForm.fbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路首端节点' : ''"
+              v-model="areaForm.fbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -198,7 +206,7 @@
           <el-form-item label="支路末端节点:" prop="tbusId">
             <!-- <el-input v-model="areaForm.tbusId" :placeholder="dialogStatus === 'create' ? '请输入支路末端节点' : ''" /> -->
             <el-select
-              v-model="areaForm.tbusId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路末端节点' : ''"
+              v-model="areaForm.tbusId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in nodeList" :key="item.busId" :label="item.nodeName" :value="item.busId" />
@@ -209,49 +217,49 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电阻标幺值:" prop="r">
-            <el-input v-model="areaForm.r" :placeholder="dialogStatus === 'create' ? '请输入支路电阻标幺值' : ''" />
+            <el-input v-model="areaForm.r" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路电纳标幺值:" prop="b">
-            <el-input v-model="areaForm.b" :placeholder="dialogStatus === 'create' ? '请输入支路电纳标幺值' : ''" />
+            <el-input v-model="areaForm.b" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="长距离输电容量:" prop="ratea">
-            <el-input v-model="areaForm.ratea" :placeholder="dialogStatus === 'create' ? '请输入长距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratea" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="短距离输电容量:" prop="rateb">
-            <el-input v-model="areaForm.rateb" :placeholder="dialogStatus === 'create' ? '请输入短距离输电容量' : ''" />
+            <el-input v-model="areaForm.rateb" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="紧急距离输电容量:" prop="ratec">
-            <el-input v-model="areaForm.ratec" :placeholder="dialogStatus === 'create' ? '请输入紧急距离输电容量' : ''" />
+            <el-input v-model="areaForm.ratec" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路变比:" prop="ratio">
-            <el-input v-model="areaForm.ratio" :placeholder="dialogStatus === 'create' ? '请输入支路变比' : ''" />
+            <el-input v-model="areaForm.ratio" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
-          <el-form-item label="角度:" prop="angle">
-            <el-input v-model="areaForm.angle" :placeholder="dialogStatus === 'create' ? '请输入角度' : ''" />
+          <el-form-item label="支路相位角:" prop="angle">
+            <el-input v-model="areaForm.angle" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -259,14 +267,14 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最小相位角:" prop="angmin">
-            <el-input v-model="areaForm.angmin" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="支路最大相位角:" prop="angmax">
-            <el-input v-model="areaForm.angmax" :placeholder="dialogStatus === 'create' ? '请输入支路最小相位角' : ''" />
+            <el-input v-model="areaForm.angmax" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -274,7 +282,7 @@
         <el-col :span="20">
           <el-form-item label="支路是否运行:" prop="status2">
             <el-select
-              v-model="areaForm.status2" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择支路状态' : ''"
+              v-model="areaForm.status2" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/data/electricity/components/busbarAdd.vue b/src/views/data/electricity/components/busbarAdd.vue
index e453c24..39b0f25 100644
--- a/src/views/data/electricity/components/busbarAdd.vue
+++ b/src/views/data/electricity/components/busbarAdd.vue
@@ -74,19 +74,19 @@
 const rules: FormRules = {
   type: [{ required: true, message: '请选择节点类型', trigger: ['blur', 'change'] }],
   busId: [{ required: true, message: '节点编号重复或为空', trigger: 'blur', validator: validateBusId }],
-  gs: [{ required: true, message: '节点并联电导', trigger: ['blur', 'change'] }],
-  bs: [{ required: true, message: '节点并联电纳', trigger: ['blur', 'change'] }],
-  area: [{ required: true, message: '母线断面号', trigger: ['blur', 'change'] }],
-  vm: [{ required: true, message: '节点电压初始幅值', trigger: ['blur', 'change'] }],
-  va: [{ required: true, message: '节点电压初始相位角', trigger: ['blur', 'change'] }],
-  zone: [{ required: true, message: '母线省损耗区域', trigger: ['blur', 'change'] }],
-  vmax: [{ required: true, message: '节点最大电压', trigger: ['blur', 'change'] }],
-  vmin: [{ required: true, message: '节点最小电压', trigger: ['blur', 'change'] }],
-  pd: [{ required: true, message: '负荷有功功率', trigger: ['blur', 'change'] }],
-  qd: [{ required: true, message: '负荷无功功率', trigger: ['blur', 'change'] }],
-  lng: [{ required: true, message: '节点经度', trigger: ['blur', 'change'] }],
-  lat: [{ required: true, message: '节点纬度', trigger: ['blur', 'change'] }],
-  nodeName: [{ required: true, message: '节点名称', trigger: ['blur', 'change'] }],
+  gs: [{ required: true, message: '请输入节点并联电导', trigger: ['blur', 'change'] }],
+  bs: [{ required: true, message: '请输入节点并联电纳', trigger: ['blur', 'change'] }],
+  area: [{ required: true, message: '请输入母线断面号', trigger: ['blur', 'change'] }],
+  vm: [{ required: true, message: '请输入节点电压初始幅值', trigger: ['blur', 'change'] }],
+  va: [{ required: true, message: '请输入节点电压初始相位角', trigger: ['blur', 'change'] }],
+  zone: [{ required: true, message: '请输入母线省损耗区域', trigger: ['blur', 'change'] }],
+  vmax: [{ required: true, message: '请输入节点最大电压', trigger: ['blur', 'change'] }],
+  vmin: [{ required: true, message: '请输入节点最小电压', trigger: ['blur', 'change'] }],
+  pd: [{ required: true, message: '请输入负荷有功功率', trigger: ['blur', 'change'] }],
+  qd: [{ required: true, message: '请输入负荷无功功率', trigger: ['blur', 'change'] }],
+  lng: [{ required: true, message: '请输入节点经度', trigger: ['blur', 'change'] }],
+  lat: [{ required: true, message: '请输入节点纬度', trigger: ['blur', 'change'] }],
+  nodeName: [{ required: true, message: '请输入节点名称', trigger: ['blur', 'change'] }],
 } // 前端校验规则
 // 重置表单
 const resetForm = () => {
@@ -212,7 +212,7 @@
       <el-col :span="20">
         <el-form-item label="节点类型:" prop="type">
           <el-select
-            v-model="areaForm.type" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择节点类型' : ''"
+            v-model="areaForm.type" class="m-2"
             style="width: 100%;"
           >
             <el-option v-for="item in nodeTypeList" :key="item.id" :label="item.name" :value="item.value" />
@@ -222,96 +222,96 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点编号:" prop="busId">
-            <el-input v-model="areaForm.busId" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.busId" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点名称:" prop="nodeName">
-            <el-input v-model="areaForm.nodeName" :placeholder="dialogStatus === 'create' ? '请输入节点名称' : ''" />
+            <el-input v-model="areaForm.nodeName" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="10">
           <el-form-item label="节点经度:" prop="lng">
-            <el-input v-model="areaForm.lng" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lng" />
           </el-form-item>
         </el-col>
         <el-col :span="10">
           <el-form-item label="节点纬度:" prop="lat">
-            <el-input v-model="areaForm.lat" :placeholder="dialogStatus === 'create' ? '请输入节点编号' : ''" />
+            <el-input v-model="areaForm.lat" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电导:" prop="gs">
-            <el-input v-model="areaForm.gs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电导' : ''" />
+            <el-input v-model="areaForm.gs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点并联电纳:" prop="bs">
-            <el-input v-model="areaForm.bs" :placeholder="dialogStatus === 'create' ? '请输入节点并联电纳' : ''" />
+            <el-input v-model="areaForm.bs" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线断面号:" prop="area">
-            <el-input v-model="areaForm.area" :placeholder="dialogStatus === 'create' ? '请输入母线断面号' : ''" />
+            <el-input v-model="areaForm.area" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始幅值:" prop="vm">
-            <el-input v-model="areaForm.vm" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始幅值' : ''" />
+            <el-input v-model="areaForm.vm" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压初始相位角:" prop="va">
-            <el-input v-model="areaForm.va" :placeholder="dialogStatus === 'create' ? '请输入节点电压初始相位角' : ''" />
+            <el-input v-model="areaForm.va" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="母线省损耗区域:" prop="zone">
-            <el-input v-model="areaForm.zone" :placeholder="dialogStatus === 'create' ? '请输入母线省损耗区域' : ''" />
+            <el-input v-model="areaForm.zone" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最大电压:" prop="vmax">
-            <el-input v-model="areaForm.vmax" :placeholder="dialogStatus === 'create' ? '请输入节点最大电压' : ''" />
+            <el-input v-model="areaForm.vmax" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点最小电压:" prop="vmin">
-            <el-input v-model="areaForm.vmin" :placeholder="dialogStatus === 'create' ? '请输入节点最小电压' : ''" />
+            <el-input v-model="areaForm.vmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷有功功率:" prop="pd">
-            <el-input v-model="areaForm.pd" :placeholder="dialogStatus === 'create' ? '请输入负荷有功功率' : ''" />
+            <el-input v-model="areaForm.pd" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="负荷无功功率:" prop="qd">
-            <el-input v-model="areaForm.qd" :placeholder="dialogStatus === 'create' ? '请输入负荷无功功率' : ''" />
+            <el-input v-model="areaForm.qd" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/data/electricity/networkAdd.vue b/src/views/data/electricity/networkAdd.vue
index f35cade..1d6e914 100644
--- a/src/views/data/electricity/networkAdd.vue
+++ b/src/views/data/electricity/networkAdd.vue
@@ -99,7 +99,6 @@
 const updateData = () => {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
-      // areaForm.value.uploadTime = dayjs().format('YYYY-MM-DD')
       btnLoading.value = true
       updateElectricityList(areaForm.value).then((response) => {
         if (response.code === 200) {
@@ -163,42 +162,42 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="配电网名称:" prop="electricityName">
-            <el-input v-model="areaForm.electricityName" :placeholder="dialogStatus === 'create' ? '配电网名称' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.electricityName" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="基准功率:" prop="basePower">
-            <el-input v-model="areaForm.basePower" :placeholder="dialogStatus === 'create' ? '基准功率' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.basePower" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统节点数:" prop="codeNum">
-            <el-input v-model="areaForm.codeNum" :placeholder="dialogStatus === 'create' ? '系统节点数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.codeNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机数:" prop="genNum">
-            <el-input v-model="areaForm.genNum" :placeholder="dialogStatus === 'create' ? '发电机数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.genNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="系统负荷数:" prop="loadNum">
-            <el-input v-model="areaForm.loadNum" :placeholder="dialogStatus === 'create' ? '系统负荷数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.loadNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点之间支路数:" prop="branchNum">
-            <el-input v-model="areaForm.branchNum" :placeholder="dialogStatus === 'create' ? '节点之间支路数' : ''" :disabled="dialogStatus === 'detail'" />
+            <el-input v-model="areaForm.branchNum" :disabled="dialogStatus === 'detail'" />
           </el-form-item>
         </el-col>
       </el-row>
diff --git a/src/views/data/electricity/page.vue b/src/views/data/electricity/page.vue
index 65d85fe..f2a6f6b 100644
--- a/src/views/data/electricity/page.vue
+++ b/src/views/data/electricity/page.vue
@@ -14,9 +14,7 @@
 const searchQuery = reactive({
   offset: 1,
   limit: 20,
-  deviceNo: '',
-  startTime: '',
-  endTime: '',
+  stationName: '',
   type: props.stationType,
 })
 // 查询时间段范围
@@ -30,6 +28,7 @@
 }, { deep: true })
 const loadingTable = ref(true)
 const columns = ref([
+  { text: '机组名称', value: 'stationName', align: 'center' },
   { text: '发电机组对应节点数', value: 'nodeId', align: 'center' },
   { text: '发电机有功/MW', value: 'pg', align: 'center' },
   { text: '发电机无功', value: 'qg', align: 'center' },
@@ -94,12 +93,9 @@
 }
 // 重置
 const reset = () => {
-  TimeRanges.value = []
-  searchQuery.deviceNo = ''
+  searchQuery.stationName = ''
   searchQuery.offset = 1
   searchQuery.limit = 20
-  searchQuery.startTime = ''
-  searchQuery.endTime = ''
   search()
 }
 // 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
@@ -134,18 +130,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="search" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.deviceNo" placeholder="设备编号" clearable class="w-50 m-2 normal-input" />
-      </search-item>
-      <search-item>
-        <el-date-picker
-          v-model="TimeRanges"
-          type="datetimerange"
-          format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss"
-          range-separator="至"
-          start-placeholder="上传开始时间"
-          end-placeholder="上传结束时间"
-          clearable
-        />
+        <el-input v-model="searchQuery.stationName" placeholder="机组名称" clearable class="w-50 m-2 normal-input" />
       </search-item>
     </search-area>
     <table-container>
diff --git a/src/views/data/electricity/pageAdd.vue b/src/views/data/electricity/pageAdd.vue
index f4c41a3..f3616c1 100644
--- a/src/views/data/electricity/pageAdd.vue
+++ b/src/views/data/electricity/pageAdd.vue
@@ -65,7 +65,7 @@
     deviceId: '',
   }
 }
-const statusTypeList = ref([])
+const statusTypeList = ref<any[]>([])
 // 获取运行状态
 const fetchStatusType = () => {
   getDictByCode('station_status').then((res) => {
@@ -176,16 +176,15 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="名称:" prop="stationName">
-            <el-input v-model="areaForm.stationName" :placeholder="dialogStatus === 'create' ? '请输入名称' : ''" />
+            <el-input v-model="areaForm.stationName" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="设备列表:" prop="deviceId">
-            <!-- <el-input v-model="areaForm.status" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" /> -->
             <el-select
-              v-model="areaForm.deviceId" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择设备' : ''"
+              v-model="areaForm.deviceId" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in deviceList" :key="item.id" :label="item.deviceName" :value="item.id" />
@@ -196,58 +195,57 @@
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机组对应节点数:" prop="nodeId">
-            <el-input v-model="areaForm.nodeId" :placeholder="dialogStatus === 'create' ? '请输入发电机组对应节点数' : ''" />
+            <el-input v-model="areaForm.nodeId" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机有功/MW:" prop="pg">
-            <el-input v-model="areaForm.pg" :placeholder="dialogStatus === 'create' ? '请输入发电机有功/MW' : ''" />
+            <el-input v-model="areaForm.pg" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机无功:" prop="qg">
-            <el-input v-model="areaForm.qg" :placeholder="dialogStatus === 'create' ? '请输入发电机无功' : ''" />
+            <el-input v-model="areaForm.qg" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="最大无功:" prop="qmax">
-            <el-input v-model="areaForm.qmax" :placeholder="dialogStatus === 'create' ? '请输入最大无功' : ''" />
+            <el-input v-model="areaForm.qmax" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="最小无功:" prop="qmin">
-            <el-input v-model="areaForm.qmin" :placeholder="dialogStatus === 'create' ? '请输入最小无功' : ''" />
+            <el-input v-model="areaForm.qmin" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="节点电压:" prop="vg">
-            <el-input v-model="areaForm.vg" :placeholder="dialogStatus === 'create' ? '请输入节点电压' : ''" />
+            <el-input v-model="areaForm.vg" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="发电机容量:" prop="mbase">
-            <el-input v-model="areaForm.mbase" :placeholder="dialogStatus === 'create' ? '请输入发电机容量' : ''" />
+            <el-input v-model="areaForm.mbase" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="20">
           <el-form-item label="运行状态:" prop="status">
-            <!-- <el-input v-model="areaForm.status" :placeholder="dialogStatus === 'create' ? '请输入运行状态' : ''" /> -->
             <el-select
-              v-model="areaForm.status" class="m-2" :placeholder="dialogStatus === 'create' ? '请选择运行状态' : ''"
+              v-model="areaForm.status" class="m-2"
               style="width: 100%;"
             >
               <el-option v-for="item in statusTypeList" :key="item.id" :label="item.name" :value="item.value" />
diff --git a/src/views/evaluate/page.vue b/src/views/evaluate/page.vue
index 56d7a46..d74045e 100644
--- a/src/views/evaluate/page.vue
+++ b/src/views/evaluate/page.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts" name="dashboard">
+import { getDataUrl } from '@/utils/fullScreenUrl'
 const props = defineProps({
   name: {
     type: String,
@@ -6,34 +7,15 @@
   },
 })
 const $router = useRouter()
-const newPage = ref(
-  [
-    {
-      name: '碳足迹监测',
-      url: 'https://share.shanhaibi.com/645b6b3674e29/',
-    },
-    {
-      name: '碳足迹评价',
-      url: 'https://share.shanhaibi.com/645b6ba377610/',
-    },
-    {
-      name: '碳足迹预警',
-      url: 'https://share.shanhaibi.com/645b6c6749576/',
-    },
-  ],
-)
+console.log(getDataUrl())
+const newPage = ref(getDataUrl())
 const current = () => {
-  console.log(newPage.value.filter(item => item.name === props.name)[0].name)
   return newPage.value.filter(item => item.name === props.name)[0]
 }
 current()
 onMounted(() => {
   window.open(current().url, '_blank')
-  // $router.push({ path: '/dashboard/index' })
   $router.go(-1)
 })
 </script>
 
- <!-- 监测 https://share.shanhaibi.com/641c0c42b4d7e/ -->
- <!-- 评价  https://share.shanhaibi.com/641c0c7ca29db/ -->
-  <!-- 预警  https://share.shanhaibi.com/641c0cacce6ed/ -->