'点表管理页面开发'

src/api/config.js

@@ -1,17 +1,25 @@
 
-// const config = {
-//     baseURL: 'http://192.168.10.18:6041',
-//     socketURL: 'ws://192.168.10.18:6041'
-// }
 const config = {
-    baseURL: 'http://192.168.10.13:6041',
-    socketURL: 'ws://192.168.10.13:6041'
+    baseURL: 'http://192.168.10.28:6041',
+    socketURL: 'ws://192.168.10.28:6041',
+    redisURL: 'http://192.168.10.9:5087',
+    redisetURL: 'ws://192.168.10.9:5087',
+    taosURL: 'http://192.168.10.9:5085',
+    taosetURL: 'ws://192.168.10.9:5085'
 }
+
+// const config = {
+//     baseURL: 'http://192.168.10.28:5087',
+//     socketURL: 'ws://192.168.10.28:5087'
+// }
+
+
 // const config = {
-//     baseURL: 'http://192.168.10.9:5087',
-//     socketURL: 'ws://192.168.10.9:5087'
+//     baseURL: 'http://192.168.10.28:5085',
+//     socketURL: 'ws://192.168.10.28:5085'
 // }
 
+
 export default config;
 export const baseURL = config.baseURL
 export const socketURL = config.socketURL

src/api/utils.js

@@ -0,0 +1,28 @@
+import axios from './axios'
+// 导出Excel公用方法
+export function exportMethod(data) {
+    axios({
+      method: data.method,
+      url: `${data.url}${data.params ? '?' + data.params : ''}`,
+      responseType: 'blob'
+    }).then((res) => {
+      const link = document.createElement('a')
+      let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'})
+      link.style.display = 'none'
+    link.href = URL.createObjectURL(blob)
+  
+    // link.download = res.headers['content-disposition'] //下载后文件名
+    link.download = data.fileName //下载的文件名
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+  }).catch(error => {
+      this.$Notice.error({
+      title: '错误',
+      desc: '网络连接错误'
+    })
+    console.log(error)
+  })
+  }
+
+  

src/components/Header.vue

