Merge branch 'master' of http://120.26.64.82:10880/BFFE/SMAirports

public/config.js

@@ -7,6 +7,6 @@ window.SERVICE_ID = {
   authTreeId: 18126, //获取表头
   roleListId: 10024,//角色列表
   userAuthorizationId: 10027,//用户授权
-  depTableId: 204, //机器维护表头
+  depTableId: 185, //机器维护表头
   serTableId: 203, //服务设置表头
 };

src/views/newRole/index.vue

@@ -103,11 +103,25 @@
         </div>
       </div>
     </div>
+    <Dialog :flag="rmFlag">
+      <div class="airportInfoDialog">
+        <div class="title del-title">删除</div>
+        <div class="content del-content">
+          <span class="el-icon-error error r10"></span>您是否确认删除<span class="error l10">{{ dataObj.role_name }}</span>
+          ？
+        </div>
+        <div class="foot right Delfoot">
+          <el-button size="medium" class="r24" @click="tableRemove" type="danger">删除</el-button>
+          <el-button size="medium" @click="rmFlag = false">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
   </div>
 </template>
 
 <script>
 import Table from '@/views/newTable/index.vue'
+import Dialog from "@/layout/components/Dialog/index.vue"
 import { Query, newData, modifyData, moveData } from "@/api/webApi"
 import { setTree } from '@/utils/validate'
 import pb from '@/layout/mixin/getPublicData'
