样式修改

ems-ui/package.json

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@antv/x6": "^2.18.1",
-    "@riophae/vue-treeselect": "0.4.0",
+    "@riophae/vue-treeselect": "^0.4.0",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "^3.25.3",

ems-ui/src/views/basecfg/area/index.vue

@@ -112,57 +112,103 @@
 
     <!-- 添加或修改服务区对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="180px">
-        <el-form-item label="地块代码" prop="areaCode">
-          <el-input v-model="form.areaCode" placeholder="请输入地块代码" :readonly="isReadOnly"/>
-        </el-form-item>
-        <el-form-item label="地块名称" prop="areaName">
-          <el-input v-model="form.areaName" placeholder="请输入地块名称" />
-        </el-form-item>
-        <el-form-item label="地块简称" prop="shortName">
-          <el-input v-model="form.shortName" placeholder="请输入简称" />
-        </el-form-item>
-        <el-form-item label="服务星级" prop="serviceStar">
-          <el-input v-model="form.serviceStar" placeholder="请输入服务星级" />
-        </el-form-item>
-        <el-form-item label="所在城市" prop="city">
-          <el-input v-model="form.city" placeholder="请输入所在城市" />
-        </el-form-item>
-        <el-form-item label="所在高速" prop="highway">
-          <el-input v-model="form.highway" placeholder="请输入所在高速" />
-        </el-form-item>
-        <el-form-item label="方向" prop="direction">
-          <el-input v-model="form.direction" placeholder="请输入方向" />
-        </el-form-item>
-        <el-form-item label="地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入地址" />
-        </el-form-item>
-        <el-form-item label="所有单位" prop="attrOrg">
-          <el-input v-model="form.attrOrg" placeholder="请输入所有单位" />
-        </el-form-item>
-        <el-form-item label="管理单位" prop="mgrOrg">
-          <el-input v-model="form.mgrOrg" placeholder="请输入管理单位" />
-        </el-form-item>
-        <el-form-item label="开业时间" prop="openDate">
-          <el-date-picker clearable
-            v-model="form.openDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开业时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="占地面积（亩）" prop="landArea">
-          <el-input v-model="form.landArea" placeholder="请输入占地面积" />
-        </el-form-item>
-        <el-form-item label="建筑面积（平方米）" prop="floorArea">
-          <el-input v-model="form.floorArea" placeholder="请输入建筑面积" />
-        </el-form-item>
-        <el-form-item label="经度" prop="longitude">
-          <el-input v-model="form.longitude" placeholder="请输入经度" />
-        </el-form-item>
-        <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="form.latitude" placeholder="请输入纬度" />
-        </el-form-item>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px" class="form-inline">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="地块代码" prop="areaCode">
+              <el-input v-model="form.areaCode" placeholder="请输入地块代码" :readonly="isReadOnly"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地块名称" prop="areaName">
+              <el-input v-model="form.areaName" placeholder="请输入地块名称" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="地块简称" prop="shortName">
+              <el-input v-model="form.shortName" placeholder="请输入简称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="服务星级" prop="serviceStar">
+              <el-input v-model="form.serviceStar" placeholder="请输入服务星级" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所在城市" prop="city">
+              <el-input v-model="form.city" placeholder="请输入所在城市" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="所在高速" prop="highway">
+              <el-input v-model="form.highway" placeholder="请输入所在高速" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="方向" prop="direction">
+              <el-input v-model="form.direction" placeholder="请输入方向" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入地址" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="所有单位" prop="attrOrg">
+              <el-input v-model="form.attrOrg" placeholder="请输入所有单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理单位" prop="mgrOrg">
+              <el-input v-model="form.mgrOrg" placeholder="请输入管理单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="开业时间" prop="openDate" >
+              <el-date-picker clearable
+                              v-model="form.openDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择开业时间"  style="width: 130px;" >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="占地面积（亩）" prop="landArea">
+              <el-input v-model="form.landArea" placeholder="请输入占地面积" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="建筑面积（平方米）" prop="floorArea">
+              <el-input v-model="form.floorArea" placeholder="请输入建筑面积" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="经度" prop="longitude">
+              <el-input v-model="form.longitude" placeholder="请输入经度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="纬度" prop="latitude">
+              <el-input v-model="form.latitude" placeholder="请输入纬度" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

ems-ui/src/views/basecfg/building/index.vue

@@ -148,10 +148,16 @@
             <el-form-item label="地下层数" prop="downBldgFloor">
               <el-input v-model="form.downBldgFloor" placeholder="请输入建筑层数" />
             </el-form-item>
-            <el-form-item label="建筑高度" prop="bldgHeight">
+            <el-form-item label="建筑高度（米）" prop="bldgHeight">
               <el-input v-model="form.bldgHeight" placeholder="请输入建筑高度" />
             </el-form-item>