@@ -141,7 +141,7 @@ const submitForm = (formEl) => {
 // 侧边栏折叠
 const collapseChage = () => {
   // store.commit("hadndleCollapse", true);
-  store.commit("hadndleCollapse", !collapse.value);
+  store.commit("hadndleCollapse", false);
 };
 // 全屏
 const toggleFullScreen = () => {
@@ -150,9 +150,9 @@ const toggleFullScreen = () => {
   }
 };
 onMounted(() => {
-  if (document.body.clientWidth < 1500) {
-    store.commit("hadndleCollapse", true);
-  }
+  // if (document.body.clientWidth < 1500) {
+    store.commit("hadndleCollapse", false);
+  // }
 });
 </script>
 <style scoped>

src/pages/buildTable/create/index.vue

@@ -1,181 +1,634 @@
 <script setup name="prepare">
-import searchCop from './components/search.vue'
-import excelCop from '@/components/excel.vue'
-import treeCop from '@/components/tree.vue'
-import tableCop from './components/table.vue'
-import { ElMessage } from 'element-plus';
-import { onMounted, ref, onActivated } from 'vue'
-import request from '@/api/axios.js'
-import {baseURL, socketURL} from '@/api/axios.js'
+import treeCop from "@/components/tree.vue";
+import { useRouter } from "vue-router";
+import { ElMessage } from "element-plus";
+import { onMounted, ref, reactive, onActivated, nextTick } from "vue";
+
+import {
+  Check,
+  Delete,
+  Edit,
+  Message,
+  Search,
+  Star,
+} from "@element-plus/icons-vue";
+
+import request from "@/api/axios.js";
+import { baseURL, socketURL } from "@/api/axios.js";
+import config from "@api/config.js";
+import { exportMethod } from "@/api/utils.js";
+
 /**配置参数 */
-const treeHeight = ref(window.innerHeight - 260 + 'px') //tree高度
-const excelHeight = ref(window.innerHeight - 260 + 'px') //excel高度
-const tableHeight = ref(window.innerHeight - 260 + 'px')
-/**excel 开始 */
-const excelList = ref([])
-const funExcelChange = async (obj) => { //点击excel项时
-	tableShowId.value = obj.id
-	tableName.value = obj.name
-	tableLoading.value = true
-	const res = await request.get('/power/prepare/show', { params: { id: obj.id } })
-	if(res.code === 200){
-		tableColumn.value = res.data.title.map(o => {
-			return {
-				prop: o.key,
-				label: o.des,
-				width: o.des==='时间'? 100: 80,
-			}
-		})
-		tableData.value = res.data.data
-		tableLoading.value = false
-	}else{
-		tableLoading.value = false
-	}
-}
+const treeHeight = ref(window.innerHeight - 260 + "px"); //tree高度
+const excelHeight = ref(window.innerHeight - 260 + "px"); //excel高度
+const tableHeight = ref(window.innerHeight - 260 + "px");
+
+
 /**tree 开始 */
-const treeData = ref([])
-const actTreeNode = ref(null) //当前激活的treeNode
+const treeData = ref([]);
+
+const actTreeNode = ref(null); //当前激活的treeNode
 const funRepeatMap = (arr) => {
-	return arr.map(o => {
-		if (o.children) {
-			const findIndex = o.children.findIndex(p => !!p.type)
-			if (findIndex !== -1) {
-				o.childs = o.children
-				o.children = []
-				if(!actTreeNode.value){ //判断当且仅有process获取tree时 赋值
-					actTreeNode.value = o
-				}
-			}
-		}
-		return {
-			...o,
-			children: o.children?.length ? funRepeatMap(o.children) : []
-		}
-	})
-}
-
-// 点表管理的内容
+  return arr.map((o) => {
+    if (o.children) {
+      const findIndex = o.children.findIndex((p) => !!p.type);
+      if (findIndex !== -1) {
+        o.childs = o.children;
+        o.children = [];
+        if (!actTreeNode.value) {
+          //判断当且仅有process获取tree时 赋值
+          actTreeNode.value = o;
+        }
+      }
+    }
+    return {
+      ...o,
+      children: o.children?.length ? funRepeatMap(o.children) : [],
+    };
+  });
+};
+
+
+const funStationGet = async (point) => {
+  const res = await request.post(
+    "/rest/sql",
+    `SELECT DISTINCT station FROM ${treeData.value[0].id}.${point};`
+  );
+  // console.log("nb", res);
+};
+
 const funGetTree = async () => {
-	actTreeNode.value = null
-	const res = await request.get("/power/prepare/tree")
-	treeData.value = funRepeatMap(res.data)
-	excelList.value = []
-	if(actTreeNode.value){
-		funCurrentChange({current: actTreeNode.value, currentNode: null})
-		const child = actTreeNode.value.childs[0]
-		const obj = {
-			id: child.id,
-			interval: child.interval,
-			path: child.path,
-			prepareid: child.prepareid,
-			station: child.station,
-			time: child.time,
-			type: child.type,
-			windturbine: child.windturbine,
-			name: child.path.substring(child.path.indexOf(child.station + '_') + (child.station + '_').length)
-		}
-		funExcelChange(obj)
-	}
-}
-const funCurrentChange = ({ current, currentNode }) => {
-	if (current.childs) {
-		excelList.value = current.childs.map(o => {
-			return {
-				id: o.id,
-				interval: o.interval,
-				path: o.path,
-				prepareid: o.prepareid,
-				station: o.station,
-				time: o.time,
-				type: o.type,
-				windturbine: o.windturbine,
-				name: o.path.substring(o.path.indexOf(o.station + '_') + (o.station + '_').length)
-			}
-		})
-	} else {
-		excelList.value = []
-	}
-}
+  actTreeNode.value = null;
+  treeData.value = [];
+  const res = await request.post("/rest/sql", "show databases;");
+  const databaseNameArray = res.data || [];
+  const blackList = ["information_schema", "performance_schema", "'mydbinfo'"];
+
+  let resultDatabaesArray = [];
+
+  databaseNameArray.forEach((pEle) => {
+    pEle.forEach((cEle) => {
+      const someRes = blackList.some((someEle) => {
+        return someEle === cEle;
+      });
+      if (!someRes) {
+        resultDatabaesArray.push(cEle);
+      }
+    });
+  });
+
+  let tempTreeData = [];
+
+  resultDatabaesArray.forEach(async (ele) => {
+    const { data } = await request.post("/rest/sql", `show ${ele}.stables;`);
+    //处理树状结构数据
+    if (data?.length) {
+      let treeItem = {
+        id: ele,
+        label: ele,
+        value: ele,
+        children: [],
+      };
+      data.forEach((pEle) => {
+        pEle.forEach((cEle) => {
+          treeItem.children.push({
+            id: cEle,
+            label: cEle,
+            value: cEle,
+            children: [],
+          });
+        });
+      });
+      tempTreeData.push(treeItem);
+    }
+  });
+
+  setTimeout(() => {
+    treeData.value = tempTreeData;
+  }, 1000);
+
+  // nextTick(()=>{
+  //    treeData.value=tempTreeData;
+  // })
+
+};
+
+const funCurrentChange = async ({ current, currentNode }) => {
+  // console.log("nbnbnbnbnbnbn", current);
+  const tableName = current.value;
+  let databaseName = "";
+  for (let i = 0; i < treeData.value.length; i++) {
+    const pEle = treeData.value[i];
+    for (let j = 0; j < pEle.children.length; j++) {
+      const cEle = pEle.children[j];
+      if (cEle.value === tableName) {
+        databaseName = pEle.value;
+        break;
+      }
+    }
+  }
+  sessionStorage.setItem(
+    "myData",
+    JSON.stringify({ nxxy: databaseName, nxxy1: tableName })
+  );
+
+  //拿取表格数据
+  const res = await request.post(
+    "/rest/sql",
+    `SELECT tbname as point,description,ts,val,station,category,facility,uniformcode,rate,remark FROM ${databaseName}.${tableName} limit 99;`
+  );
+  //映射数组里的数据
+  let newdata = [];
+  const map = {
+    0: "point",
+    1: "description",
+    2: "ts",
+    3: "val",
+    4: "station",
+    5: "category",
+    6: "equipment",
+    7: "uniformcode",
+    8: "rate",
+    9: "remark",
+  };
+  res.data.forEach((ele) => {
+    let dateItem = {};
+    for (let key in ele) {
+      dateItem[map[key]] = ele[key];
+    }
+    dateItem.databaseName = databaseName;
+    dateItem.tableName = tableName;
+    newdata.push(dateItem);
+  });
+  // console.log(999999,newdata);
+  tableData.value = newdata;
+  console.log("66b", tableData.value);
+
+  const ros = await request.post(
+    "/rest/sql",
+    `SELECT DISTINCT station FROM ${databaseName}.${tableName}`
+  );
+  console.log('69966', ros);
+  let nbdata = [];
+  ros.data.forEach((ele) => {
+    ele?.[0] && nbdata.push(ele[0]);
+  });
+  // console.log(55555,nbdata);
+
+  stationList.value = nbdata;
+
+  console.log(7777777777, stationList.value);
+  if (stationList.value.length) {
+    queryForm.station = stationList.value[0];
+  }
+};
+
+const queryForm = reactive({
+  station: "",
+  tbname: "",
+  description: "",
+  uniformcode: "",
+});
+
+const stationList = ref([]);
+
+const funStationChange = (val) => {
+  console.log(111111111111, val);
+  queryForm.station = val;
+};
+
+const nbsubmit = async () => {
+  if (queryForm.tbname == "" || queryForm.station == "") {
+    ElMessage.error("测点不能为空");
+  } else {
+    const res = await request.post(
+      "/rest/sql",
+      `SELECT tbname as point,description,ts,val,station,category,facility,uniformcode,rate,remark FROM ${
+        tableData.value[0].databaseName
+      }.${tableData.value[0].tableName}
+   where ${
+     queryForm.station === "all"
+       ? ""
+       : "station='" + queryForm.station + "' and"
+   } tbname like '%${queryForm.tbname}%' ${
+        queryForm.description === ""
+          ? ""
+          : "and description like '%" + queryForm.description + "%'"
+      } ${
+        queryForm.uniformcode === ""
+          ? ""
+          : "and uniformcode=" + queryForm.uniformcode
+      } limit ${pagenumber.value - 1}, ${pagenb.value - 1}
+   `
+    );
+
+    console.log(666666666666, res);
+    let newdata = [];
+    const map = {
+      0: "point",
+      1: "description",
+      2: "ts",
+      3: "val",
+      4: "station",
+      5: "category",
+      6: "equipment",
+      7: "uniformcode",
+      8: "rate",
+      9: "remark",
+    };
+    res.data.forEach((ele) => {
+      let dateItem = {};
+      for (let key in ele) {
+        dateItem[map[key]] = ele[key];
+      }
+      // dateItem.databaseName = databaseName;
+      // dateItem.tableName = tableName;
+      newdata.push(dateItem);
+      console.log('nbnbnb',newdata);
+    });
+    console.log(999999, newdata);
+    tableData.value = newdata;
+  }
+};
+
+// 下载建点
+// const jianbao = async (urlKey) => {
+//   const requestUrl = config[urlKey];
+//   console.log('zxzxzx',requestUrl);
+//   let el = document.createElement("a");
+//   el.href = `${requestUrl}/taos/template`;
+//   el.download = "";
+//   el.target = "_blank";
+//   document.body.appendChild(el);
+//   el.click();
+//   document.body.removeChild(el);
+// };
+
+
+//导出Excel
+const exportDepReceRank = () => {
+
+  // const requestUrl = config[urlKey];
+  // console.log('nnnnnnnnn');
+
+  let myObj = {
+    method: "get",
+    url: `http://192.168.10.9:5087/taos/template`,
+    fileName: "导出的Excel",
+  };
+  exportMethod(myObj);
+};
+
+const uploadRef = ref();
+const fslist = async (urlKey) => {
+  const requestUrl = config[urlKey];
+  const res = await request.post(`${requestUrl}/taos/uploadexcel`);
+  console.log("nbnbnbnbn", res);
+  
+};
+
+// 路由传递数据
+const router = useRouter();
+const dbclick = (a) => {
+  console.log(11111, a);
+  const dbName = a.databaseName;
+  const tbName = a.point;
+  router.push({
+    path: "/look/create",
+    query: {
+      databaseName: dbName,
+      tableName: tbName,
+    },
+  });
+};
+
 /**table 开始 */
