Prechádzať zdrojové kódy

Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

zhongxiaoyu 3 rokov pred
rodič
commit
dd5e84d321

+ 9 - 1
src/views/BasicsData/views/BaggageType/BaggageType.vue

@@ -31,7 +31,15 @@
           <div class="grid-content box-public-shadow">
             <div class="flex list">
               <div class="ult flex-wrap er">
-                <div class="title">{{ item.typeName }}</div>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="item.typeName"
+                  placement="bottom"
+                >
+                  <div class="title">{{ item.typeName }}</div>
+                </el-tooltip>
+                <!-- <div class="title">{{ item.typeName }}</div> -->
                 <div @click="airEdit(item)" class="edit_log"></div>
               </div>
               <div class="close">

+ 9 - 1
src/views/BasicsData/views/airlineCompany/airlineCompanyInfo.vue

@@ -33,7 +33,15 @@
           <div class="grid-content box-public-shadow">
             <div class="flex list">
               <div class="ult flex-wrap er">
-                <div class="title fz16">{{ item.airCompanyName }}</div>
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :content="item.airCompanyName"
+                  placement="bottom"
+                >
+                  <div class="title">{{ item.airCompanyName }}</div>
+                </el-tooltip>
+                <!-- <div class="title fz16">{{ item.airCompanyName }}</div> -->
                 <div
                   v-is="['ss_aim_cardEdit']"
                   @click="airEdit(item)"

+ 9 - 1
src/views/BasicsData/views/airport/airportInfo.vue

@@ -50,7 +50,15 @@
                   <div class="grid-content box-public-shadow">
                     <div class="flex list">
                       <div class="ult flex-wrap er">
-                        <div class="title">{{ item.name }}</div>
+                        <el-tooltip
+                          class="item"
+                          effect="dark"
+                          :content="item.name"
+                          placement="bottom"
+                        >
+                          <div class="title">{{ item.name }}</div>
+                        </el-tooltip>
+                        <!-- <div class="title">{{ item.name }}</div> -->
                         <div @click="toTink(item)" class="edit_log"></div>
                       </div>
                       <div class="close">

+ 10 - 2
src/views/BasicsData/views/airport/airportInfoDetails.vue

@@ -185,9 +185,17 @@
               <div class="grid-content box-public-shadow">
                 <div class="flex list">
                   <div class="ult flex-wrap er">
-                    <div class="title fz16" style="font-weight: bold">
+                    <el-tooltip
+                      class="item"
+                      effect="dark"
+                      :content="item.remarkCn"
+                      placement="bottom"
+                    >
+                      <div class="title fz16">{{ item.remarkCn }}</div>
+                    </el-tooltip>
+                    <!-- <div class="title fz16" style="font-weight: bold">
                       {{ item.remarkCn }}
-                    </div>
+                    </div> -->
                     <div
                       v-is="['ss_aim_cardEdit']"
                       class="edit_log"

+ 8 - 3
src/views/systemSettings/views/machineManagement/machineHome.vue

@@ -33,7 +33,9 @@
               ></div>
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <div class="name">{{ item.deployNodeName }}</div>
+                  <el-tooltip class="item" effect="dark" :content="item.deployNodeName" placement="bottom">
+                    <div class="name">{{ item.deployNodeName }}</div>
+                  </el-tooltip>
                   <i class="loger" @click="showEditDialog(item)" />
                 </div>
                 <i class="el-icon-close icon" @click="showRemoveDialog(item)" />
@@ -41,7 +43,7 @@
               <div class="grid-content-hand flex">
                 <div class="cardContent">
                   <div class="IPadress">
-                    服务地址:{{ item.serviceURL }}
+                    服务地址:<el-tooltip class="item" effect="dark" :content="item.serviceURL" placement="bottom"><span>{{ item.serviceURL }}</span></el-tooltip>
                   </div>
                   <div class="type">类型:{{ item.nodeType }}</div>
                 </div>