-            <el-form-item label="建筑面积" prop="floorArea">
+            <el-form-item prop="floorArea">
+              <template slot="label">
+                <div>
+                  <span>建筑面积</span>
+                  <span style="margin-left: 4px; display: block;">(平方米)</span>
+                </div>
+              </template>
               <el-input v-model="form.floorArea" placeholder="请输入建筑面积" />
             </el-form-item>
             <el-form-item label="主要用途" prop="bldgUsage">

ems-ui/src/views/basecfg/device/index.vue

@@ -12,7 +12,7 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="head-container" style="height: 100vh; overflow: hidden; position: relative;">
           <el-tree
             :data="areaOptions"
             :props="defaultProps"
@@ -23,6 +23,7 @@
             default-expand-all
             highlight-current
             @node-click="handleNodeClick"
+            style="height: calc(100vh - 50px); overflow-y: auto;"
           />
         </div>
       </el-col>

ems-ui/src/views/basecfg/emsfacs/index.vue

@@ -57,8 +57,19 @@
           <el-table-column label="设施子类" align="center" prop="facsSubtypeName" />
           <el-table-column label="启用状态" align="center" prop="enable">
             <template slot-scope="scope">
-              <!-- 根据status的值显示不同的文本 -->
-              <span>{{ scope.row.enable === 0 ? '关闭' : '启用' }}</span>
+              <span
+                :style="{
+                    padding: '6px 12px',
+                    borderRadius: '4px',
+                    display: 'inline-block',
+                    textAlign: 'center',
+                    cursor: 'pointer',
+                    color: scope.row.enable === 0 ? 'rgb(255,159,159)' : 'rgb(117,186,255)',
+                    backgroundColor: scope.row.enable === 0 ? 'rgb(255,235,235)' : 'rgb(232,244,255)'
+        }"
+              >
+        {{ scope.row.enable === 0 ? '关闭' : '启用' }}
+      </span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

ems-ui/src/views/basecfg/flowrel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="输出设施" prop="exportFacsCode">
+      <el-form-item label="所属服务区" prop="exportFacsCode" label-width="100ox">
         <el-select v-model="queryParams.areaCode" @change="getAllFacs" >
           <el-option v-for="item in areaOptions" :label="item.label" :value="item.id" :key="item.id" />
         </el-select>
@@ -68,10 +68,27 @@
       <el-table-column label="输出设施" align="center" prop="exportFacsName" />
       <el-table-column label="流入设施" align="center" prop="inputFacsName" />
       <el-table-column label="流动介质" align="center" prop="emsClsName" />
+<!--      <el-table-column label="供能状态" align="center" prop="state">-->
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash; 根据status的值显示不同的文本 &ndash;&gt;-->
+<!--          <span>{{ scope.row.state === 0 ? '停止' : '进行中' }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="供能状态" align="center" prop="state">
         <template slot-scope="scope">
-          <!-- 根据status的值显示不同的文本 -->
-          <span>{{ scope.row.state === 0 ? '停止' : '进行中' }}</span>
+              <span
+                :style="{
+                    padding: '6px 12px',
+                    borderRadius: '4px',
+                    display: 'inline-block',
+                    textAlign: 'center',
+                    cursor: 'pointer',
+                    color: scope.row.enable === 0 ? 'rgb(255,159,159)' : 'rgb(117,186,255)',
+                    backgroundColor: scope.row.enable === 0 ? 'rgb(255,235,235)' : 'rgb(232,244,255)'
+        }"
+              >
+        {{ scope.row.state === 0 ? '停止' : '进行中'  }}
+      </span>
         </template>
       </el-table-column>
       <el-table-column label="能流动作" align="center" prop="actionType" :formatter="getActionType"/>

ems-ui/src/views/devmgr/state/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" >
     <el-row :gutter="20">
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
+      <el-col :span="4" :xs="24" >
+        <div class="head-container" >
           <el-input
             v-model="areaName"
             placeholder="请输入区域名称"
@@ -12,7 +12,7 @@
             style="margin-bottom: 20px"
           />
         </div>
-        <div class="head-container">
+        <div class="head-container" style="height: 100vh; overflow: hidden; position: relative;">
           <el-tree
             :data="areaOptions"
             :props="defaultProps"
@@ -23,6 +23,7 @@
             default-expand-all
             highlight-current
             @node-click="handleNodeClick"
+            style="height: calc(100vh - 50px); overflow-y: auto;"
           />
         </div>
       </el-col>

ems-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://172.192.13.80:9100/`,
+        target: `http://127.0.0.1:9100/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API + '/ems']: process.env.EMS_REWRITE_URL,