-const tableShowId = ref('')
-const tableName = ref('')
-const tableColumn = ref([])
-const tableLoading = ref(false)
-const tableData = ref([])
-const funExport = async () => {
-	const a = document.createElement('a')
-	a.href = baseURL + '/power/prepare/download?id=' + tableShowId.value
-	a.download = ''
-	a.click()
-}
-/**submit */
-const progress = ref(0)
-const funWebSocket = () => {
-	const webSocket = new WebSocket(`${socketURL}/ws/powerfitting/admin`)
-	webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
-
-	webSocket.onmessage = (event) => {
-		const message = JSON.parse(event.data)
-		if (message.code === 200) {
-			progress.value = Number(message.data) * 100
-			if (progress.value === 100) {
-				ElMessage.success('数据加载完成')
-				funGetTree()
-				progress.value = 0
-			}
-		}
-	}
-}
+// const tableShowId = ref("");
+const tableName = ref("");
+const tableLoading = ref(false);
+let tableData = ref([]);
+
 const funSubmit = async (params) => {
-	const res = await request.get('/power/prepare/data', { params: params })
-	if (res.code === 200) {
-		ElMessage.success(res.msg)
-
-	}
-}
-/**created */
-// funGetTree()
-funWebSocket()
+  const res = await request.get("/power/prepare/data", { params: params });
+  if (res.code === 200) {
+    ElMessage.success(res.msg);
+  }
+};
+
+
+
+let pagenumber = ref(1); //当前的页数
+const pagenb = ref(100); //当前的条数
+let myData = JSON.parse(sessionStorage.getItem("myData"));
+
+console.log("hahhah", pagenumber.value);
+const left1 = async () => {
+  pagenumber.value -= 1;
+  const res = await request.post(
+    "/rest/sql",
+    `SELECT tbname as point,description,ts,val,station,category,facility,uniformcode,rate,remark FROM ${myData.nxxy}.${myData.nxxy1} limit 99;`
+  );
+  let newdata = [];
+
+  const map = {
+    0: "point",
+    1: "description",
+    2: "ts",
+    3: "val",
+    4: "station",
+    5: "category",
+    6: "equipment",
+    7: "uniformcode",
+    8: "rate",
+    9: "remark",
+  };
+
+  res.data.forEach((ele) => {
+    let dateItem = {};
+    for (let key in ele) {
+      dateItem[map[key]] = ele[key];
+    }
+    newdata.push(dateItem);
+  });
+  tableData.value = newdata;
+};
+const right1 = async () => {
+  pagenumber.value += 1;
+  const res = await request.post(
+    "/rest/sql",
+    `SELECT tbname as point,description,ts,val,station,category,facility,uniformcode,rate,remark FROM ${myData.nxxy}.${myData.nxxy1} limit 99;`
+  );
+  let newdata = [];
+  const map = {
+    0: "point",
+    1: "description",
+    2: "ts",
+    3: "val",
+    4: "station",
+    5: "category",
+    6: "equipment",
+    7: "uniformcode",
+    8: "rate",
+    9: "remark",
+  };
+  res.data.forEach((ele) => {
+    let dateItem = {};
+    for (let key in ele) {
+      dateItem[map[key]] = ele[key];
+    }
+    newdata.push(dateItem);
+  });
+  tableData.value = newdata;
+};
+
+const formlist = reactive({
+  cedian: "",
+  miaoshu: "",
+  changzhan: "",
+  leibie: "",
+  shebeiid: "",
+  shibiema: "",
+  beilv: "",
+  beizhu: "",
+});
+
+
+let dialogFormVisible = ref(false);
+let editIndex = ref(-1);
+//编辑
+const handleEdit = (index) => {
+  dialogFormVisible.value = true;
+  editIndex.value = index;
+  formlist.cedian = tableData.value[editIndex.value].point;
+  formlist.miaoshu = tableData.value[editIndex.value].station;
+  formlist.changzhan = tableData.value[editIndex.value].description;
+  formlist.leibie = tableData.value[editIndex.value].category;
+  formlist.shebeiid = tableData.value[editIndex.value].equipment;
+  formlist.shibiema = tableData.value[editIndex.value].uniformcode;
+  formlist.beilv = tableData.value[editIndex.value].rate;
+  formlist.beizhu = tableData.value[editIndex.value].remark;
+};
+
+const queren = () => {
+  dialogFormVisible.value = false;
+  tableData.value[editIndex.value].point = formlist.cedian;
+  tableData.value[editIndex.value].station = formlist.miaoshu;
+  tableData.value[editIndex.value].description = formlist.changzhan;
+  tableData.value[editIndex.value].category = formlist.leibie;
+  tableData.value[editIndex.value].equipment = formlist.shebeiid;
+  tableData.value[editIndex.value].uniformcode = formlist.shibiema;
+  tableData.value[editIndex.value].rate = formlist.beilv;
+  tableData.value[editIndex.value].remark = formlist.beizhu;
+};
+
+//删除
+const handleDelete = (index) => {
+  editIndex.value = index;
+  tableData.value.splice(editIndex.value, 1);
+};
+
 /**mounted */
 onMounted(() => {
-	tableHeight.value = window.innerHeight - 260 + 'px'
-	excelHeight.value = window.innerHeight - 260 + 'px'
-	treeHeight.value = window.innerHeight - 260 + 'px'
-	window.addEventListener('resize', () => {
-		tableHeight.value = window.innerHeight - 260 + 'px'
-		excelHeight.value = window.innerHeight - 260 + 'px'
-		treeHeight.value = window.innerHeight - 260 + 'px'
-	})
-})
+  tableHeight.value = window.innerHeight - 260 + "px";
+  excelHeight.value = window.innerHeight - 260 + "px";
+  treeHeight.value = window.innerHeight - 260 + "px";
+  window.addEventListener("resize", () => {
+    tableHeight.value = window.innerHeight - 260 + "px";
+    excelHeight.value = window.innerHeight - 260 + "px";
+    treeHeight.value = window.innerHeight - 260 + "px";
+  });
+
+  console.log("asasa", config);
+});
+
 /**activated */
 onActivated(() => {
-	funGetTree()
-})
+  funGetTree();
+});
 </script>
 <template>
