Merge branch 'master-mj-ztq' into 'master-mj'

feat:端口侦测弹窗



See merge request !1183

+<div>
+    <el-dialog v-model="dialogVisible" title="新增" width="50%" :before-close="beforeClose">
+        <div>
+            <div style="margin-right:6px;">
+                <!--<cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/>-->
+            </div>
+            <div class="flex-div-start" style="float: left;">
+                <el-button :size="$global.elementConfig.size.button" @click="onBtnSearch()" style="margin-left: 6px" type="primary">搜索</el-button>
+            </div>
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="beforeClose">取消</el-button>
+            <el-button type="primary" @click="submit">确定</el-button>
+          </span>
+        </template>
+    </el-dialog>
+</div>
\ No newline at end of file

+export default {
+    name: 'portSenseAdd',
+    template: '',
+    components: {
+    },
+    props:{
+        dialogVisible:{
+            type:Boolean,
+        }
+    },
+    setup(props, {attrs, slots, emit}){
+        const {proxy} = Vue.getCurrentInstance();
+
+        let types = Vue.ref([]);
+        //获取资源类型
+        let getResType = (arr) => {
+            types.value = arr.map(function (v) {
+                return v.id;
+            });
+        }
+
+        const onBtnSearch = ()=>{
+
+        }
+
+        const submit = ()=>{
+            if (types.value.length === 0) {
+                proxy.$global.layer.msg('请选择一项', {icon: 7, timeout: 3000});
+                return false;
+            }
+            beforeClose();
+        }
+
+        const beforeClose = () => {
+            emit('beforeClose')
+        }
+
+        return {
+            getResType,
+            onBtnSearch,
+            submit,
+            beforeClose
+        }
+    }
+}
\ No newline at end of file

@@ -83,4 +83,6 @@
             <port-sense-config :parameter="portSenseConfigData"></port-sense-config>
         </template>
     </cm-dialog>
+
+    <port-sense-add :dialogVisible="dialogVisible" @beforeClose="beforeClose"></port-sense-add>
 </div>

@@ -6,6 +6,10 @@ export default {
         'port-sense-config': Vue.defineAsyncComponent(
             () => myImport('views/portSenseConfig/index')
         ),
+        // 新增端口侦测
+        'port-sense-add': Vue.defineAsyncComponent(
+            () => myImport('views/portSense/add/index')
+        ),
     },
     data() {
     },
@@ -192,6 +196,7 @@ export default {
             })
         }
         //添加
+        let dialogVisible = Vue.ref(false);
         let save = () => {
             //获取所有的端口侦测信息
             let dataList = [];
@@ -205,11 +210,12 @@ export default {
             };
             proxy.$http.get("/api-web/bResourceExtendParam/page", getParams, function (res) {
                 if (res && res.success) {
-                    dataList = res.data;
+                    dataList = res.data || [];
                 }
             })
             dataList = dataList.map(item => item.resId);
-            proxy.$global.openWin("template/res/reslist", "选择资源", {oldData: dataList}, ["选择"], function (index) {
+            dialogVisible.value = true;
+            /*proxy.$global.openWin("template/res/reslist", "选择资源", {oldData: dataList}, ["选择"], function (index) {
                 //获取选中数据
                 let data = proxy.$global.layui.table.checkStatus('reslist_resListTable').data;
                 if (data.length === 0) {
@@ -222,9 +228,12 @@ export default {
                 portSenseConfigData.value = data.map(item => item.resId);
                 showPortSense.value = true;
                 proxy.$global.layer.close(index);
-            }, null, ['80%', '83%']);
+            }, null, ['80%', '83%']);*/
 
         }
+        const beforeClose = ()=>{
+            dialogVisible.value = false;
+        }
         //删除
         let deleteOther = () => {
             let list = pitch.value.map(item => {
@@ -278,6 +287,9 @@ export default {
             title,
             portSenseConfigData,
             showPortSenseDialog,
+
+            dialogVisible,
+            beforeClose
         }
     }
 }