功能分组样式

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

@@ -111,7 +111,10 @@
             </el-form-item>
             <el-form-item label="启用状态" prop="enable">
               <el-select v-model="form.enable" style="width:100%">
-                <el-option v-for="item in enableOptions" :label="item.name" :value="item.code" :key="item.code" />
+                <el-option v-for="item in enableOptions"
+                           :label="item.name"
+                           :value="item.code"
+                           :key="item.code" />
               </el-select>
             </el-form-item>
           </el-form>

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

@@ -68,26 +68,26 @@
       <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">
-              <span
-                :style="{
-                    padding: '6px 12px',
-                    borderRadius: '4px',
+           <span
+             :style="{
                     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 ? '停止' : '进行中'  }}
+                    color:parseInt(scope.row.state) ===0 ? 'rgb(255,159,159)' : 'rgb(117,186,255)',
+                    backgroundColor: parseInt(scope.row.state) ===0 ? 'rgb(255,235,235)' : 'rgb(232,244,255)',
+                    fontSize: '13px',
+                    fontFamily: 'Arial, sans-serif',
+                    fontWeight: 'normal',
+                    width: '65px',
+                    height: '40px',
+                    lineHeight: '40px',
+                    padding: '0 10px',
+                    borderRadius: '4px',
+                    boxSizing: 'border-box',
+        }">
+        {{ parseInt(scope.row.state)===0?  '停止': '进行中'  }}
       </span>
         </template>
       </el-table-column>

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

@@ -99,7 +99,30 @@
           <el-table-column label="分区编码" align="center" prop="zoningCode" width="200"/>
           <el-table-column label="所在建筑" align="left" prop="areaPath" />
           <el-table-column label="区块标签" align="center" prop="tagNames" />
-          <el-table-column label="使用详情" align="center" prop="usageDetail" />
+          <el-table-column label="使用详情" align="center" prop="usageDetail">
+            <template slot-scope="scope">
+              <span
+                :style="{
+                    display: 'inline-block',
+                    textAlign: 'center',
+                    cursor: 'pointer',
+                    color:parseInt(scope.row.usageDetail) ===0 ? 'rgb(255,159,159)' : 'rgb(117,186,255)',
+                    backgroundColor: parseInt(scope.row.usageDetail) ===0 ? 'rgb(255,235,235)' : 'rgb(232,244,255)',
+                    fontSize: '13px',
+                    fontFamily: 'Arial, sans-serif',
+                    fontWeight: 'normal',
+                    width: '65px',
+                    height: '40px',
+                    lineHeight: '40px',
+                    padding: '0 10px',
+                    borderRadius: '4px',
+                    boxSizing: 'border-box',
+        }">
+
+        {{ parseInt(scope.row.usageDetail) === 0 ?  '停用': '使用中' }}
+      </span>
+            </template>
+          </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -152,7 +175,9 @@
               <el-input v-model="form.bldgLdArea" placeholder="请输入建筑划分面积" />
             </el-form-item>
             <el-form-item label="使用详情" prop="usageDetail">
-              <el-input v-model="form.usageDetail" placeholder="请输入使用详情" />
+              <el-select v-model="form.usageDetail" style="width:100%">
+                <el-option v-for="item in enableOptions" :label="item.name" :value="item.code" :key="item.code" />
+              </el-select>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -206,6 +231,7 @@ export default {
         children: "children",
         label: "label"
       },
+
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -213,10 +239,13 @@ export default {
         areaCode: null,
         bldgCode: null,
         zoningName: null,
-        tagCodeList: null
+        tagCodeList: null,
+        usageDetail:null
       },
       // 表单参数
-      form: {},
+      form: {
+        usageDetail: null
+      },
       // 表单校验
       rules: {
         zoningCode: [
@@ -225,7 +254,11 @@ export default {
         zoningName: [
           { required: true, message: "分区名称不能为空", trigger: "blur" }
         ],
-      }
+      },
+      enableOptions: [
+        { code: 0, name:  '停用'},
+        { code: 1, name:  '使用中'}
+      ]
     };
   },
   watch: {

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

@@ -152,7 +152,8 @@
         <el-form-item label="记录编号" prop="recordCode">
           <el-input v-model="form.recordCode" placeholder="请输入记录编号" />
         </el-form-item>
-        <el-form-item label="对象类型" prop="objType">
+<!--        prop="objType"-->
+        <el-form-item label="对象类型" >
           <el-select v-model="form.objType" placeholder="请选择对象类型" @change="changeObjOptions" >
             <el-option
               v-for="dict in dict.type.device_type"