-	<div class="bg-white py-[10px] px-[10px] relative">
-		<search-cop class="mb-[20px] shadow rounded-[6px] shadow-blue-500" @submit="funSubmit">
-		</search-cop>
-		<div class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[20px] pb-[10px]">
-			<div class="text-[14px] absolute top-[-7px] text-[#838383] left-[20px]">数据展示</div>
-			<el-row :gutter="10">
-				<el-col :span="5">
-					<tree-cop :data="treeData" :height="treeHeight" @currentChange="funCurrentChange" @refresh="funGetTree">
-					</tree-cop>
-				</el-col>
-				<el-col :span="3">
-					<excel-cop :data="excelList" :height="excelHeight" @excelChange="funExcelChange"></excel-cop>
-				</el-col>
-				<el-col :span="16">
-					<div>
-						<table-cop class="" :data="tableData" :column="tableColumn" :loading="tableLoading"
-							:height="tableHeight" :tableId="tableShowId" :tableName="tableName" @export="funExport"></table-cop>
-					</div>
-				</el-col>
-			</el-row>
-		</div>
-
-		<el-progress :percentage="progress" v-if="progress" class="!absolute top-0 right-0 left-0" :indeterminate="false"
-			color="rgb(19,206,102)" :stroke-width="4" :show-text="false" />
-	</div>
-</template>
+  <div class="bg-white py-[10px] px-[10px] relative">
+    <div
+      class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
+    >
+      <el-form class="" :inline="true" :model="queryForm">
+        <el-form-item label="场站" class="!mb-0">
+          <el-select
+            v-model="queryForm.station"
+            class="w-[150px]"
+            @change="funStationChange"
+          >
+            <el-option
+              label="全选"
+              value="all"
+              v-if="queryForm.station?.length"
+            />
+            <el-option
+              v-for="item in stationList"
+              :key="index"
+              :label="item"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="测点" class="!mb-0">
+          <el-input v-model="queryForm.tbname" />
+        </el-form-item>
+        <el-form-item label="描述" class="!mb-0">
+          <el-input v-model="queryForm.description" />
+        </el-form-item>
+        <el-form-item label="统一识别码" class="!mb-0">
+          <el-input v-model="queryForm.uniformcode" />
+        </el-form-item>
+        <el-form-item class="!mb-0">
+          <el-button type="primary" @click="nbsubmit">查询</el-button>
+        </el-form-item>
+      </el-form>
+      <el-upload
+        ref="upload"
+        class="upload-demo"
+        action="http://192.168.10.9:5087/taos/uploadexcel"
+        :limit="1"
+        :on-exceed="handleExceed"
+        :auto-upload="false"
+      >
+        <template #trigger>
+          <el-button type="primary">选择文件</el-button>
+        </template>
+      </el-upload>
+
+      <el-form-item class="!mb-0 ml-5">
+        <el-button @click="fslist('redisURL')" type="success">上传</el-button>
+      </el-form-item>
+      <el-form-item class="!mb-0 ml-5">
+        <el-button @click="exportDepReceRank" type="primary"
+          >下载建点、修改点模板</el-button
+        >
+      </el-form-item>
+    </div>
+    <div
+      class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[20px] pb-[10px]"
+    >
+      <el-row :gutter="10">
+        <el-col :span="4">
+          <tree-cop
+            :data="treeData"
+            :height="treeHeight"
+            @currentChange="funCurrentChange"
+            @refresh="funGetTree"
+            @node-click="treeNodeClick"
+          >
+          </tree-cop>
+        </el-col>
+
+        <el-col :span="19">
+          <div>
+            <el-scrollbar max-height="650px">
+              <el-table
+                :data="tableData"
+                style="width: 100% ,height:650px"
+                @cell-dblclick="dbclick"
+              >
+                <el-table-column
+                  prop="point"
+                  label="测点"
+                  align="center"
+                  width="200"
+                />
+
+                <el-table-column
+                  prop="description"
+                  label="描述"
+                  align="center"
+                  width="200"
+                />
+
+                <el-table-column
+                  prop="ts"
+                  label="时间"
+                  align="center"
+                  width="200"
+                />
+
+                <el-table-column prop="val" label="值" align="center" />
+                <el-table-column prop="station" label="场站" align="center" />
+                <el-table-column prop="category " label="类别" align="center" />
+                <el-table-column
+                  prop="equipment"
+                  label="设备id"
+                  align="center"
+                />
+                <el-table-column
+                  prop="uniformcode"
+                  label="统一识别码"
+                  align="center"
+                />
+                <el-table-column prop="rate" label="倍率" align="center" />
+                <el-table-column prop="remark" label="备注" align="center" />
+
+                <el-table-column label="操作" width="200">
+                  <template #default="scope">
+                    <el-button
+                      type="primary"
+                      :icon="Edit"
+                      circle
+                      @click="handleEdit(scope.$index, scope.row)"
+                    />
+
+                    <el-button
+                       type="danger"
+                       :icon="Delete"
+                       circle
+                      @click="handleDelete(scope.$index, scope.row)"
+                    />
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-scrollbar>
+          </div>
+
+          <el-button @click="left1" :disabled="pagenumber <= 1"
+            >上一页</el-button
+          >
+          <span class="pl-2"> {{ pagenumber }} </span>
+          <el-button @click="right1">下一页</el-button>
+        </el-col>
+      </el-row>
+    </div>
+
+    <el-dialog v-model="dialogFormVisible">
+      <el-form :model="formlist">
+        <el-form-item label="测点">
+          <el-input v-model="formlist.cedian" />
+        </el-form-item>
+        <el-form-item label="描述">
+          <el-input v-model="formlist.miaoshu" />
+        </el-form-item>
+        <el-form-item label="场站">
+          <el-input v-model="formlist.changzhan" />
+        </el-form-item>
+        <el-form-item label="类别">
+          <el-input v-model="formlist.leibie" />
+        </el-form-item>
+        <el-form-item label="设备id">
+          <el-input v-model="formlist.shebeiid" />
+        </el-form-item>
+        <el-form-item label="统一识别码">
+          <el-input v-model="formlist.shibiema" />
+        </el-form-item>
+        <el-form-item label="倍率" v-model="formlist.beilv">
+          <el-input v-model="formlist.beilv" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="formlist.beizhu" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="dialogFormVisible = false">取消</el-button>
+          <el-button type="primary" @click="queren"> 确定 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>

