Merge branch 'master-v32-xwx' into 'master'

杭州-对比分析-操作添加编辑功能



See merge request !217

@@ -102,7 +102,7 @@ body{
 }
 }
 .icon-bg{
 .icon-bg{
     display: flex;
     display: flex;
-    justify-content: center;
+    justify-content: space-around;
     align-items: center;
     align-items: center;
     width: 20px;
     width: 20px;
     height: 20px;
     height: 20px;
@@ -175,5 +175,5 @@ body{
 }
 }
 .list-handle{
 .list-handle{
     display: flex;
     display: flex;
-    justify-content: center;
+    justify-content: space-around;
 }
 }

@@ -145,6 +145,9 @@
             <div v-if="!isAdd" style="padding: 3px 10px;">
             <div v-if="!isAdd" style="padding: 3px 10px;">
                 <el-input v-model="form.parentName" placeholder="请输入场景分类"/>
                 <el-input v-model="form.parentName" placeholder="请输入场景分类"/>
             </div>
             </div>
+            <div v-if="!isAdd" style="padding: 3px 10px;">
+                <el-input v-model="form.desc" placeholder="请输入场景分类描述"/>
+            </div>
             <div v-else style="padding: 3px 10px;">
             <div v-else style="padding: 3px 10px;">
                 <el-select v-model="form.parentId" placeholder="请选择场景分类" style="width: 100%">
                 <el-select v-model="form.parentId" placeholder="请选择场景分类" style="width: 100%">
                     <el-option
                     <el-option
@@ -163,6 +166,9 @@
                 <el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
                 <el-input v-model="form.scene.name" placeholder="请输入场景名称"/>
             </div>
             </div>
             <div style="padding: 3px 10px;">
             <div style="padding: 3px 10px;">
+                <el-input v-model="form.scene.desc" placeholder="请输入场景描述"/>
+            </div>
+            <div style="padding: 3px 10px;">
                 <el-input v-model="form.scene.sort" type="number" placeholder="请输入排序"/>
                 <el-input v-model="form.scene.sort" type="number" placeholder="请输入排序"/>
             </div>
             </div>
         </template>
         </template>

@@ -397,6 +397,7 @@ export default {
             let formVal = form.value;
             let formVal = form.value;
             let parentName = formVal.parentName;
             let parentName = formVal.parentName;
             let parentId = formVal.parentId;
             let parentId = formVal.parentId;
+            let desc = formVal.scene.desc;
             let name = formVal.scene.name;
             let name = formVal.scene.name;
             let sort = formVal.scene.sort;
             let sort = formVal.scene.sort;
             let timeScope = formVal.scene.timeScope;
             let timeScope = formVal.scene.timeScope;
@@ -421,7 +422,7 @@ export default {
             let addParam = {
             let addParam = {
                 scene: [{
                 scene: [{
                     name: name,
                     name: name,
-                    desc: '',
+                    desc: desc,
                     sort: sort,
                     sort: sort,
                     timeScope: timeScope,
                     timeScope: timeScope,
                     frequency: frequency,
                     frequency: frequency,
@@ -436,6 +437,7 @@ export default {
                     return;
                     return;
                 }
                 }
                 addParam['parentName'] = parentName;
                 addParam['parentName'] = parentName;
+                addParam['desc'] = formVal.desc;
                 url = '/api-web/ContrastAnalysis/insertScene';
                 url = '/api-web/ContrastAnalysis/insertScene';
             } else {
             } else {
                 if(parentId == ''){
                 if(parentId == ''){

@@ -46,12 +46,15 @@
                         <template #default="scope">
                         <template #default="scope">
                             <div class="list-handle">
                             <div class="list-handle">
                                 <span class="icon-bg">
                                 <span class="icon-bg">
-                                     <i class="icon-list icon-list-delete" @click="handleDelete(scope.row)"></i>
+                                     <i class="icon-list icon-list-delete" title="删除" @click="handleDelete(scope.row)"></i>
+                                </span>
+                                <span class="icon-bg">
+                                     <i class="el-icon-edit-outline" title="修改" @click="handleUpdate(scope.row)"></i>
                                 </span>
                                 </span>
                                 <!--<i class="icon-list icon-list-group"></i>
                                 <!--<i class="icon-list icon-list-group"></i>
-                                <i class="icon-list icon-list-message"></i>
-                                <i class="icon-list icon-list-safe"></i>
-                                <i class="icon-list icon-list-net"></i>-->
+                               <i class="icon-list icon-list-message"></i>
+                               <i class="icon-list icon-list-safe"></i>
+                               <i class="icon-list icon-list-net"></i>-->
                             </div>
                             </div>
 
 
                         </template>
                         </template>

@@ -87,6 +87,9 @@ export default {
                 }
                 }
             })
             })
         }
         }
+        const handleUpdate=(item)=>{
+            window.top.location.href =  window.top.location.origin + '/#/analysis/view/id=' +item.id;
+        }
         const searchData=()=>{
         const searchData=()=>{
             proxy.nickname=proxy.inputSearch;
             proxy.nickname=proxy.inputSearch;
             proxy.getData();
             proxy.getData();
@@ -128,7 +131,8 @@ export default {
             handleSizeChange,
             handleSizeChange,
             handleCurrentChange,
             handleCurrentChange,
             totalCount,
             totalCount,
-            currentPage
+            currentPage,
+            handleUpdate
         }
         }
     }
     }
 }
 }