Browse Source

跳转修改及阀位管理系统列表修改

xiaohaizhao 5 months ago
parent
commit
44717a00ba

+ 1 - 1
src/system/IOT/IoTdashboard/index.vue

@@ -49,7 +49,7 @@
               <span>设备信息</span>
             </div>
             <div class="right">
-              <customBtn :btn="true" :btn-options="[{'label':'控制面板'}]" @clickBtn="router.push({path:'/' + infoPanel.baseInfo.prodnum,query:{id:infoPanel.baseInfo.w_deviceid}})"></customBtn>
+              <customBtn :btn="true" :btn-options="[{'label':'控制面板'}]" @clickBtn="router.push({path:'/' + infoPanel.baseInfo.dashboardpath || infoPanel.baseInfo.prodnum,query:{id:infoPanel.baseInfo.w_deviceid}})"></customBtn>
             </div>
           </div>
           <div class="map-deviced-info">

File diff suppressed because it is too large
+ 410 - 354
src/system/IOT/positionControl/index.vue


+ 1 - 2
src/system/IOT/pressureControl/modules/devices.vue

@@ -316,9 +316,8 @@ let getDeviceData = async () => {
 };
 
 let deviceClick = (data) => {
-  console.log("跳转", data);
   router.push({
-    path: "/" + (data.dashboardpath || "baseDevice"),
+    path: "/" + (data.dashboardpath || data.prodnum || "baseDevice"),
     query: {
       id: data.w_deviceid,
     },

+ 4 - 4
vite.config.js

@@ -12,15 +12,15 @@ export default defineConfig({
   },
   define: {
     'process.env': {
-      // 'BASE_API':"http://60.204.153.188"
-      'BASE_API':"http://61.164.207.46:8100/"
+      'BASE_API':"http://60.204.153.188"
+      // 'BASE_API':"http://61.164.207.46:8100/"
     }
   },
   server: {
     proxy: {
       "/api": {
-        // target: "http://60.204.153.188/",
-        target: "http://61.164.207.46:8100/",
+        target: "http://60.204.153.188/",
+        // target: "http://61.164.207.46:8100/",
         ws: true,
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ""),

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