Bladeren bron

fix:样式统一,设备删除接口联调

chenxinlei 2 jaren geleden
bovenliggende
commit
c5af1a65bb

+ 2 - 2
src/api/realtimeDatabaseConfiguration.js

@@ -15,7 +15,7 @@ const addDatabase =(pairs)=>{
 }
 const deleteDatabase =(data)=>{
   return request({
-      url:`/realtimeDatabaseConfiguration/remove-modelpower/${data.id}`,
+      url:`/realtimeDatabaseConfiguration/remove-modelpower?ids=${data.id}`,
       method:"delete",
   })
 }
@@ -36,7 +36,7 @@ const addManufacturer =(pairs)=>{
 }
 const deleteManufacturer =(data)=>{
   return request({
-      url:`/manufacturer/remove-manufacturer/${data.id}`,
+      url:`/manufacturer/remove-manufacturer?ids=${data.id}`,
       method:"delete",
   })
 }

+ 1 - 1
src/api/station.js

@@ -144,7 +144,7 @@ const addEquipmentmodel = (pairs) => {
 }
 const deleteEquipmentmodel = (data) => {
   return request({
-    url: `/equipmentmodel/remove-manufacturer/${data.id}`,
+    url: `/equipmentmodel/remove-manufacturer?ids=${data.id}`,
     method: 'delete',
   })
 }

+ 1 - 1
src/config/setting.config.js

