merge

.env.development

@@ -2,9 +2,8 @@
 ENV = 'development'
 
 # 本地环境接口地址
-#VITE_API_URL = 'http://101.200.198.249:8899/api/v1'
-VITE_IMG_URL = 'http://101.200.198.249:8899/'
+VITE_API_URL = 'http://zhgy.sagoo.cn:8899/api/v1'
+VITE_IMG_URL = 'http://zhgy.sagoo.cn:8899/'
 VITE_ASSESS_URL = 'http://zhgy.sagoo.cn/base-api/assess/v1'
-VITE_NETWORK_URL = 'http://zhgy.sagoo.cn:8899/api/v1/network'
-VITE_API_URL = 'http://sgadserver.wdeveloperw.xyz/api/v1'
-# VITE_IMG_URL = 'http://sgadserver.wdeveloperw.xyz/'
+# VITE_API_URL = 'http://sgadserver.wdeveloperw.xyz/api/v1'
+# VITE_IMG_URL = 'http://sgadserver.wdeveloperw.xyz/'

.env.production

@@ -5,6 +5,6 @@ ENV = 'production'
 VITE_PUBLIC_PATH = /
 
 # 线上环境接口地址
-VITE_API_URL = 'http://101.200.198.249:8899/api/v1'
-VITE_IMG_URL = 'http://101.200.198.249:8899/'
+VITE_API_URL = 'http://zhgy.sagoo.cn:8899/api/v1'
+VITE_IMG_URL = 'http://zhgy.sagoo.cn:8899/'
 VITE_ASSESS_URL = 'http://zhgy.sagoo.cn/base-api/assess/v1'

src/api/network/index.ts

@@ -2,26 +2,23 @@
  * @Author: vera_min vera_min@163.com
  * @Date: 2022-09-05 08:41:57
  * @LastEditors: vera_min vera_min@163.com
- * @LastEditTime: 2022-09-06 17:18:17
+ * @LastEditTime: 2022-09-07 08:35:57
  * @FilePath: /sagoo-admin-ui/src/api/network/index.ts
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-import { get, post, del, put } from '/@/utils/request_network';
+import { get, post, del } from '/@/utils/request';
 
 export default {
   tunnel: {
-    getList: (params?: object) => get('/tunnel/list', params),
-    deleteItem: (params?: object) => del('/tunnel/delete', params),
-    getDetail: (params?: object) => get('/tunnel/get', params),
-    changeTunnelStatus: (params?: object) => post('/tunnel/status', params),
-  
+    getList: (params?: object) => get('/network/tunnel/list', params),
+    deleteItem: (params?: object) => del('/network/tunnel/delete', params),
+    getDetail: (params?: object) => get('/network/tunnel/get', params),
+    changeTunnelStatus: (params?: object) => post('/network/tunnel/status', params),
   },
   server: {
-    getList: (params?: object) => get('/server/list', params),
-    deleteItem: (params?: object) => del('/server/delete', params),
-    getDetail: (params?: object) => get('/get', params),
-    changeServerStatus: (params?: object) => post('/server/status', params),
-  
+    getList: (params?: object) => get('/network/server/list', params),
+    deleteItem: (params?: object) => del('/network/server/delete', params),
+    getDetail: (params?: object) => get('/network/get', params),
+    changeServerStatus: (params?: object) => post('/network/server/status', params),
   }
-
 }

src/utils/request_network.ts

@@ -1,106 +0,0 @@
-import axios from 'axios';
-import { ElMessage, ElMessageBox } from 'element-plus';
-import { Session } from '/@/utils/storage';
-
-// 配置新建一个 axios 实例
-const service = axios.create({
-	baseURL: import.meta.env.VITE_NETWORK_URL,
-	timeout: 50000,
-	headers: { 'Content-Type': 'application/json' },
-});
-
-// 添加请求拦截器
-service.interceptors.request.use(
-	(config) => {
-		// 在发送请求之前做些什么 token
-		if (Session.get('token')) {
-			// (<any>config.headers).common['Authorization'] = `Bearer ${Session.get('token')}`;
-		}
-		return config;
-	},
-	(error) => {
-		// 对请求错误做些什么
-		return Promise.reject(error);
-	}
-);
-
-// 添加响应拦截器
-service.interceptors.response.use(
-	(response) => {
-		// 对响应数据做点什么
-		const res = response.data;
-		const code = response.data.code
-		if (code === 401) {
-			ElMessageBox.alert('登录状态已过期，请重新登录', '提示', { confirmButtonText: '确定' })
-				.then(() => {
-					Session.clear(); // 清除浏览器全部临时缓存
-					window.location.href = '/'; // 去登录页
-				})
-				.catch(() => { });
-		} else if (code !== 0) {
-			ElMessage.error(res.message)
-			return Promise.reject(new Error(res.message))
-		} else {
-			// 分页的数据
-			if (res.data?.Total !== undefined) {
-				return {
-					list: res.data.Data,
-					total: res.data.Total,
-					page: res.data.currentPage,
-					...res.data,
-				}
-			}
-			if (res.data?.Data) {
-				return res.data.Data 
-			}
-			if (res.data?.Data === undefined) {
-				return res.data
-			}
-		}
-	},
-	(error) => {
-		// 对响应错误做点什么
-		if (error.message.indexOf('timeout') != -1) {
-			ElMessage.error('网络超时');
-		} else if (error.message == 'Network Error') {
-			ElMessage.error('网络连接错误');
-		} else {
-			if (error.response.data) ElMessage.error(error.response.statusText);
-			else ElMessage.error('接口路径找不到');
-		}
-		return Promise.reject(error);
-	}
-);
-
-// 导出 axios 实例
-export default service;
-
-export function get(url: string, params?: any): any {
-	return service({
-		url,
-		method: "get",
-		params
-	})
-}
-
-export function post(url: string, data?: any): any {
-	return service({
-		url,
-		method: "post",
-		data
-	})
-}
-export function put(url: string, data?: any): any {
-	return service({
-		url,
-		method: "put",
-		data
-	})
-}
-export function del(url: string, data?: any): any{
-	return service({
-		url,
-		method: "delete",
-		data
-	})
-}