@@ -348,7 +350,7 @@ export default {
     }
     .protocol-content {
       .grid-content {
-        height: 156px;
+        height: 136px;
         background: #ffffff;
         box-shadow: 0px 3px 3px 0px rgba(0, 0, 0, 0.1);
         border-radius: 4px;
@@ -405,6 +407,9 @@ export default {
             font-weight: normal;
             color: #101116;
             width: 100%;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
           }
           .type {
             margin-top: 14px;

+ 7 - 4
src/views/systemSettings/views/protocolManagement/protocolHome.vue

@@ -27,7 +27,10 @@
               <div :class="item.protocolStatus=='1' ? 'success' : 'error'" class="grid-content-bg"></div>
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <div class="name">{{ item.protocolName }}</div>
+                  <el-tooltip class="item" effect="dark" :content="item.protocolName" placement="bottom">
+                    <div class="name">{{ item.protocolName }}</div>
+                  </el-tooltip>
+                  <!-- <div class="name">{{ item.protocolName }}</div> -->
                   <i class="loger" @click="showEditDialog(item)" />
                 </div>
                 <i class="el-icon-close icon" @click="showRemoveDialog(item)" />
@@ -159,7 +162,7 @@ export default {
     submitClickHandler () {
       this.$refs['ruleForm'].validate(valid => {
         if (valid) {
-          if (this.ruleForm.protocolId) {
+          if (!this.ruleForm.protocolId) {
             this.addSubmit()
           } else {
             this.editSubmit()
@@ -181,11 +184,11 @@ export default {
     },
     // 确认删除
     async removeSubmit () {
-      this.ruleForm["operate"] = "3";
+      this.rmObj["operate"] = "3";
       try {
         const res = await GeneralDataReception({
           serviceId: "1",
-          dataContent: JSON.stringify(this.ruleForm),
+          dataContent: JSON.stringify(this.rmObj),
         });
         if (res.code === "0") {
           this.removeDialogVisible = false;

+ 4 - 1
src/views/systemSettings/views/serviceManagement/serviceHome.vue

@@ -29,7 +29,10 @@
             <div class="grid-content">
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <div class="name">{{ item.serviceName }}</div>
+                  <el-tooltip class="item" effect="dark" :content="item.serviceName" placement="bottom">
+                    <div class="name">{{ item.serviceName }}</div>
+                  </el-tooltip>
+                  <!-- <div class="name">{{ item.serviceName }}</div> -->
                   <i
                     class="loger"
                     @click="showEditDialog(item)"

+ 4 - 1
src/views/systemSettings/views/sourceDataItemManagement/sourceDataItemHome.vue

@@ -23,7 +23,10 @@
               <div class="head-line"></div>
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <div class="name">{{ item.dataName }}</div>
+                  <!-- <div class="name">{{ item.dataName }}</div> -->
+                  <el-tooltip class="item" effect="dark" :content="item.dataName" placement="bottom">
+                    <div class="name">{{ item.dataName }}</div>
+                  </el-tooltip>
                   <i class="loger" @click="showEditDialog(item)" />
                 </div>
                 <i class="el-icon-close icon" @click="showRemoveDialog(item)" />

+ 150 - 5
src/views/systemSettings/views/targetDataManagement/targetDataHome.vue

@@ -24,18 +24,85 @@
             <div class="grid-content">
               <div class="grid-content-hand flex">
                 <div class="title flex-wrap">
-                  <div class="name">{{ item.tdataName }}</div>
+                  <!-- <div class="name">{{ item.tdataName }}</div> -->
+                  <el-tooltip class="item" effect="dark" :content="item.tdataName" placement="bottom">
+                    <div class="name">{{ item.tdataName }}</div>
+                  </el-tooltip>
                   <i class="loger" @click="showEditDialog(item)" />
                 </div>
                 <i class="el-icon-close icon" @click="showRemoveDialog(item)" />
               </div>
               <div class="dataType">
-                <span>{{item.datatype}}</span>
+                <span>{{item.datatypeText}}</span>
               </div>
             </div>
           </el-col>
         </el-row>
       </div>
+       <!--新增/编辑-->
+      <Dialog :flag="editDialogVisible" width="466px" :show-flag="true">
+        <div class="airportInfoDialog dialog-public-background">
+          <div class="title">{{ editDialogTitle }}</div>
+          <div class="content">
+            <el-form
+              ref="ruleForm"
+              :model="ruleForm"
+              :rules="rules"
+              label-width="140px"
+              class="demo-ruleForm"
+            >
+              <el-form-item label="目标数据名" prop="tdataName">
+                <el-input
+                  v-model="ruleForm.tdataName"
+                  size="small"
+                  placeholder="请输入目标数据名称"
+                />
+              </el-form-item>
+              <el-form-item label="数据类型" prop="datatype">
+                <el-select
+                  v-model="ruleForm.datatype"
+                  size="small"
+                  placeholder="请选择数据类型"
+                >
+                  <el-option label="字符串" value="1"></el-option>
+                  <el-option label="数字" value="2"></el-option>
+                  <el-option label="时间" value="3"></el-option>
+                  <el-option label="日期" value="4"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="目标数据事件标识" prop="eventID">
+                <el-input
+                  v-model="ruleForm.eventID"
+                  size="small"
+                  placeholder="请输入目标数据事件标识"
+                />
+              </el-form-item>
+
+              <el-form-item label="目标数据描述">
+                <el-input
+                  v-model="ruleForm.dataDescribe"
+                  size="small"
+                  type="textarea"
+                  :rows="2"
+                  placeholder="请输入描述"
+                />
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="foot center t30">
+            <el-button
+              size="medium"
+              type="primary"
+              class="r25 r26"
+              @click="submitClickHandler()"
+              >提交</el-button
+            >
+            <el-button size="medium" class="r26" @click="resetForm('ruleForm')"
+              >取消</el-button
+            >
+          </div>
+        </div>
+      </Dialog>
       <!--删除弹框-->
       <Dialog :flag="removeDialogVisible">
         <div class="airportInfoDialog">
@@ -66,7 +133,7 @@
 
 <script>
 import Dialog from "@/layout/components/Dialog/index.vue";
-import { Query  } from '@/api/dataIntegration'
+import { Query,GeneralDataReception  } from '@/api/dataIntegration'
 
 export default {
   name: "targetDataHome",
@@ -75,7 +142,32 @@ export default {
     return {
       dataList: [],
       removeDialogVisible: false,
-      rmObj: {}
+      rmObj: {},
+      editDialogVisible:false,
+      editDialogTitle:"目标数据新增",
+      ruleForm: {
+        // 信息表单
+        tdataName: "",
+        dataDescribe: "",
+        eventID: "",
+        datatype: "",
+      },
+      rules: {
+        // 机器信息表单验证
+        tdataName: [
+          { required: true, message: "请输入目标数据名称", trigger: "blur" },
+        ],
+        eventID: [
+          {
+            required: true,
+            message: "请输入目标数据事件标识",
+            trigger: "blur",
+          },
+        ],
+        datatype: [
+          { required: true, message: "请选择数据类型", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -89,6 +181,23 @@ export default {
           dataContent: []
         });
         if (res.code === "0") {
+            res.returnData.forEach(element => {
+              if(element.datatype == 1){
+                element.datatypeText = "字符串"
+              }
+              else if(element.datatype == 2){
+                element.datatypeText = "数字"
+              }
+              else if(element.datatype == 3){
+                element.datatypeText = "时间"
+              }
+              else if(element.datatype == 4){
+                element.datatypeText = "日期"
+              }
+              else{
+                element.datatypeText = "其他"
+              }
+            });
             this.dataList = res.returnData
         } else {
           this.$message.error(res.message ?? "失败");
@@ -98,7 +207,37 @@ export default {
       }
     },
     showAdd(){
-      this.$router.push('/systemSettings/targetDataEdit')
+      this.editDialogTitle = "新增目标数据";
+      this.editDialogVisible = true;
+    },
+    showEditDialog(){
+
+    },
+    // 新增/编辑-确认
+    submitClickHandler() {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          this.addSubmit();
+          this.resetForm("ruleForm");
+        }
+      });
+    },
+    async addSubmit() {
+      this.ruleForm["operate"] = "1";
+      try {
+        const res = await GeneralDataReception({
+          serviceId: "7",
+          dataContent: JSON.stringify(this.ruleForm),
+        });
+        if (res.code === "0") {
+          this.$message.success(res.message ?? "成功");
+          this.getList()
+        } else {
+          this.$message.error(res.message ?? "失败");
+        }
+      } catch (error) {
+        console.log("错误", error);
+      }
     },
     // 删除-弹框
     showRemoveDialog(item) {
@@ -110,6 +249,12 @@ export default {
       this.removeDialogVisible = false;
       this.$message.success("删除成功");
     },
+    // 重置
+    resetForm(formName) {
+      this.ruleForm = {}
+      this.$refs[formName].resetFields();
+      this.editDialogVisible = false;
+    },
   },
 };
 </script>

+ 9 - 2
src/views/systemSettings/views/warningSet/warningEdit.vue

@@ -105,9 +105,16 @@
           <el-col :span="4" v-for="(item, index) in infoArr" :key="index">
             <div class="headerBoxs">
               <div class="tltle-head">
-                <div class="title flower">
+                <!-- <div class="title flower">
                   {{ item.name }}
-                </div>
+                </div> -->
+                <el-tooltip
+                  effect="dark"
+                  :content="item.name"
+                  placement="bottom"
+                >
+                  <div class="title flower">{{ item.name }}</div>
+                </el-tooltip>
                 <div
                   @click="delBox(item, index)"
                   class="el-icon-close icon"

+ 10 - 4
src/views/systemSettings/views/warningSet/warningSet.vue

@@ -27,9 +27,14 @@
         >
           <div class="headerBox">
             <div class="tltle-head">
-              <div class="title">
-                {{ item.warnName }}
-              </div>
+              <el-tooltip
+                class="item"
+                effect="dark"
+                :content="item.warnName"
+                placement="bottom"
+              >
+                <div class="title fz16">{{ item.warnName }}</div>
+              </el-tooltip>
               <div @click="gotoAram(item, index)" class="edit_log"></div>
             </div>
             <div @click="delBtn(item, index)" class="el-icon-close icon"></div>
@@ -505,7 +510,7 @@ export default {
 }
 .headerBox {
   padding-top: 24px;
-  padding-bottom: 24px;
+  // padding-bottom: 24px;
   display: flex;
   justify-content: space-between;
   .tltle-head {
@@ -522,6 +527,7 @@ export default {
   align-items: center;
 }
 .edit_log {
+  margin-bottom: 18px;
   // top: -2px;
 }
 ::v-deep .aviInfo {