@@ -5,7 +5,7 @@ const setting = {
   // 开发以及部署时的URL
   publicPath: '',
   // 生产环境构建文件的目录名
-  outputDir: 'dist',
+  outputDir: 'manage',
   // 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录。
   assetsDir: 'static',
   // 开发环境每次保存时是否输出为eslint编译警告

+ 2 - 2
src/views/meterpoint/components/TableEdit.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-		<el-form ref="form" :model="form" :rules="rules">
+		<el-form ref="form" :model="form" :rules="rules" label-width="120px">
 			<div class="lists">
 				<el-form-item label="id" prop="id">
 					<el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
@@ -19,7 +19,7 @@
 			</div>
 			<div class="lists">
 				<el-form-item label="风场编号" prop="windpowerstationid">
-					<el-select v-model="form.windpowerstationid" placeholder="请选择" clearable>
+					<el-select v-model="form.windpowerstationid" placeholder="请选择" clearable style="width:200px">
 						<el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
 						</el-option>
 					</el-select>

+ 1 - 1
src/views/pointConfiguration/components/TableEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-    <el-form ref="form" :model="form" :rules="rules"  label-width="80px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <!-- <el-form-item label="id" prop="id">
         <el-input placeholder="请输入" class="inputs" v-model.trim="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
       </el-form-item> -->

+ 3 - 3
src/views/realDatabaseConfig/components/TableEdit.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-		<el-form ref="form" :model="form" :rules="rules">
+		<el-form ref="form" :model="form" :rules="rules" label-width="120px">
 			<div class="lists">
 				<el-form-item label="id" prop="id">
 					<el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>
@@ -10,7 +10,7 @@
 				</el-form-item>
 			</div>
 			<div class="lists">
-				<el-form-item label="服务名历史" prop="namehist">
+				<el-form-item label="服务名历史" prop="namehist" width="150">
 					<el-input class="inputs" v-model="form.namehist" autocomplete="off"></el-input>
 				</el-form-item>
 				<el-form-item label="服务名配置" prop="namecmcfg">
@@ -27,7 +27,7 @@
 			</div>
 			<div class="lists">
 				<el-form-item label="风场编号" prop="windpowerstationid">
-					<el-select v-model="form.windpowerstationid" placeholder="请选择" clearable>
+					<el-select v-model="form.windpowerstationid" placeholder="请选择" clearable style="width:200px">
 						<el-option v-for="item in stationList" :key="item.id" :label="item.name" :value="item.id">
 						</el-option>
 					</el-select>

+ 3 - 3
src/views/realDatabaseConfig/index.vue

@@ -28,10 +28,10 @@
 				<el-table-column show-overflow-tooltip type="selection" align="center" width="40"></el-table-column>
 				<el-table-column show-overflow-tooltip label="id" prop="id" align="center" sortable></el-table-column>
 				<el-table-column show-overflow-tooltip label="服务名" prop="surname" align="center" sortable></el-table-column>
-				<el-table-column show-overflow-tooltip label="服务名历史" prop="namehist" align="center" sortable></el-table-column>
-				<el-table-column show-overflow-tooltip label="服务名配置" prop="namecmcfg" align="center" sortable>
+				<el-table-column width="120" show-overflow-tooltip label="服务名历史" prop="namehist" align="center" sortable></el-table-column>
+				<el-table-column width="120" show-overflow-tooltip label="服务名配置" prop="namecmcfg" align="center" sortable>
 				</el-table-column>
-				<el-table-column show-overflow-tooltip label="服务名实时" prop="namerts" align="center" sortable>
+				<el-table-column width="120" show-overflow-tooltip label="服务名实时" prop="namerts" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="点标签" prop="label" align="center" sortable></el-table-column>
 				<el-table-column show-overflow-tooltip label="风场编号" prop="windpowerstationid" align="center" sortable>

+ 1 - 7
src/views/stationConfiguration/equipmentmodel/components/TableEdit.vue

@@ -1,12 +1,6 @@
 <template>
-
-
-
-
-
-
   <el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-    <el-form ref="form" :model="form" :rules="rules">
+    <el-form ref="form" :model="form" :rules="rules" label-width="150px">
       <div class="lists">
         <el-form-item label="id" prop="id">
           <el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd ? true : false"></el-input>

+ 2 - 2
src/views/stationConfiguration/equipmentmodel/index.vue

@@ -36,14 +36,14 @@
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="图片" prop="photo" align="center" sortable>
 				</el-table-column>
-				<el-table-column show-overflow-tooltip label="传输总发电量单位" prop="unit" align="center" sortable></el-table-column>
+				<el-table-column width="180" show-overflow-tooltip label="传输总发电量单位" prop="unit" align="center" sortable></el-table-column>
 				<el-table-column show-overflow-tooltip label="切入风速" prop="cutinwindspeed" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="额定风速" prop="ratedwindspeed" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="切出风速" prop="cutoutwindspeed" align="center" sortable>
 				</el-table-column>
-				<el-table-column show-overflow-tooltip label="叶片切入面积" prop="sweptarea" align="center" sortable>
+				<el-table-column width="150" show-overflow-tooltip label="叶片切入面积" prop="sweptarea" align="center" sortable>
 				</el-table-column>
 				<el-table-column show-overflow-tooltip label="设备类别" prop="equipmentcategory" align="center" sortable>
 				</el-table-column>

+ 1 - 1
src/views/stationConfiguration/manufacturer/components/TableEdit.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-		<el-form ref="form" :model="form" :rules="rules">
+		<el-form ref="form" :model="form" :rules="rules" label-width="120px">
 			<div class="lists">
 				<el-form-item label="id" prop="id">
 					<el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>

+ 1 - 1
src/views/stationConfiguration/modelpower/components/TableEdit.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-		<el-form ref="form" :model="form" :rules="rules">
+		<el-form ref="form" :model="form" :rules="rules" label-width="150px">
 			<div class="lists">
 				<el-form-item label="id" prop="id">
 					<el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>

+ 3 - 3
src/views/stationConfiguration/projectstudy/components/TableEdit.vue

@@ -1,8 +1,8 @@
 <template>
 	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-		<el-form ref="form" :model="form" :rules="rules">
+		<el-form ref="form" :model="form" :rules="rules" label-width="120px">
 			<el-form-item label="场站" prop="cascaderSel" v-if="idAdd">
-				<el-cascader v-model="form.cascaderSel" :options="options"
+				<el-cascader v-model="form.cascaderSel" :options="options" style="width: 200px;"
 					:props="{ checkStrictly: true, label: 'name', value: 'id' }" clearable>
 				</el-cascader>
 			</el-form-item>
@@ -19,7 +19,7 @@
 				<el-input class="inputs" v-model="form.outagehours"></el-input>
 			</el-form-item>
 			<el-form-item label="请选择日期" prop="dateValues">
-				<el-date-picker v-model="form.dateValues" type="month" placeholder="选择月" :disabled="!idAdd?true:false">
+				<el-date-picker style="width: 200px;" v-model="form.dateValues" type="month" placeholder="选择月" :disabled="!idAdd?true:false">
 				</el-date-picker>
 			</el-form-item>
 		</el-form>

+ 1 - 1
src/views/stationConfiguration/windsubstation/components/TableEdit.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-dialog :title="title" :visible.sync="dialogFormVisible" width="800px" @close="close">
-		<el-form ref="form" :model="form" :rules="rules">
+		<el-form ref="form" :model="form" :rules="rules" label-width="120px">
 			<div class="lists">
 				<el-form-item label="id" prop="id">
 					<el-input class="inputs" v-model="form.id" autocomplete="off" :disabled="!idAdd?true:false"></el-input>

+ 1 - 1
src/views/stationConfiguration/windsubstation/index.vue

@@ -13,7 +13,7 @@
 				</div>
 				<div class="right">
 					<el-button icon="el-icon-plus" type="primary" @click="handleAdd">
-						添加成功
+						添加
 					</el-button>
 					<el-button icon="el-icon-delete" type="danger" @click="handleDelete">
 						删除