Bladeren bron

拉代码

shaun-sheep 5 jaren geleden
bovenliggende
commit
b3d6a9fde6

+ 1 - 0
src/components/relation/relationShip/Modal/addRelationShip.vue

@@ -121,6 +121,7 @@
       }
       var codeList = (rule, value, callback) => {
         //TODO
+        console.log(value)
         callback()
       }
       return {

+ 33 - 15
src/views/relation/relationShip/index.vue

@@ -46,6 +46,8 @@
             placeholder="请输入"
             @keyup.enter.native="queryTable(1)"
             v-model="mainValue"
+            style="margin-left: 5px"
+            class="min-margin"
           >
             <i
               slot="suffix"
@@ -79,6 +81,8 @@
             placeholder="请输入"
             @keyup.enter.native="queryTable(2)"
             v-model="formValue"
+            style="margin-left: 5px"
+            class="min-margin"
           >
             <i
               slot="suffix"
@@ -96,8 +100,8 @@
       <el-table
         :data="tableData"
         :span-method="objectSpanMethod"
-        border
-        :header-cell-style="{background:'#eef1f6',color:'#606266', lineHeight: '30px'}"
+
+        :header-cell-style="{background:'#e1e4e5',color:'#2b2b2b', lineHeight: '30px'}"
         :cell-style="cellStyle"
         class="table"
       >
@@ -105,31 +109,36 @@
           prop="Name"
           label="全局名称"
           width="180"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="LocalId"
           label="本地编码"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="LocalName"
           label="本地名称"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           prop="CADID"
           label="CADID"
-          align="center"
+          align="left"
+          min-width="100"
         >
         </el-table-column>
         <el-table-column
           label="对象详情"
           prop="btn"
-          align="center"
+          align="left"
+          min-width="90"
         >
           <template slot-scope="scope">
             <el-button
@@ -140,33 +149,34 @@
           </template>
         </el-table-column>
         <el-table-column
+          class-name="td-bl"
           prop="cName"
           label="全局名称"
           width="180"
-          align="center"
+          align="left"
         >
         </el-table-column>
         <el-table-column
           prop="cLocalId"
-          align="center"
+          align="left"
           label="本地编码"
         >
         </el-table-column>
         <el-table-column
           prop="cLocalName"
           label="本地名称"
-          align="center"
+          align="left"
         >
         </el-table-column>
         <el-table-column
           prop="cCADID"
           label="CADID"
-          align="center"
+          align="left"
         >
         </el-table-column>
         <el-table-column
           label="对象详情"
-          align="center"
+          align="left"
         >
           <template slot-scope="scope">
             <el-button
@@ -178,7 +188,7 @@
         </el-table-column>
         <el-table-column
           label="操作"
-          align="center"
+          align="left"
         >
           <template slot-scope="scope">
             <!--            <el-button-->
@@ -238,7 +248,7 @@
         total: 0,
         values: {
           relation_maintenance: '关系维护',
-          optionTips: '请下载最新最新 xxxx 数据进行手动维护', //请下载最新最新 xxxx 数据进行手动维护
+          optionTips: `请下载最新最新<${localStorage.getItem('RelationTypeName')}>数据进行手动维护`, //请下载最新最新 xxxx 数据进行手动维护
           currentNum: '当前关系数量:',
           download: '下载模板(含数据)',
           lastTime: '最后更新时间为', //最后更新时间为
@@ -324,7 +334,7 @@
         path: '/relation/overview'
       },
         {
-          label: '设备控制关系',
+          label: localStorage.getItem('RelationTypeName'),
         },
       ])
       this.init()
@@ -514,6 +524,12 @@
 
 <style scoped lang="less">
   .relation-ship {
+    @media screen and (max-width: 1500px) {
+      .min-margin{
+        margin-top: 10px;
+      }
+    }
+
     .cursor {
       cursor: pointer;
     }
@@ -525,6 +541,8 @@
     /deep/ .el-input {
       width: auto;
     }
+    /deep/.el-table__body-wrappe {
+    }
 
     .table-list {
       width: 100%;