src/assets/style/style.scss

@@ -63,4 +63,19 @@ iframe {
 .p10 {
     padding: 0 10px;
     box-sizing: border-box;
-}
+}
+
+jmnodes.theme-greensea jmnode {
+    color: #fff;
+    background-color: #67c23a;
+    border-color: #67c23a;
+}
+
+// jmnodes.theme-greensea jmnode.selected {
+//     background: #85ce61;
+//     border-color: #85ce61;
+// }
+// jmnodes.theme-greensea jmnode:hover {
+//     background: #85ce61;
+//     border-color: #85ce61;
+// }

src/components/config_point/select_one.vue

@@ -11,8 +11,10 @@
         <ul v-if="renderData.length">
             <li v-for="(item,index) in renderData" :key="index">
                 <div @click="checkItem(item,index)" :class="index == active ? 'saga-active-select': ''" class="select-item border-bottom pointer">
-                    <span v-if="isSelected" :class="{'is-checked': item[isCheckInfo]}" class="el-checkbox__input">
-                                <span class="el-checkbox__inner"></span>
+                    <!-- <span v-if="isSelected" :class="{'is-checked': item[isCheckInfo]}" class="el-checkbox__input">
+                        <span class="el-checkbox__inner"></span>
+                    </span> -->
+                    <span v-if="isSelected" :class="item[isCheckInfo] ? 'el-icon-success' : 'el-icon-error'" style="color:#409EFF;">
                     </span>
                     {{overString(item[infosKey])}}
                     <i v-if="isDel" @click.stop="delItem(item)" class="el-icon-error saga-delete pointer"></i>

src/components/config_point/step3_point/3_temps.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="temp-point-view">
         <el-steps :active="activeName" align-center>
             <el-step title="步骤1" description="确定与数据字典中信息点对应"></el-step>
             <el-step title="步骤2" description="确定值得处理方式"></el-step>
@@ -55,7 +55,7 @@
             </div>
         </div>
         <div class="collapse-item" v-if="activeName == 2">
-            <div style="height:150px;">
+            <div style="height:258px;">
                 <handsontable-component ref="handsontable"></handsontable-component>
             </div>
             <div class="center">
@@ -606,6 +606,12 @@
     }
 </script>
 <style lang="scss" scoped>
+.temp-point-view{
+    padding: 10px;
+    box-sizing: border-box;
+    .el-steps{
+        margin-bottom: 10px;
+    }
     .flex-around {
         display: flex;
         justify-content: space-around;
@@ -613,9 +619,10 @@
         width: 100%;
         overflow:hidden;
         .point-despoint {
-            width: 180px;
+            width: 240px;
             border: 1px solid #DCDFE6;
-            height: 100px;
+            height: 190px;
+            margin-bottom: 10px;
             .content-view {
                 padding: 5px;
                 box-sizing: border-box;
@@ -623,7 +630,8 @@
         }
     }
     .collapse-item {
-        height: 190px;
+        height: 290px;
         overflow-y: auto;
     }
+}
 </style>

src/components/config_point/step3_point/dialog_main.vue

@@ -351,7 +351,7 @@
 </script>
 <style lang="scss" scoped>
     .steps3-dialog-main {
-        height: 400px;
+        height: 500px;
         .own-table-view {
             height: calc(100% - 50px);
         }
@@ -359,8 +359,11 @@
             border: 1px solid #ccc;
             float: right;
             width: calc(100% - 490px);
-            height: 340px;
+            height: 460px;
             position: relative;
         }
+        .select-own-one{
+            height: 460px;
+        }
     }
 </style>

src/components/config_point/step3_point/steps3_main.vue

@@ -167,14 +167,17 @@
 </script>
 <style lang="scss" scoped>
     .steps3-dialog-main {
-        height: 340px;
+        height: 460px;
         .own-collape {
             border: 1px solid #ccc;
             float: right;
             width: calc(100% - 520px);
             box-sizing: border-box;
-            height: 340px;
+            height: 460px;
             position: relative;
         }
+        .select-own-one{
+            height: 460px;
+        }
     }
 </style>

src/views/business_space/business_list/index.vue

@@ -431,7 +431,7 @@
             font-size: 14px;
             position: relative;
             line-height: 54px;
