wenhongquan 2 years ago
parent
commit
c2f27853ae

+ 1 - 1
package.json

@@ -20,7 +20,7 @@
         "@vue/babel-plugin-jsx": "^1.1.1",
         "axios": "0.26.1",
         "dingtalk-jsapi": "^2.15.2",
-        "echarts": "5.3.2",
+        "echarts": "^5.4.0",
         "element-plus": "2.1.8",
         "file-saver": "2.0.5",
         "fuse.js": "6.5.3",

BIN
public/map-marker-green.png


BIN
public/map-marker-red.png


+ 97 - 60
src/api/system/config.js

@@ -1,60 +1,97 @@
-import request from '@/utils/request'
-
-// 查询参数列表
-export function listConfig(query) {
-  return request({
-    url: '/system/config/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询参数详细
-export function getConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'get'
-  })
-}
-
-// 根据参数键名查询参数值
-export function getConfigKey(configKey) {
-  return request({
-    url: '/system/config/configKey/' + configKey,
-    method: 'get'
-  })
-}
-
-// 新增参数配置
-export function addConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改参数配置
-export function updateConfig(data) {
-  return request({
-    url: '/system/config',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除参数配置
-export function delConfig(configId) {
-  return request({
-    url: '/system/config/' + configId,
-    method: 'delete'
-  })
-}
-
-// 刷新参数缓存
-export function refreshCache() {
-  return request({
-    url: '/system/config/refreshCache',
-    method: 'delete'
-  })
-}
+import request from '@/utils/request'
+
+// 查询参数列表
+export function listConfig(query) {
+  return request({
+    url: '/system/config/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询参数详细
+export function getConfig(configId) {
+  return request({
+    url: '/system/config/' + configId,
+    method: 'get'
+  })
+}
+
+// 根据参数键名查询参数值
+export function getConfigKey(configKey) {
+  return request({
+    url: '/system/config/configKey/' + configKey,
+    method: 'get'
+  })
+}
+
+// 新增参数配置
+export function addConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改参数配置
+export function updateConfig(data) {
+  return request({
+    url: '/system/config',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除参数配置
+export function delConfig(configId) {
+  return request({
+    url: '/system/config/' + configId,
+    method: 'delete'
+  })
+}
+
+// 刷新参数缓存
+export function refreshCache() {
+  return request({
+    url: '/system/config/refreshCache',
+    method: 'delete'
+  })
+}
+
+
+export function getweatherdata() {
+  return request({
+    url: "/system/screen/weatherdata",
+    method: "get",
+  });
+}
+
+export function getrenyuandata() {
+  return request({
+    url: "/system/screen/renyuandata",
+    method: "get",
+  });
+}
+
+export function getyanghuyeardata() {
+  return request({
+    url: "/system/screen/yanghuyeardata",
+    method: "get",
+  });
+}
+
+export function gettongjidata() {
+  return request({
+    url: "/system/screen/tongjidata",
+    method: "get",
+  });
+}
+
+export function getdata() {
+  return request({
+    url: "/system/screen/data",
+    method: "get",
+  });
+}
+;

BIN
src/assets/images/图层 4@2x.png


BIN
src/assets/images/图层 5@2x.png


BIN
src/assets/images/图层 6@2x.png


BIN
src/assets/images/形状 8@2x.png


BIN
src/assets/images/标题@2x.png


BIN
src/assets/images/直线 1 拷贝 3@2x.png


BIN
src/assets/images/直线 1 拷贝@2x.png


BIN
src/assets/images/直线 1@2x.png


BIN
src/assets/images/矩形 1 拷贝 2@2x.png


BIN
src/assets/images/矩形 1 拷贝@2x.png


BIN
src/assets/images/矩形 1@2x.png


BIN
src/assets/images/矩形 3 拷贝@2x.png


BIN
src/assets/images/矩形 7 拷贝@2x.png


BIN
src/assets/images/组 16@2x(1).png


BIN
src/assets/images/组 16@2x(2).png


BIN
src/assets/images/组 16@2x.png


+ 7 - 0
src/layout/components/Navbar.vue

@@ -6,6 +6,7 @@
 
     <div class="right-menu">
 
+      <div class="time"><el-button type="success" @click="godap">大屏</el-button></div>
       <div class="time">{{currenttime}}</div>
       <div class="username">{{getters.nickName}}</div>
       <div style="margin-right:5px">
@@ -84,10 +85,16 @@ function handleCommand(command) {
     case "logout":
       logout();
       break;
+    case "godap":
+      location.href = "/work"
+      break
     default:
       break;
   }
 }
+function godap() {
+  location.href = "/work";
+}
 
 function logout() {
   ElMessageBox.confirm('确定注销并退出系统吗?', '提示', {

+ 6 - 1
src/router/index.js

@@ -56,6 +56,11 @@ export const constantRoutes = [
     hidden: true,
   },
   {
+    path: "/work",
+    component: () => import("@/views/screen"),
+    hidden: true,
+  },
+  {
     path: "",
     component: Layout,
     hidden: true,
@@ -86,7 +91,7 @@ export const constantRoutes = [
         path: "detail/:id",
         component: () => import("@/views/task/detail/index"),
         name: "taskdetail",
-        meta: { title: "任务详情",},
+        meta: { title: "任务详情" },
       },
     ],
   },

File diff suppressed because it is too large
+ 353 - 0
src/views/screen/index.vue


+ 3 - 3
vite.config.js

@@ -31,15 +31,15 @@ export default defineConfig(({ mode, command }) => {
         },
         // vite 相关配置
         server: {
-            port: 8085,
+            port: 9005,
             host: true,
             open: true,
             cors:true,
             proxy: {
                 // 'http://nnbpbg.xt.wenhq.top:8083'
                 "/dev-api": {
-                    // target: "http://localhost:8080/api",
-                    target:"http://nnbpbg.xt.wenhq.top:8083/api",
+                    target: "http://localhost:8080/api",
+                    // target:"http://nnbpbg.xt.wenhq.top:8083/api",
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, ""),
                 },

Some files were not shown because too many files changed in this diff