chuwu 5 лет назад
Родитель
Сommit
c9c908814c

+ 4 - 4
src/components/business_space/table/addEquip.vue

@@ -38,7 +38,7 @@
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column width="180" label="设备名称">
         <template slot-scope="scope">
-          <span style="margin-left: 10px">
+          <span>
             <el-tooltip
               :content="scope.row.infos.EquipLocalName ||scope.row.infos.EquipName"
               placement="top"
@@ -50,7 +50,7 @@
       </el-table-column>
       <el-table-column width="180" label="设备本地编码">
         <template slot-scope="scope">
-          <span style="margin-left: 10px">
+          <span>
             <el-tooltip :content="scope.row.infos.EquipLocalID || '--'" placement="top">
               <span>{{scope.row.infos.EquipLocalID || "--" | cutString(15)}}</span>
             </el-tooltip>
@@ -59,14 +59,14 @@
       </el-table-column>
       <el-table-column width="160" label="设备类">
         <template slot-scope="scope">
-          <span style="margin-left: 10px">
+          <span>
             <span>{{getName(scope.row.category)}}</span>
           </span>
         </template>
       </el-table-column>
       <el-table-column width="160" label="已关联其他业务空间">
         <template slot-scope="scope">
-          <span style="margin-left: 10px">
+          <span>
             <el-tooltip :content="changeArray(scope.row.spaceName)" placement="top">
               <span>{{changeArray(scope.row.spaceName) | cutString(6)}}</span>
             </el-tooltip>

+ 1 - 1
src/components/config_point/examine_main.vue

@@ -202,7 +202,7 @@
 <style lang="scss" scoped>
     .handson-view {
         height: 340px;
-        width: 480px;
+        width: 680px;
         float: right;
         overflow-y: auto;
     }

+ 7 - 6
src/components/config_point/find_keyword.vue

@@ -243,18 +243,19 @@
                 }, res => {
                     let data = res.Content[0]
                     this.dataName = res.Content[0].Name
-                    this.echartsData = [{
-                            name: "无法识别:" + (this.type != 'type' ? data.Equipmentparameterignorestandard : data.Equipmenttypeignorestandard),
-                            value: (this.type != 'type' ? data.Equipmentparameterignorestandard : data.Equipmenttypeignorestandard)
+                    this.echartsData = [
+                        {
+                            name: "已识别:" + (this.type != 'type' ? data.Equipmentparameterstandard : data.Equipmenttypestandard),
+                            value: (this.type != 'type' ? data.Equipmentparameterstandard : data.Equipmenttypestandard)
                         },
                         {
                             name: "未识别:" + (this.type != 'type' ? data.Equipmentparameternotstandard : data.Equipmenttypenotstandard),
                             value: (this.type != 'type' ? data.Equipmentparameternotstandard : data.Equipmenttypenotstandard)
                         },
                         {
-                            name: "识别:" + (this.type != 'type' ? data.Equipmentparameterstandard : data.Equipmenttypestandard),
-                            value: (this.type != 'type' ? data.Equipmentparameterstandard : data.Equipmenttypestandard)
-                        }
+                            name: "无法识别:" + (this.type != 'type' ? data.Equipmentparameterignorestandard : data.Equipmenttypeignorestandard),
+                            value: (this.type != 'type' ? data.Equipmentparameterignorestandard : data.Equipmenttypeignorestandard)
+                        },
                     ]
                     this.sum = data.Used
                 })

+ 2 - 0
src/components/config_point/select_one.vue

@@ -99,6 +99,8 @@
         p {
             line-height: 40px;
             height: 40px;
+            padding-left: 10px;
+            box-sizing: border-box;
         }
         ul {
             height: 300px;

+ 2 - 0
src/components/config_point/step3_point/3_temps.vue

@@ -610,6 +610,8 @@
         display: flex;
         justify-content: space-around;
         margin-bottom: 5px;
+        width: 100%;
+        overflow:hidden;
         .point-despoint {
             width: 180px;
             border: 1px solid #DCDFE6;

+ 1 - 1
src/views/point/config_point/steps/step2.vue

@@ -22,7 +22,7 @@
         <own-dialog :width="'60%'" :title="title" :dialogVisible="isDialogShow" @cancel="close">
             <find-keyword ref="findKeyword" :type="type" @change="changeHand"></find-keyword>
         </own-dialog>
-        <own-dialog :width="'1000px'" :index="true" title="关键内容设别——检查&微调" :dialogVisible="examineDialog" @cancel="close">
+        <own-dialog :width="'1200px'" :index="true" title="关键内容设别——检查&微调" :dialogVisible="examineDialog" @cancel="close">
             <!-- <find-keyword ref="findKeyword" :type="type"></find-keyword> -->
             <examine-main></examine-main>
         </own-dialog>