@@ -115,7 +129,7 @@ import pf from '@/layout/mixin/publicFunc'
 import * as _ from 'lodash'
 export default {
   name: 'NewService',
-  components: { Table },
+  components: { Table, Dialog },
   mixins: [pb, pf],
   data () {
     return {
@@ -155,7 +169,8 @@ export default {
       checkArrs: [],
       checkDatas: [],
       checkGroups: [],
-      multipleTable: []
+      multipleTable: [],
+      rmFlag: false
     }
   },
   computed: {
@@ -247,6 +262,10 @@ export default {
     },
     //服务列表-新增
     handleAdd () {
+      const datas = this.arrs.filter(item => item.role_name == '新建角色')
+      if (datas && datas.length) {
+        return
+      }
       this.dataType = 'add'
       this.flag = false
       this.dataObj.role_name = '新建角色'
@@ -316,61 +335,38 @@ export default {
         this.$message.error('请先选中服务后再操作')
       }
     },
-    //服务列表-删除
-    handleError () {
+    async tableRemove () {
       if (this.dataObj.role_ID && this.dataType == 'edit') {
-        this.$confirm('此操作将删除该服务, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async () => {
-          const code = await this.getChangeList(this.queryId, this.dataObj, 3)
-          if (code) {
-            this.resetTable()
-            this.getQueryListCo(this.queryId)
-            this.activeIndex = null;
-            this.dataObj = {};
-            for (const key in this.formInline) {
-              if (Object.hasOwnProperty.call(this.formInline, key)) {
-                this.formInline[key] = null
-              }
+        const code = await this.getChangeList(this.queryId, this.dataObj, 3)
+        if (code) {
+          this.resetTable()
+          this.getQueryListCo(this.queryId)
+          this.activeIndex = null;
+          this.dataObj = {};
+          for (const key in this.formInline) {
+            if (Object.hasOwnProperty.call(this.formInline, key)) {
+              this.formInline[key] = null
             }
-            this.flag = true
           }
-          this.tipMsg(code)
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
+          this.flag = true
+        }
+        this.tipMsg(code)
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].role_ID) {
-        this.$confirm('此操作将删除该服务, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async () => {
-          const code = await this.getChangeList(this.queryId, this.arrs[this.arrs.length - 1], 3)
-          if (code) {
-            this.resetTable()
-            this.getQueryListCo(this.queryId)
-            this.activeIndex = null;
-            this.dataObj = {};
-            for (const key in this.formInline) {
-              if (Object.hasOwnProperty.call(this.formInline, key)) {
-                this.formInline[key] = null
-              }
+        const code = await this.getChangeList(this.queryId, this.arrs[this.arrs.length - 1], 3)
+        if (code) {
+          this.resetTable()
+          this.getQueryListCo(this.queryId)
+          this.activeIndex = null;
+          this.dataObj = {};
+          for (const key in this.formInline) {
+            if (Object.hasOwnProperty.call(this.formInline, key)) {
+              this.formInline[key] = null
             }
-            this.flag = true
-            this.dataType = 'edit'
           }
-          this.tipMsg(code)
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
+          this.flag = true
+          this.dataType = 'edit'
+        }
+        this.tipMsg(code)
       }
       else {
         this.arrs.splice(this.activeIndex, 1)
@@ -378,6 +374,11 @@ export default {
         this.flag = true
         this.dataObj = {}
       }
+      this.rmFlag = false
+    },
+    //服务列表-删除
+    handleError () {
+      this.rmFlag = true
     },
     handleNodeClick (data) {
       this.treeCheckId = data.auth_id

src/views/systemSettings/views/newMachine/components/table.vue

@@ -34,6 +34,21 @@
                 </span>
               </template>
             </el-table-column>
+            <el-table-column label="服务类型">
+              <template slot-scope="scope">
+                <div>{{ scope.row.serviceType == 1 ? '接收' :'采集' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="采集频率单位">
+              <template slot-scope="scope">
+                <div>{{ scope.row.frequencyUnit ? scope.row.frequencyUnit + '秒' :'' }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column label="状态">
+              <template slot-scope="scope">
+                <div>{{ scope.row.runState ? '启用' :'停用' }}</div>
+              </template>
+            </el-table-column>
             <el-table-column fixed="right" label="操作" width="80px">
               <template slot-scope="scope">
                 <div class="hd-td">
@@ -472,8 +487,15 @@ export default {
     },
     //初始化表格
     initTableData () {
+      const newDatas = []
       this.tableColsCopy = this.tableCols.filter((item) => item.needShow);
       this.tableColsCopy = _.orderBy(this.tableColsCopy, ['orderNumber'], ['asc']);
+      this.tableColsCopy.map((item, index) => {
+        if (item.columnName == 'serviceType' || item.columnName == 'frequencyUnit' || item.columnName == 'runState') {
+          this.tableColsCopy.splice(index, 1)
+        }
+      })
+      console.log(this.tableColsCopy)
       this.tableDataCopy = _.cloneDeep(this.tableData);
       const datas = _.cloneDeep(this.tableColsCopy);
       // const reqUts = [];

src/views/systemSettings/views/newMachine/index.vue

@@ -35,21 +35,21 @@
               <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.8)">
                 <div v-for="(item,index) in dataList" :key="index" @click.stop="handleClick(item,index)" :class="index == activeIndex ? 'active':''" class="contents flex">
                   <div class="left">
-                    <span :class="item.runState ? 'success' : 'error'" class="box"></span>
+                    <span :class="item.deploystate ? 'success' : 'error'" class="box"></span>
                     <el-tooltip class="item" effect="dark" :content="item.deployNodeName" placement="top">
                       <span class="txt">{{ item.deployNodeName }}</span>
                     </el-tooltip>
                   </div>
                   <div v-show="activeIndex == index" class="right">
-                    <!-- <template v-if="!flag && item.deployNodeID">
+                    <template v-if="!flag && item.deployNodeID">
                       <template v-if="item.serviceType == 4">
-                        <span @click.stop="handleStart" v-if="!item.runState" class="start">启用</span>
+                        <span @click.stop="handleStart" v-if="!item.deploystate" class="start">启用</span>
                         <span @click.stop="handleStop" v-else class="stop">停用</span>
                       </template>
                       <template v-else>
                         <span @click.stop="handleRest(item)" class="rest">重置</span>
                       </template>
-                    </template> -->
+                    </template>
                     <span @click.stop="handleError" class="error">删除</span>
                   </div>
                 </div>
@@ -68,16 +68,24 @@
             <el-button type="primary" @click="handleSave" :disabled="flag" class="bcButton" size="small">保存</el-button>
           </div>
           <div class="demo-form">
-            <el-form :inline="true" :model="formInline" class="flex">
-              <el-form-item label="机器名称">
-                <el-input clearable v-model="formInline.deployNodeName" :disabled="activeIndex == null" size="small" placeholder="请输入服务名称"></el-input>
-              </el-form-item>
-              <el-form-item label="IP及端口">
-                <el-input clearable v-model="formInline.serviceURL" :disabled="activeIndex == null" size="small" placeholder="请输入IP及端口"></el-input>
-              </el-form-item>
-              <el-form-item label="部署位置">
-                <el-input clearable v-model="formInline.filepath" :disabled="activeIndex == null" size="small" placeholder="请输入部署位置"></el-input>
-              </el-form-item>
+            <el-form label-width="70px" :model="formInline">
+              <el-row :gutter="40">
+                <el-col :span="6">
+                  <el-form-item label="机器名称">
+                    <el-input clearable v-model="formInline.deployNodeName" :disabled="activeIndex == null" size="small" placeholder="请输入服务名称"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="6">
+                  <el-form-item label="IP及端口">
+                    <el-input clearable v-model="formInline.serviceURL" :disabled="activeIndex == null" size="small" placeholder="请输入IP及端口"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                  <el-form-item label="部署位置">
+                    <el-input clearable v-model="formInline.filepath" :disabled="activeIndex == null" size="small" placeholder="请输入部署位置"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
             </el-form>
           </div>
         </div>
@@ -86,17 +94,31 @@
         </div>
       </div>
     </div>
+    <Dialog :flag="rmFlag">
+      <div class="airportInfoDialog">
+        <div class="title del-title">删除</div>
+        <div class="content del-content">
+          <span class="el-icon-error error r10"></span>您是否确认删除<span class="error l10">{{ dataObj.deployNodeName }}</span>
+          ？
+        </div>
+        <div class="foot right Delfoot">
+          <el-button size="medium" class="r24" @click="tableRemove" type="danger">删除</el-button>
+          <el-button size="medium" @click="rmFlag = false">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
   </div>
 </template>
 
 <script>
 import Table from './components/table.vue'
+import Dialog from "@/layout/components/Dialog/index.vue"
 import { Query, newData, modifyData, moveData, start, stop } from "@/api/webApi"
 import pf from '@/layout/mixin/publicFunc'
 import * as _ from 'lodash'
 export default {
   name: 'NewService',
-  components: { Table },
+  components: { Table, Dialog },
   mixins: [pf],
   data () {
     return {
@@ -130,7 +152,8 @@ export default {
       loading: false,
       dataId: 8,
       msgContent: {},
-      jqList: []
+      jqList: [],
+      rmFlag: false
     }
   },
   computed: {
@@ -214,10 +237,14 @@ export default {
     },
     //服务列表-新增
     handleAdd () {
+      const datas = this.arrs.filter(item => item.deployNodeName == '新建机器')
+      if (datas && datas.length) {
+        return
+      }
       this.dataType = 'add'
       this.flag = false
-      this.dataObj.serviceName = '新建服务'
-      this.arrs.push({ serviceName: '新建服务' })
+      this.dataObj.deployNodeName = '新建机器'
+      this.arrs.push({ deployNodeName: '新建机器' })
       this.activeIndex = this.arrs.length - 1
       for (const key in this.formInline) {
         if (Object.hasOwnProperty.call(this.formInline, key)) {
@@ -300,69 +327,46 @@ export default {
         this.$message.error('请先选中服务后再操作')
       }
     },
-    //服务列表-删除
-    handleError () {
+    async tableRemove () {
       if (this.dataObj.deployNodeID && this.dataType == 'edit') {
-        this.$confirm('此操作将删除该服务, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async () => {
-          const code = await this.getChangeList(this.queryId, this.dataObj, 3)
-          if (code) {
-            this.$message.success('操作成功')
-            this.resetTable()
-            this.getQuery(this.queryId)
-          } else {
-            this.$message.success('操作失败')
-          }
-          this.msgContent = {}
-          this.activeIndex = null;
-          this.dataObj = {};
-          for (const key in this.formInline) {
-            if (Object.hasOwnProperty.call(this.formInline, key)) {
-              this.formInline[key] = null
-            }
+        const code = await this.getChangeList(this.queryId, this.dataObj, 3)
+        if (code) {
+          this.$message.success('操作成功')
+          this.resetTable()
+          this.getQuery(this.queryId)
+        } else {
+          this.$message.success('操作失败')
+        }
+        this.msgContent = {}
+        this.activeIndex = null;
+        this.dataObj = {};
+        for (const key in this.formInline) {
+          if (Object.hasOwnProperty.call(this.formInline, key)) {
+            this.formInline[key] = null
           }
-          this.flag = true
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
+        }
+        this.flag = true
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].deployNodeID) {
-        this.$confirm('此操作将删除该服务, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async () => {
-          const code = await this.getChangeList(this.queryId, this.arrs[this.arrs.length - 1], 3)
-          if (code) {
-            this.$message.success('操作成功')
-            this.resetTable()
-            this.getQuery(this.queryId)
-          } else {
-            this.$message.success('操作失败')
-          }
-          this.msgContent = {
-            service_id: ''
-          }
-          this.activeIndex = null;
-          this.dataObj = {};
-          for (const key in this.formInline) {
-            if (Object.hasOwnProperty.call(this.formInline, key)) {
-              this.formInline[key] = null
-            }
+        const code = await this.getChangeList(this.queryId, this.arrs[this.arrs.length - 1], 3)
+        if (code) {
+          this.$message.success('操作成功')
+          this.resetTable()
+          this.getQuery(this.queryId)
+        } else {
+          this.$message.success('操作失败')
+        }
+        this.msgContent = {
+          service_id: ''
+        }
+        this.activeIndex = null;
+        this.dataObj = {};
+        for (const key in this.formInline) {
+          if (Object.hasOwnProperty.call(this.formInline, key)) {
+            this.formInline[key] = null
           }
-          this.flag = true
-          this.dataType = 'edit'
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
+        }
+        this.flag = true
+        this.dataType = 'edit'
       }
       else {
         this.arrs.splice(this.activeIndex, 1)
@@ -370,6 +374,11 @@ export default {
         this.flag = true
         this.dataObj = {}
       }
+      this.rmFlag = false
+    },
+    //服务列表-删除
+    handleError () {
+      this.rmFlag = true
     },
     //服务列表-增/删/改
     async generalDataReception (event, data) {

src/views/systemSettings/views/newService/index.vue

@@ -157,22 +157,37 @@
         </div>
       </div>
     </div>
+    <Dialog :flag="rmFlag">
+      <div class="airportInfoDialog">
+        <div class="title del-title">删除</div>
+        <div class="content del-content">
+          <span class="el-icon-error error r10"></span>您是否确认删除<span class="error l10">{{ dataObj.serviceName }}</span>
+          ？
+        </div>
+        <div class="foot right Delfoot">
+          <el-button size="medium" class="r24" @click="tableRemove" type="danger">删除</el-button>
+          <el-button size="medium" @click="rmFlag = false">取消</el-button>
+        </div>
+      </div>
+    </Dialog>
   </div>
 </template>
 
 <script>
 import Table from '@/views/newTable/index.vue'
+import Dialog from "@/layout/components/Dialog/index.vue"
 import { Query, newData, modifyData, moveData, start, stop } from "@/api/webApi"
 import * as _ from 'lodash'
 export default {
   name: 'NewService',
-  components: { Table },
+  components: { Table, Dialog },
   data () {
     return {
       title: '服务设置',
       search: '',
       arrs: [],
       flag: true,
+      rmFlag: false,
       formInline: {
         serviceName: '',
         serviceType: '',
@@ -297,6 +312,10 @@ export default {
     },
     //服务列表-新增
     handleAdd () {
+      const datas = this.arrs.filter(item => item.serviceName == '新建服务')
+      if (datas && datas.length) {
+        return
+      }
       this.dataType = 'add'
       this.flag = false
       this.dataObj.serviceName = '新建服务'
@@ -384,61 +403,38 @@ export default {
         this.$message.error('请先选中服务后再操作')
       }
     },
-    //服务列表-删除
-    handleError () {
+    tableRemove () {
       if (this.dataObj.serviceID && this.dataType == 'edit') {
-        this.$confirm('此操作将删除该服务, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          const obj = {}
-          obj.filter = this.dataObj
-          this.generalDataReception(3, [obj])
-          this.msgContent = {
-            service_id: ''
-          }
-          this.activeIndex = null;
-          this.dataObj = {};
-          for (const key in this.formInline) {
-            if (Object.hasOwnProperty.call(this.formInline, key)) {
-              this.formInline[key] = null
-            }
+        const obj = {}
+        obj.filter = this.dataObj
+        this.generalDataReception(3, [obj])
+        this.msgContent = {
+          service_id: ''
+        }
+        this.activeIndex = null;
+        this.dataObj = {};
+        for (const key in this.formInline) {
+          if (Object.hasOwnProperty.call(this.formInline, key)) {
+            this.formInline[key] = null
           }
-          this.flag = true
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
+        }
+        this.flag = true
       } else if (this.dataType == 'add' && this.arrs[this.arrs.length - 1].serviceID) {
-        this.$confirm('此操作将删除该服务, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          const obj = {}
-          obj.filter = this.arrs[this.arrs.length - 1]
-          this.generalDataReception(3, [obj])
-          this.msgContent = {
-            service_id: ''
-          }
-          this.activeIndex = null;
-          this.dataObj = {};
-          for (const key in this.formInline) {
-            if (Object.hasOwnProperty.call(this.formInline, key)) {
-              this.formInline[key] = null
-            }
+        const obj = {}
+        obj.filter = this.arrs[this.arrs.length - 1]
+        this.generalDataReception(3, [obj])
+        this.msgContent = {
+          service_id: ''
+        }
+        this.activeIndex = null;
+        this.dataObj = {};
+        for (const key in this.formInline) {
+          if (Object.hasOwnProperty.call(this.formInline, key)) {
+            this.formInline[key] = null
           }
-          this.flag = true
-          this.dataType = 'edit'
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
-        });
+        }
+        this.flag = true
+        this.dataType = 'edit'
       }
       else {
         this.arrs.splice(this.activeIndex, 1)
@@ -451,6 +447,11 @@ export default {
           }
         }
       }
+      this.rmFlag = false
+    },
+    //服务列表-删除
+    handleError () {
+      this.rmFlag = true
     },
     //服务列表-增/删/改
     async generalDataReception (event, data) {