src/pages/look/create/index.vue

@@ -68,6 +68,7 @@
         <el-button type="primary" @click="onSubmit">导出</el-button>
       </el-form-item>
     </el-form>
+
   </div>
 
   <div
@@ -92,11 +93,15 @@ const queryForm = reactive({
   tableName: "",
   databaseName: "",
   checked1: "",
+  checked1:true
 });
 
 // 日期数据
-const timedata = ref([]);
-
+const timedata = ref([
+  new Date(2023, 3, 14, 11, 10),
+  new Date(2023, 3, 14, 12, 10),
+]);
+let myData = JSON.parse(sessionStorage.getItem('myData'));
 //  表格数据
 const tableData = ref([]);
 const looksubmit = async (point) => {
@@ -105,7 +110,7 @@ const looksubmit = async (point) => {
   } else {
     const res = await request.post(
       "/rest/sql",
-      `select * from ${queryForm.databaseName}.${
+      `select * from ${myData.nxxy}.${
         queryForm.tableName
       } where ts between ${new Date(
         timedata.value[0]
@@ -138,6 +143,9 @@ onMounted(() => {
   //路由传过来的数据
   queryForm.databaseName = route.query.databaseName;
   queryForm.tableName = route.query.tableName;
+  
+  // console.log(666666666666,queryForm.databaseName);
+  // console.log(666666666666,queryForm.tableName);
 });
 </script>
 

src/pages/redis/create/index.vue

@@ -5,42 +5,63 @@ import tableCop from './components/table.vue'
 import { ElMessage } from 'element-plus';
 import { onMounted, ref, onActivated } from 'vue'
 import request from '@/api/axios.js'
-import {baseURL, socketURL} from '@/api/axios.js'
+import config from '@api/config.js'
 /**配置参数 */
 const treeHeight = ref(window.innerHeight - 260 + 'px') //tree高度
 const excelHeight = ref(window.innerHeight - 260 + 'px') //excel高度
 const tableHeight = ref(window.innerHeight - 260 + 'px')
-/**excel 开始 */
 
-/**tree 开始 */
-// const disable =ref()
-// const sjulist=async()=>{
-// 	const res = await request.get("/taos/create/database")
-// 	// console.log(res);
-// 		webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
-//          ElMessage.success('响应完成')
+let stop1=ref(Boolean)
+let stop2=ref(Boolean)
+let stop3=ref(Boolean)
 
-// }
-//  const cjblist=async()=>{
-// 	 const res = await request.get("/taos/create/supertable")
-	
-// 	webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
-//          ElMessage.success('响应完成')
-//  }
 
-// const redislist=async()=>{
-// 	 const res = await request.get("/taos/create/table")
-// 	console.log(res);
-// 	webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
-//          ElMessage.success('响应完成')
-//  }
+const sjklist=async(urlKey)=>{
+	const requestUrl=config[urlKey];
+	const res = await request.get(`${requestUrl}/taos/create/database`)
+	console.log(res);
+		// webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
+         ElMessage.success(res.msg)
+}
+ const cjblist=async(urlKey)=>{
+	const requestUrl=config[urlKey];
+	 const res = await request.get(`${requestUrl}/taos/create/supertable`)
+	// webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
+         ElMessage.success(res.msg)
+ }
 
-//  const funlist=async()=>{
-// 		const res=await request.get("/taos/2redis/status")
-// 	    console.log('zh',res);
+const redislist=async(urlKey)=>{
+	const requestUrl=config[urlKey];
+	 const res = await request.get(`${requestUrl}/taos/create/table`)
+	console.log(res);
+	// webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
+         ElMessage.success(res.msg)
+ }
 
-// 	}
+ 
 
+	const funSubmit1 = async(urlKey)=>{
+		const requestUrl=config[urlKey];
+		const res=await request.get(`${requestUrl}/redis/read/start`)
+		// console.log(res);
+		// webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
+		 ElMessage.success(res.msg)
+		
+	}
+	const funSubmit2 = async(urlKey)=>{
+		const requestUrl=config[urlKey];
+		const res=await request.get(`${requestUrl}/taos/create/table`)
+		// console.log(res);	
+		// webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
+		 ElMessage.success(res.msg)
+	}
+	const funSubmit3 = async(urlKey)=>{
+		const requestUrl=config[urlKey];
+		const res=await request.get(`${requestUrl}/redis/read/stop`)
+		// console.log(res);
+		// webSocket.onerror = () => setTimeout(() => { funWebSocket() }, 2000)
+		 ElMessage.success(res.msg)	
+	}
 
 
 onMounted(() => {
@@ -52,45 +73,54 @@ onMounted(() => {
 		excelHeight.value = window.innerHeight - 260 + 'px'
 		treeHeight.value = window.innerHeight - 260 + 'px'
 	})
-	console.log(123);
-	funlist()
-		
+	console.log(111111111111111,config);
+	const requestUrl=config.taosURL;
+	const res=request.get(`${requestUrl}/redis/read/status`)
+	console.log(666666,res);
+	if(res==true){
+		stop1.value=false
+		stop2.value=false
+		stop3.value=true
+	}	else{
+		stop1.value=true
+		stop2.value=true
+		stop3.value=false
+	}
+	
 })
 
     
-
-
 onActivated(() => {
 	// funGetTree()
 })
 </script>
 <template>
 	<div class="bg-white py-[10px] px-[10px] relative">
-	<div class="pl-[20px] flex items-center h-[80px] relative">
-		<div class="absolute top-[-7px] left-[20px] text-[#838383] text-[14px]">操作面板</div>
+	<div class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500">
+		
 	
 			<el-form-item class="!mb-0 ml-5">
-				<el-button @click="sjklist" type="primary" :disabled="disable">建数据库</el-button>
+				<el-button @click="sjklist('redisURL')" type="primary" :disabled="disable">建数据库</el-button>
 			</el-form-item>
 			<el-form-item class="!mb-0 ml-5">
-				<el-button @click="cjblist" type="primary">建超级表</el-button>
+				<el-button @click="cjblist('redisURL')" type="primary">建超级表</el-button>
 			</el-form-item>
 			<el-form-item class="!mb-0 ml-5">
-				<el-button @click="redislist" type="primary">按采集Redis建点</el-button>
+				<el-button @click="redislist('redisURL')" type="primary">按采集Redis建点</el-button>
 			</el-form-item>
 			<el-form-item class="!mb-0 ml-5">
-				<el-button @click="funSubmit" type="primary">启动读redis写taos</el-button>
+				<el-button @click="funSubmit1('taosURL')" type="primary" :disabled="stop1">启动读redis写taos</el-button>
 			</el-form-item>
 			<el-form-item class="!mb-0 ml-5">
-				<el-button @click="funSubmit" type="primary">redis新增建点</el-button>
+				<el-button @click="funSubmit2('redisURL')" type="primary" :disabled="stop2">redis新增建点</el-button>
 			</el-form-item>
 			<el-form-item class="!mb-0 ml-5">
-				<el-button @click="funSubmit" type="primary">停止读redis写taos</el-button>
+				<el-button @click="funSubmit3('taosURL')" type="primary" :disabled="stop3">停止读redis写taos</el-button>
 			</el-form-item>
 		
 	</div>
 		<div class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[20px] pb-[10px]">
-			<div class="text-[14px] absolute top-[-7px] text-[#838383] left-[20px]">数据展示</div>
+		
 			<el-row :gutter="10">
 				<el-col :span="5">
 					<!-- <tree-cop :data="treeData" :height="treeHeight" @currentChange="funCurrentChange" @refresh="funGetTree">
@@ -104,6 +134,8 @@ onActivated(() => {
 						<table-cop class="" :data="tableData" :column="tableColumn" :loading="tableLoading"
 							:height="tableHeight" :tableId="tableShowId" :tableName="tableName" @export="funExport"></table-cop>
 					</div> -->
+
+
 				</el-col>
 			</el-row>
 		</div>

src/pages/search/create/components/search.vue

@@ -46,8 +46,7 @@ const funCheckAll = () => {
 	}
 }
 
-const nb=ref([])
-console.log(6666666666,nb.value);
+
 /**导出 */
 const emits = defineEmits(['submit'])
 const funSubmit = async () => {

src/pages/search/create/index.vue

@@ -1,10 +1,15 @@
 <script setup name="prepare">
-import searchCop from "./components/search.vue";
-import excelCop from "@/components/excel.vue";
 import treeCop from "@/components/tree.vue";
 import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
-import { onMounted, ref, onActivated, nextTick } from "vue";
+import {
+  onMounted,
+  ref,
+  reactive,
+  onActivated,
+  nextTick,
+  onUnmounted,
+} from "vue";
 import request from "@/api/axios.js";
 import { baseURL, socketURL } from "@/api/axios.js";
 /**配置参数 */
@@ -14,6 +19,7 @@ const tableHeight = ref(window.innerHeight - 260 + "px");
 
 /**tree 开始 */
 const treeData = ref([]);
+
 const actTreeNode = ref(null); //当前激活的treeNode
 const funRepeatMap = (arr) => {
   return arr.map((o) => {
@@ -90,15 +96,12 @@ const funGetTree = async () => {
   });
 
   setTimeout(() => {
-
     treeData.value = tempTreeData;
-
   }, 1000);
 
   // nextTick(()=>{
   //    treeData.value=tempTreeData;
   // })
-
 };
 
 const funCurrentChange = async ({ current, currentNode }) => {
@@ -114,7 +117,7 @@ const funCurrentChange = async ({ current, currentNode }) => {
       }
     }
   }
-
+  sessionStorage.setItem("myData", JSON.stringify({ nxxy: databaseName }));
   //拿取表格数据
   const res = await request.post(
     "/rest/sql",
@@ -144,8 +147,98 @@ const funCurrentChange = async ({ current, currentNode }) => {
     newdata.push(dateItem);
   });
   // console.log(999999,newdata);
+
   tableData.value = newdata;
-  // console.log('66b',tableData.value);
+
+  console.log("66b", tableData.value);
+
+  if (stationList.value == "") {
+    const ros = await request.post(
+      "/rest/sql",
+      `SELECT DISTINCT station FROM ${databaseName}.${tableName}`
+    );
+    console.log(6666666666666666, ros);
+    let nbdata = [];
+    ros.data.forEach((ele) => {
+      ele?.[0] && nbdata.push(ele[0]);
+    });
+    // console.log(55555,nbdata);
+
+    stationList.value = nbdata;
+
+    console.log(7777777777, stationList.value);
+    if (stationList.value.length) {
+      queryForm.station = stationList.value[0];
+    }
+  }
+};
+
+const queryForm = reactive({
+  station: "",
+  tbname: "",
+  description: "",
+  uniformcode: "",
+});
+
+const stationList = ref([]);
+
+const funStationChange = (val) => {
+  console.log(111111111111, val);
+  queryForm.station = val;
+};
+let myData = JSON.parse(sessionStorage.getItem("myData"));
+// console.log(myData.nxxy);
+
+const nbsubmit = async () => {
+  if (queryForm.tbname == "" || queryForm.station == "") {
+    ElMessage.error("测点不能为空");
+  } else {
+    const res = await request.post(
+      "/rest/sql",
+      `SELECT tbname as point,description,ts,val,station,category,facility,uniformcode,rate,remark FROM ${
+        tableData.value[0].databaseName
+      }.${tableData.value[0].tableName}
+   where ${
+     queryForm.station === "all"
+       ? ""
+       : "station='" + queryForm.station + "' and"
+   } tbname like '%${queryForm.tbname}%' ${
+        queryForm.description === ""
+          ? ""
+          : "and description like '%" + queryForm.description + "%'"
+      } ${
+        queryForm.uniformcode === ""
+          ? ""
+          : "and uniformcode=" + queryForm.uniformcode
+      } limit ${pagenumber.value - 1}, ${pagenb.value - 1}
+   `
+    );
+    console.log(666666666666, res);
+    let newdata = [];
+    const map = {
+      0: "point",
+      1: "description",
+      2: "ts",
+      3: "val",
+      4: "station",
+      5: "category",
+      6: "equipment",
+      7: "uniformcode",
+      8: "rate",
+      9: "remark",
+    };
+    res.data.forEach((ele) => {
+      let dateItem = {};
+      for (let key in ele) {
+        dateItem[map[key]] = ele[key];
+      }
+      // dateItem.databaseName = databaseName;
+      // dateItem.tableName = tableName;
+      newdata.push(dateItem);
+    });
+    console.log(999999, newdata);
+    tableData.value = newdata;
+  }
 };
 
 // 传递数据
@@ -163,35 +256,10 @@ const dbclick = (a) => {
   });
 };
 
-
-/**table 开始 */
-// const tableShowId = ref("");
 const tableName = ref("");
 const tableLoading = ref(false);
 const tableData = ref([]);
 
-/**submit */
-const progress = ref(0);
-const funWebSocket = () => {
-  const webSocket = new WebSocket(`${socketURL}/ws/powerfitting/admin`);
-  webSocket.onerror = () =>
-    setTimeout(() => {
-      funWebSocket();
-    }, 2000);
-
-  webSocket.onmessage = (event) => {
-    const message = JSON.parse(event.data);
-    if (message.code === 200) {
-      progress.value = Number(message.data) * 100;
-      if (progress.value === 100) {
-        ElMessage.success("数据加载完成");
-        funGetTree();
-        progress.value = 0;
-      }
-    }
-  };
-};
-
 const funSubmit = async (params) => {
   const res = await request.get("/power/prepare/data", { params: params });
   if (res.code === 200) {
@@ -199,7 +267,34 @@ const funSubmit = async (params) => {
   }
 };
 
-funWebSocket();
+let pagenumber = ref(1); //当前的页数
+
+console.log(666666, pagenumber.value);
+const left1 = () => {
+  pagenumber.value -= 1;
+  // funCurrentChange()
+};
+
+const right1 = () => {
+  pagenumber.value += 1;
+  // funCurrentChange()
+};
+
+const pagenb = ref(100); //当前的条数
+
+//  const timer = ref(null);
+
+function startTimer() {
+  treeData.value = setInterval(() => {
+    //  funCurrentChange()
+    console.log("刷新数据");
+  }, 2000);
+}
+
+function stopTimer() {
+  clearInterval(treeData.value);
+}
+
 /**mounted */
 onMounted(() => {
   tableHeight.value = window.innerHeight - 260 + "px";
@@ -210,7 +305,12 @@ onMounted(() => {
     excelHeight.value = window.innerHeight - 260 + "px";
     treeHeight.value = window.innerHeight - 260 + "px";
   });
+  startTimer();
+});
+onUnmounted(() => {
+  stopTimer();
 });
+
 /**activated */
 onActivated(() => {
   funGetTree();
@@ -218,16 +318,50 @@ onActivated(() => {
 </script>
 <template>
   <div class="bg-white py-[10px] px-[10px] relative">
-    <search-cop
-      class="mb-[20px] shadow rounded-[6px] shadow-blue-500"
-      @submit="funSubmit"
+    <div
+      class="pl-[20px] flex items-center h-[80px] relative mb-[20px] shadow rounded-[6px] shadow-blue-500"
     >
-    </search-cop>
+      <el-form class="" :inline="true" :model="queryForm">
+        <el-form-item label="场站" class="!mb-0">
+          <el-select
+            v-model="queryForm.station"
+            class="w-[150px]"
+            @change="funStationChange"
+          >
+            <el-option
+              label="全选"
+              value="all"
+              v-if="queryForm.station?.length"
+            />
+            <el-option
+              v-for="item in stationList"
+              :key="index"
+              :label="item"
+              :value="item"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="测点" class="!mb-0">
+          <el-input v-model="queryForm.tbname" />
+        </el-form-item>
+        <el-form-item label="描述" class="!mb-0">
+          <el-input v-model="queryForm.description" />
+        </el-form-item>
+        <el-form-item label="统一识别码" class="!mb-0">
+          <el-input v-model="queryForm.uniformcode" />
+        </el-form-item>
+        <el-form-item class="!mb-0">
+          <el-button type="primary" @click="nbsubmit">查询</el-button>
+          <!-- <submit-btn v-prevdbclick:5000="funSubmit" desc="查询"></submit-btn>
+                <submit-btn v-prevdbclick:5000="funSubmit" desc="导出"></submit-btn> -->
+        </el-form-item>
+      </el-form>
+    </div>
     <div
-      class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[20px] pb-[10px]">
-     
+      class="relative shadow rounded-[6px] shadow-blue-500 px-[10px] pt-[20px] pb-[10px]"
+    >
       <el-row :gutter="10">
-        <el-col :span="5">
+        <el-col :span="4">
           <tree-cop
             :data="treeData"
             :height="treeHeight"
@@ -237,25 +371,33 @@ onActivated(() => {
           >
           </tree-cop>
         </el-col>
-       
+
         <el-col :span="19">
           <div>
             <el-scrollbar max-height="650px">
-
               <el-table
                 :data="tableData"
-                style="width: 100% ,height:800px"
+                style="width: 100% ,height:650px"
                 @cell-dblclick="dbclick"
               >
-
-                <el-table-column prop="point" label="测点" align="center" width="200"/>
+                <el-table-column
+                  prop="point"
+                  label="测点"
+                  align="center"
+                  width="200"
+                />
                 <el-table-column
                   prop="description"
                   label="描述"
                   align="center"
                   width="200"
                 />
-                <el-table-column prop="ts" label="时间" align="center" width="200"/>
+                <el-table-column
+                  prop="ts"
+                  label="时间"
+                  align="center"
+                  width="200"
+                />
                 <el-table-column prop="val" label="值" align="center" />
                 <el-table-column prop="station" label="场站" align="center" />
                 <el-table-column prop="category " label="类别" align="center" />
@@ -273,13 +415,19 @@ onActivated(() => {
                 <el-table-column prop="remark" label="备注" align="center" />
               </el-table>
             </el-scrollbar>
-            
           </div>
-           <!-- <el-pagination layout="prev, pager, next" :total="1000" /> -->
+          <div>
+            <el-button
+              @click="left1"
+              :disabled="pagenumber.value >= 1"
+              class="ml-5"
+              >上一页</el-button
+            >
+            <span class="pl-2">{{ pagenumber }}</span>
+            <el-button @click="right1" class="ml-5">下一页</el-button>
+          </div>
         </el-col>
       </el-row>
     </div>
-
-
   </div>
 </template>

src/router/index.js

@@ -35,7 +35,7 @@ const routes = [{
                             '../pages/search/create/index.vue'
                         ),
                         
-                }
+                },
             ]
         },
        
@@ -63,7 +63,7 @@ const routes = [{
                         import(
                             '../pages/redis/create/index.vue'
                         ),
-                }
+                },
             ]
         },
        
@@ -91,23 +91,23 @@ const routes = [{
                         import(
                             '../pages/buildTable/create/index.vue'
                         ),
-                }
+                },
             ]
         },
         
-        {
-            icon: 'iconfont iconbaojingpeizhi',
-            path: '/look',
-            name: 'look',
-            redirect: '/look/create',
-            meta: {
-                title: '高级查询',
-            },
-            component: () =>
-                import(
-                    '../pages/routerViewss.vue'
-                ),
-            children: [
+        // {
+        //     icon: 'iconfont iconbaojingpeizhi',
+        //     path: '/look',
+        //     name: 'look',
+        //     redirect: '/look/create',
+        //     meta: {
+        //         title: '高级查询',
+        //     },
+        //     component: () =>
+        //         import(
+        //             '../pages/routerViewss.vue'
+        //         ),
+        //     children: [
                 {
                     icon: 'el-icon-s-home',
                     path: '/look/create',
@@ -120,8 +120,8 @@ const routes = [{
                             '../pages/look/create/index.vue'
                         ),
                 }
-            ]
-        },
+        //     ]
+        // },
 
      
         //  {