Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

.env.development

@@ -2,11 +2,11 @@
 ENV = 'development'
 
 # 本地环境接口地址
-#VITE_API_URL = 'http://zhgy.sagoo.cn:8899/api/v1'
+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_SCREEN_URL = 'http://home.yanglizhi.cn:10003'
 VITE_TOPO_URL = 'http://home.yanglizhi.cn:10001'
 VITE_WS_URL = 'ws://zhgy.sagoo.cn:8899/api/v1/websocket'
-VITE_API_URL = 'http://sgadserver.wdeveloperw.xyz/api/v1'
+#VITE_API_URL = 'http://sgadserver.wdeveloperw.xyz/api/v1'
 # VITE_IMG_URL = 'http://sgadserver.wdeveloperw.xyz/'

package-lock.json

@@ -1849,7 +1849,7 @@
       "dependencies": {
         "@popperjs/core": {
           "version": "npm:@sxzz/popperjs-es@2.11.7",
-          "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+          "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
           "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
         }
       }

src/api/datahub/index.ts

@@ -47,4 +47,10 @@ export default {
       undeploy: (data: object) => post('/source/template/undeploy', data),  
    },
   
+   weather:{
+      getCityWeatherList: () => get('/region/weather/cityWeatherList'),
+      getWhichCityWeather: (params: object) => get('/region/weather/getInfoById', params),
+      getTemperatureEchartById: (params: object) => get('/region/weather/getTemperatureEchartById', params),
+      getWindpowerEchartById: (params: object) => get('/region/weather/getWindpowerEchartById', params),
+   }
 }

src/api/system/index.ts

@@ -131,7 +131,7 @@ export default {
   },
   city: {
     getList: (params: object) => get('/common/city/tree', params),
-    add: (data: object) => post('/common/city/tree', data),
+    add: (data: object) => post('/common/city/add', data),
     edit: (data: object) => put('/common/city/edit', data),
     del: (id: number) => del('/common/city/del', { id }),
     detail: (id: number) => get('/common/city/getInfoById', { id }),

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

@@ -57,6 +57,12 @@
 					<el-input v-model="ruleForm.default" placeholder="请输入取值项" />
 				</el-form-item>
 
+				<el-form-item label="是否主键" prop="isPk">
+					<el-radio-group v-model="ruleForm.isPk" >
+						<el-radio :label="0">否</el-radio>
+						<el-radio :label="1">是</el-radio>
+					</el-radio-group>
+				</el-form-item>
 
 				<el-form-item label="是否排序" prop="isSorting">
 					<el-radio-group v-model="ruleForm.isSorting" >
@@ -68,8 +74,8 @@
 
 				<el-form-item label="排序方式" prop="isDesc">
 					<el-radio-group v-model="ruleForm.isDesc" >
-						<el-radio :label="1">倒序</el-radio>
-						<el-radio :label="2">正序</el-radio>
+						<el-radio :label="0">倒序</el-radio>
+						<el-radio :label="1">正序</el-radio>
 					</el-radio-group>
 				</el-form-item>
 
@@ -104,6 +110,7 @@ interface RuleFormState {
 	default: string;
 	isSorting: number;
 	isDesc: number;
+	isPk: number;
 	desc: string;
 	status: number;
 }
@@ -176,7 +183,8 @@ export default defineComponent({
 				key: '',
 				from: 1,
 				isSorting: 0,
-				isDesc: 1,
+				isDesc: 0,
+				isPk: 0,
 				default: '',
 				desc: '',
 			},
@@ -195,9 +203,9 @@ export default defineComponent({
 		const openDialog = (row: RuleFormState | null) => {
 			resetForm();
 
-			console.log(row);
 			if (row?.id) {
 				state.ruleForm = row;
+				console.log(state.ruleForm);
 			}
 
 			if (row.sourceId) {
@@ -207,6 +215,8 @@ export default defineComponent({
 			state.isShowDialog = true;
 
 			getSouData();
+		
+
 		};
 
 		const getSouData = () => {
@@ -248,7 +258,8 @@ export default defineComponent({
 				key: '',
 				from: 1,
 				isSorting: 0,
-				isDesc: 1,
+				isDesc: 0,
+				isPk: 0,
 				default: '',
 				desc: '',
 			};

src/views/datahub/source/detail.vue

@@ -23,7 +23,7 @@
 							{{ detail.name }}
 						</el-form-item>
 						<el-form-item label="数据源描述:">
-							{{ detail.description }}
+							{{ detail.desc }}
 						</el-form-item>
 						<el-form-item label="数据来源:">
 							<span v-if="detail.from == 1">api导入</span>

src/views/system/city/component/edit.vue

@@ -18,7 +18,7 @@
 					/>
 				</el-form-item>
 				<el-form-item label="城市名称" prop="name">
-					<el-input v-model="ruleForm.name" placeholder="请输入换热站名称" />
+					<el-input v-model="ruleForm.name" placeholder="请输入城市名称" />
 				</el-form-item>
 				<el-form-item label="城市编号" prop="code">
 					<el-input v-model="ruleForm.code" placeholder="请输入城市编号" />

src/views/system/city/index.vue

@@ -28,12 +28,6 @@
               </el-icon>
               新增
             </el-button>
-            <!-- <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)">
-              <el-icon>
-                <ele-Delete />
-              </el-icon>
-              删除
-            </el-button> -->
           </el-form-item>
         </el-form>
       </div>
@@ -162,7 +156,7 @@ export default defineComponent({
 				type: 'warning',
 			})
 				.then(() => {
-					api.heatStation.del(row.id).then(() => {
+					api.city.del(row.id).then(() => {
 						ElMessage.success('删除成功');
 						queryList();
 					});