修改控制方式和wsurl配置

.env.development

@@ -2,5 +2,5 @@
 VITE_APP_ENV = 'development'
 VITE_APP_TITLE = 'vue-vite-project-admin'
 VITE_APP_PORT = 8089
-##VITE_APP_WS_API = 'ws://localhost:9010' ## websocket地址
-VITE_APP_BASE_API = 'http://10.10.10.56:9010/' ## '/dev-api'线上接口  '/mock'本地模拟数据
+VITE_APP_WS_API = 'ws://board.heatiot.cn:8001/prod-api' ## websocket地址
+VITE_APP_BASE_API = '/dev-api' ## '/dev-api'线上接口  '/mock'本地模拟数据

.env.production

@@ -2,8 +2,5 @@
 VITE_APP_ENV = 'production'
 VITE_APP_TITLE = 'vue-vite-project-admin'
 VITE_APP_PORT = 8089
-#VITE_APP_WS_API = 'ws://board.heatiot.cn:8001/prod-api' ## websocket地址
-#VITE_APP_BASE_API = 'http://board.heatiot.cn:8001/prod-api/' ## 线上接口
-#VITE_APP_WS_API = 'ws://${window.location.host}/ws' ## websocket地址 ws://10.10.10.56:9000/websocket/
-VITE_APP_BASE_API = '/prod-api/' ## '/dev-api'线上接口  '/mock'本地模拟数据
-
+VITE_APP_WS_API = 'ws://board.heatiot.cn:8001/prod-api' ## websocket地址
+VITE_APP_BASE_API = 'http://board.heatiot.cn:8001/prod-api/' ## 线上接口

package.json

@@ -25,7 +25,6 @@
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.2.0",
     "pinia": "^2.0.12",
-    "pnpm": "^8.9.0",
     "screenfull": "^6.0.2",
     "swiper": "^10.2.0",
     "terser": "^5.17.6",

src/api/table/list.ts

@@ -66,11 +66,3 @@ export function getTableFooter(): AxiosPromise<[]> {
     method: 'get'
   });
 }
-/** 发送控制参数 */
-export function sendCtrl(data: any) {
-  return request({
-    url: '/bi/opt/device/ctrl',
-    method: 'post',
-    data: data
-  });
-}

src/types/auto-imports.d.ts

