Bläddra i källkod

redmine #2620 新增需求

shaun-sheep 5 år sedan
förälder
incheckning
d2482ecc64

+ 6 - 3
src/components/relation/overview/CardList.vue

@@ -133,7 +133,7 @@
                           v-if="relation.IsSource"
                         >
                           <el-button
-                            @click="equipment"
+                            @click="equipment(relation)"
                             type="primary"
                             plain
                             circle
@@ -184,6 +184,7 @@
           cancel: '取消',
           confirm: '确定',
           back: '返回',
+          preservation:'保存',
           promptly: '立即计算',
           placeholder: '请选择',
           download: '下载模板(含数据)',
@@ -205,7 +206,8 @@
           dataFailed: '数据文件验证失败',
           allUpdateSuccess: 'xxxx全部更新成功',
           portionUpdateSuccess: ' xxxx关系部分更新成功',
-          downloadFile: ' 下载报告文件'
+          downloadFile: ' 下载报告文件',
+          equipmentSetting:''
         },
         isComputed: {}, // 当前要计算的对象
         ManualMaintenance: {},//手动编辑对象
@@ -238,7 +240,8 @@
           return false
         }
       },
-      equipment() {
+      equipment(relation) { //配置源端末端
+        this.values.equipmentSetting=`${relation.RelationTypeName} 源末端关系设置`
         this.$refs.maintain.dialogEquipment = true
       },
       manual(relation) {

+ 54 - 11
src/components/relation/overview/Modal/RelationMaintain.vue

@@ -29,9 +29,9 @@
       >
         <p class="font-big">{{values.existComputed}}</p>
         <p class="exist-title">{{values.existTitle}}</p>
-        <el-row :span="24">
+        <el-row :span="24" style="margin-top: 10px">
           <el-col :span="8">
-            <span class="demonstration">{{values.originEquipment}}</span>
+            <p class="demonstration">{{values.originEquipment}}</p>
             <el-cascader
                 :key="isResouceShow"
                 :options="list"
@@ -43,7 +43,7 @@
             />
           </el-col>
           <el-col :span="8">
-            <span class="demonstration">{{values.endEquipment}}</span>
+            <p class="demonstration">{{values.endEquipment}}</p>
 
             <el-cascader
                 :options="list"
@@ -71,19 +71,62 @@
       </div>
     </el-dialog>
     <!--设定设备对象源/末端-->
+    <!--    <el-dialog-->
+    <!--        :title="values.title"-->
+    <!--        :visible.sync="dialogEquipment"-->
+    <!--    >-->
+    <!--      <span class="font-big">{{values.underDesign}}</span>-->
+    <!--      <footer-->
+    <!--          slot="footer"-->
+    <!--          class="dialog-footer"-->
+    <!--      >-->
+    <!--        <el-button-->
+    <!--            type="primary"-->
+    <!--            @click="dialogEquipment = false"-->
+    <!--        >{{values.confirm}}-->
+    <!--        </el-button>-->
+    <!--      </footer>-->
+    <!--    </el-dialog> -->
     <el-dialog
-        :title="values.title"
-        :visible.sync="dialogEquipment"
+      :title="values.title"
+      :visible.sync="dialogEquipment"
     >
-      <span class="font-big">{{values.underDesign}}</span>
+      <h4>{{values.equipmentSetting}}</h4>
+      <el-row :span="24" style="margin-top: 15px">
+        <el-col :span="8">
+          <p class="">{{values.originEquipment}}</p>
+          <el-cascader
+            :key="isResouceShow"
+            :options="list"
+            v-model="ops"
+            :props="props"
+            collapse-tags
+            clearable
+          />
+        </el-col>
+        <el-col :span="8">
+          <p class="">{{values.endEquipment}}</p>
+          <el-cascader
+            :options="list"
+            v-model="filterOps"
+            :key="isResouceShow"
+            :props="props"
+            collapse-tags
+            clearable
+          />
+        </el-col>
+      </el-row>
+
       <footer
-          slot="footer"
-          class="dialog-footer"
+        slot="footer"
+        class="dialog-footer"
       >
+        <el-button @click="dialogEquipment = false">{{values.cancel}}</el-button>
+
         <el-button
-            type="primary"
-            @click="dialogEquipment = false"
-        >{{values.confirm}}
+          type="primary"
+          @click="dialogEquipment = false"
+        >{{values.preservation}}
         </el-button>
       </footer>
     </el-dialog>