添加

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

@@ -2,7 +2,7 @@
     <div class="saga-config-point">
         <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;">
+            <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/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) {