@@ -5,8 +5,6 @@ declare global {
   const ElForm: typeof import('element-plus/es')['ElForm']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
   const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
-  const ElNotification: typeof import('element-plus/es')['ElNotification']
-  const NEllipsis: typeof import('naive-ui')['NEllipsis']
   const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
   const autoResetRef: typeof import('@vueuse/core')['autoResetRef']
   const computed: typeof import('vue')['computed']
@@ -276,8 +274,6 @@ declare module 'vue' {
     readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
     readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
     readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
-    readonly ElNotification: UnwrapRef<typeof import('element-plus/es')['ElNotification']>
-    readonly NEllipsis: UnwrapRef<typeof import('naive-ui')['NEllipsis']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>
     readonly computed: UnwrapRef<typeof import('vue')['computed']>

src/views/monitoring/screen/components/main.vue

@@ -63,7 +63,7 @@ import {
   VxeFormEvents,
   VxeTablePropTypes
 } from 'vxe-table';
-import { getTableHeader, getStationInfo, getTableData, editConfig,sendCtrl } from '@/api/table/list';
+import { getTableHeader, getStationInfo, getTableData, editConfig } from '@/api/table/list';
 import { TableVo } from '@/api/table/types';
 import { tableStore } from '@/store/modules/table';
 import mitt from '@/plugins/bus';
@@ -91,17 +91,15 @@ const tableBorder=ref(true)
 // const waringArrow = ref([])
 
 interface FormDataVO {
-  //url: string;
+  url: string;
   deviceName: string;
-  paramCode :string;
   value: string;
 }
 const formRef = ref<VxeFormInstance>();
 const formLoading = ref(false);
 const formData = ref<FormDataVO>({
-  //url: '',
+  url: '',
   deviceName: '',
-  paramCode: '',
   value: '',
 });
 const formRules = ref<VxeFormPropTypes.Rules>({
@@ -122,15 +120,15 @@ const formRules = ref<VxeFormPropTypes.Rules>({
 
 const userStorageInfo = sessionStorage.getItem('userInfo')
 const userInfo = JSON.parse(userStorageInfo === null ? '' : userStorageInfo);
-//const apiUrl = import.meta.env.VITE_APP_WS_API
-//const wsUrl = `${apiUrl}websocket/${userInfo.userName}`; //websocket地址
-//const wsUrl = `${apiUrl}${userInfo.userName}`; //websocket地址
+const apiUrl = import.meta.env.VITE_APP_WS_API
+const wsUrl = `${apiUrl}/websocket/${userInfo.userName}`; //websocket地址
 // const loginIp = userInfo.loginIp.split('.').join('');
 // const baseApi = "http://172.1.2.106:9000"//websocket链接地址，与项目接口地址一致。
 // const baseApi = "http://board.heatiot.cn:8001/prod-api"//websocket链接地址，与项目接口地址一致。
 // const baseApi = import.meta.env.VITE_APP_BASE_API
 // const apiUrl = baseApi.replace(/https?:/, '');
-const wsUrl = `ws://${window.location.host}/ws/websocket/${userInfo.userName}`; //websocket地址
+// const wsUrl = `ws:${apiUrl}/websocket/${userInfo.userName}`; //websocket地址
+// const wsData = ref(socket.data);
 
 const emit = defineEmits(['tableHeaderData']);
 // const listData = ref([
@@ -176,7 +174,7 @@ const headerData = ref<HeaderVo[]>();
 onMounted(() => {
   // stationInfo();
   // tableHeader();
-  socket.initialize(wsUrl); //初始化websocket http://
+  socket.initialize(wsUrl); //初始化websocket
 });
 
 mitt.on('menuKey', (res: any) => {
@@ -324,22 +322,17 @@ function tableDatas() {
 
 const cellDBLClickEvent: VxeTableEvents.CellDblclick<TableVo> = ({ row, column }) => {
   //双击单元格
-  //edit ty zhousq 2023-10-12 修改控制方式为接口方式，修改formdata提交的属性值
-  // ctrlPro.centeruuid 设备UUID cellField.ctrlPro.paramcode 设备参数编码 cellField.val 设备值
-  //ctrlPro 为新增的单元格属性，控制参数回传
   console.log("cellData--", row, column);
   const cellField = row[column.field];
-  //const data = row.data;
+  const data = row.data;
   cellRow.value = row
   cellColumn.value = column
   cellField.value = cellField
   if (cellField.canBeControl === '1') {
     modalTitle.value = column.title;
-    ///formData.value.url = data.url;
-    //formData.value.deviceName = cellField.deviceName;
+    formData.value.url = data.url;
+    formData.value.deviceName = cellField.deviceName;
     formData.value.value = cellField.val;
-    formData.value.deviceName=cellField.ctrlPro.centeruuid
-    formData.value.paramCode=cellField.ctrlPro.paramcode
     editModal.value = true;
   }
   console.log(row[column.field]);
@@ -379,25 +372,15 @@ const submitEvent: VxeFormEvents.Submit = () => {
   formLoading.value = true;
   const $table = tableRef.value;
   const submitData = {
-    //code: 'W01',
-    //data: {
-      //url: formData.value.url,
-      //deviceName: formData.value.deviceName,
-      //value: formData.value.value,
-      deviceUUID:formData.value.deviceName,
-      paramCode: formData.value.paramCode,
-      valueType: "",
-      value:formData.value.value
-    //},
+    code: 'W01',
+    data: {
+      url: formData.value.url,
+      deviceName: formData.value.deviceName,
+      value: formData.value.value,
+    },
   };
   console.log(submitData);
-  //Add by zhousq 2023-10-12 控制接口调用 post 方法
-  sendCtrl(submitData).then((res: any) => {
-    if (res.code === 200) {
-      console.log(res.data);
-    }
-  });
-  //socket.onSend(submitData);
+  socket.onSend(submitData);
   formLoading.value = false;
   editModal.value = false;