src/views/datahub/modeling/component/edit.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '模型'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
 				<el-form-item label="模型标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入模型名称" />
+					<el-input v-model="ruleForm.key" placeholder="请输入模型名称"  :disabled="ruleForm.id"/>
 				</el-form-item>
 				<el-form-item label="模型名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入模型名称" />

src/views/datahub/source/component/edit.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.sourceId !== 0 ? '修改' : '添加') + '数据源'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
 				<el-form-item label="数据源标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入数据源名称" />
+					<el-input v-model="ruleForm.key" placeholder="请输入数据源名称"  :disabled="ruleForm.sourceId"/>
 				</el-form-item>
 				<el-form-item label="数据源名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入数据源名称" />

src/views/datahub/source/component/editNode.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.nodeId !== 0 ? '修改' : '添加') + '数据节点'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
 				<el-form-item label="数据节点标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入数据节点名称" />
+					<el-input v-model="ruleForm.key" placeholder="请输入数据节点名称"  :disabled="ruleForm.nodeId"/>
 				</el-form-item>
 				<el-form-item label="数据节点名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入数据节点名称" />

src/views/device/instance/component/edit.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id!==0?'修改':'添加')+'设备'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="110px">
        <el-form-item label="设备标识" prop="key">
-          <el-input v-model="ruleForm.key" placeholder="请输入设备标识" />
+          <el-input v-model="ruleForm.key" placeholder="请输入设备标识" :disabled="ruleForm.id" />
         </el-form-item>
         <el-form-item label="设备名称" prop="name">
           <el-input v-model="ruleForm.name" placeholder="请输入设备名称" />

src/views/device/product/component/editAttr.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '属性定义'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
 				<el-form-item label="属性定义标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入属性定义标识" />
+					<el-input v-model="ruleForm.key" placeholder="请输入属性定义标识" :disabled="ruleForm.id!== 0 ?true : false" />
 				</el-form-item>
 				<el-form-item label="属性定义名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入属性定义名称" />

src/views/device/product/component/editEvent.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '事件定义'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
 				<el-form-item label="事件定义标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" />
+					<el-input v-model="ruleForm.key" placeholder="请输入事件定义标识" :disabled="ruleForm.id!== 0 ?true : false"/>
 				</el-form-item>
 				<el-form-item label="事件定义名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入事件定义名称" />

src/views/device/product/component/editFun.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '功能定义'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
 				<el-form-item label="功能定义标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入功能定义标识" />
+					<el-input v-model="ruleForm.key" placeholder="请输入功能定义标识"  :disabled="ruleForm.id!== 0 ?true : false"/>
 				</el-form-item>
 				<el-form-item label="功能定义名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入功能定义名称" />

src/views/device/product/component/editOption.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '参数'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
 				<el-form-item label="参数标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入参数标识" />
+					<el-input v-model="ruleForm.key" placeholder="请输入参数标识" :disabled="ruleForm.id!== 0 ?true : false" />
 				</el-form-item>
 				<el-form-item label="参数名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入参数名称" />

src/views/device/product/component/editPro.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id!==0?'修改':'添加')+'产品'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
         <el-form-item label="产品标识" prop="key">
-          <el-input v-model="ruleForm.key" placeholder="请输入产品标识" />
+          <el-input v-model="ruleForm.key" placeholder="请输入产品标识" :disabled="ruleForm.id" />
         </el-form-item>
         <el-form-item label="产品名称" prop="name">
           <el-input v-model="ruleForm.name" placeholder="请输入产品名称" />

src/views/device/product/component/editTab.vue

@@ -3,7 +3,7 @@
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '标签定义'" v-model="isShowDialog" width="769px">
 			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="120px">
 				<el-form-item label="标签定义标识" prop="key">
-					<el-input v-model="ruleForm.key" placeholder="请输入标签定义标识" />
+					<el-input v-model="ruleForm.key" placeholder="请输入标签定义标识" :disabled="ruleForm.id!== 0 ?true : false" />
 				</el-form-item>
 				<el-form-item label="标签定义名称" prop="name">
 					<el-input v-model="ruleForm.name" placeholder="请输入标签定义名称" />

src/views/screen/tools.vue

@@ -0,0 +1,18 @@
+<template>
+  <div class="page-wrapper page-full">
+    <iframe class="iframe" :src="src" frameborder="0"></iframe>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { Session } from '/@/utils/storage';
+const src = 'http://home.yanglizhi.cn:10003/?token=' + encodeURIComponent(Session.get('token'))
+</script>
+
+<style scoped lang="scss">
+  .iframe{
+    width: 100%;
+    height: 100%;
+    background: #fff;
+  }
+</style>