-            width: 100%;
+            width: 99.5%;
             margin-bottom:10px;
             border: 1px solid #dfe6ec;
             .saga-build-mess {

src/views/point/config_point/edit_origin/index.vue

@@ -93,7 +93,15 @@
             // bread
         },
         created() {
-            this.$store.dispatch('setBreadcrumb', [{ label: '系统集成' }, { label: '点位表配置工具' },{ label: this.id ? '编辑数据源' : '添加数据源' }])
+            this.$store.dispatch('setBreadcrumb', [{
+                label: '系统集成',
+                path: '/point/pointsetting'
+            }, {
+                label: '点位表配置工具',
+                path: '/point/pointsetting'
+            }, {
+                label: this.id ? '编辑数据源' : '添加数据源'
+            }])
         },
         mounted() {
             if (!!this.id) {
@@ -113,8 +121,7 @@
                     },
                     "PageNumber": 1,
                     "PageSize": 50,
-                    "Projection": [
-                    ]
+                    "Projection": []
                 }
                 queryDataSource(param, res => {
                     let data = res.Content[0]
@@ -141,7 +148,7 @@
                 tools.delObjKey(param, "LastUpdate")
                 if (!!this.id) {
                     console.log(param.ProtocolInfo.Port)
-                    if(param.ProtocolInfo.Port == ""){
+                    if (param.ProtocolInfo.Port == "") {
                         delete param.ProtocolType.Port
                     }
                     updateDataSource({

src/views/point/config_point/index.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="saga-config-point">
-        <div style="line-height:32px;padding-left:10px">
-            <span>此项目包括<i style="color:#409EFF;">{{list.length}}</i>个数据源</span>
-            <div style="float:right;">
+        <div style="line-height:34px;padding-left:10px">
+            <span style="display:inline-block;height: 34px;line-height:34px;">此项目包括<i style="color:#409EFF;">{{list.length}}</i>个数据源</span>
+            <div style="float:right;height:34px;line-height:34px;padding-bottom: 1px;">
                 <el-button @click="sameData">同步配置文件到云端</el-button>
                 <el-button style="width:140px;" @click="addItem">添加数据源</el-button>
             </div>

src/views/point/config_point/steps/index.vue

@@ -33,6 +33,10 @@
     import step2 from "./step2"
     import step3 from "./step3"
     import step4 from "./step4"
+    import {
+        mapGetters,
+        mapActions
+    } from "vuex";
     export default {
         data() {
             return {
@@ -43,6 +47,11 @@
                 activeHeight: 0
             }
         },
+        computed: {
+            ...mapGetters("project", [
+                "dataName"
+            ])
+        },
         created() {
             this.$store.dispatch('setBreadcrumb', [{
                 label: '系统集成',
@@ -51,7 +60,7 @@
                 label: '点位表配置工具',
                 path: '/point/pointsetting'
             }, {
-                label: '点位收集'
+                label: `点位收集(${this.dataName})`
             }])
         },
         mounted() {

src/views/point/config_point/steps/step2.vue

@@ -35,7 +35,11 @@
         </own-dialog>
         <own-dialog :width="'500px'" :footer="footer" :index="true" :escape="false" :isModel="false" title="AI自动识别" :dialogVisible="aiDialog" @confirm="isTrue" @cancel="aiClose">
             <!-- <localtion-falg :renderData="renderData" @changeTag="changeLoc"></localtion-falg> -->
-            <el-progress v-if="hadTrue" :text-inside="true" :stroke-width="18" :percentage="usedNum"></el-progress>
+            <div v-if="hadTrue" style="height: 100px;">
+                <el-progress :text-inside="true" :stroke-width="18" :percentage="usedNum"></el-progress>
+                <p v-if="content.Current != content.Sum" class="center">正在识别，请稍后……（{{content.Current}}/{{content.Sum}}）</p>
+                <p v-else class="center" style="margin-top:10px;">目前已识别 <i class="el-button--text">{{content.DiscernCount}}</i> 个点位，识别率为  <i class="el-button--text">{{content.DiscernRate}}</i></p>
+            </div>
             <div v-else>
                 <p>确认要人工智能识别么？</p>
             </div>
@@ -93,7 +97,13 @@
                 aiDialog: false,
                 hadTrue: false,//是否确定人工智能升级
                 usedNum: 0,//识别百分比
-                footer:{}
+                footer:{},
+                content: {
+                    Current: 1,//当前识别
+                    DiscernCount: 1,//已识别个数
+                    DiscernRate: 1,//识别比例
+                    Sum: 2,//总数
+                }
             }
         },
         created() {
@@ -124,9 +134,9 @@
             },
             //人工智能识别
             aiDiscern(){
-                // this.hadTrue = false
-                // this.footer = {}
-                // this.aiDialog = true
+                this.hadTrue = false
+                this.footer = {}
+                this.aiDialog = true
             },
             //确认人工识别
             isTrue(){
@@ -151,7 +161,8 @@
                         DataSourceId: this.datasourceId
                     }
                 },res => {
-                    console.log(res)
+                    this.content = res.Content[0]
+                    this.usedNum = (this.content.Current/this.content.Sum).toFixed(2)*100
                 })
             },
             changeLoc(val) {

src/views/point/config_point/steps/step3.vue

@@ -14,11 +14,11 @@
         <div v-if="pages.total" class="right">
             <pagination :page="pages" @change="changePage"></pagination>
         </div>
-        <own-dialog :width="'1000px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化设备标识' " :dialogVisible="isDialogShow" @cancel="close">
+        <own-dialog :width="'1200px'" :title=" isDataform ? '根据关键内容批量对应数据字典' : '根据关键内容批量标准化设备标识' " :dialogVisible="isDialogShow" @cancel="close">
             <dialog-main v-if="!isDataform"></dialog-main>
             <steps-main v-if="isDataform"></steps-main>
         </own-dialog>
-        <own-dialog :width="'1000px'" :dialogVisible="isEditDialogShow" @cancel="closeEdit">
+        <own-dialog :width="'1200px'" :dialogVisible="isEditDialogShow" @cancel="closeEdit">
             <step3-edit v-if="isEditDialogShow" :editData='editData' @refresh='refreshData'></step3-edit>
         </own-dialog>
     </div>

src/views/point/config_point/steps/step4.vue

@@ -357,7 +357,7 @@
             setBgColor(data, jm) {
                 data.map(item => {
                     if (item.DataQuality) {
-                        jm.set_node_color(item.id, "#f0ad4e", "#fff")
+                        jm.set_node_color(item.id, "#e6a23c", "#fff")
                     }
                     if (item.children && item.children.length) {
                         this.setBgColor(item.children, jm)