Home Verkennen Help
Registreren Inloggen
yf_zhb
/
MingGao_vue
2
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

海关字样移除

zhangyun 3 jaren geleden
bovenliggende
0475da20d6
commit
033939f4e9
12 gewijzigde bestanden met toevoegingen van 100 en 73 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 3 2
      minggao/config/index.js
  2. 1 1
      minggao/index.html
  3. 47 13
      minggao/src/page/commandCenter/superviseAdminDetails.vue
  4. 1 1
      minggao/src/page/commandCenter/superviseDetails.vue
  5. 5 8
      minggao/src/page/forecasting/cbd/Cbd.vue
  6. 2 11
      minggao/src/page/forecasting/trap/fillinrecord.vue
  7. 10 10
      minggao/src/page/forecasting/trap/trap.vue
  8. 6 5
      minggao/src/page/homepage/facilitydistribute.vue
  9. 6 3
      minggao/src/page/homepage/pestdistribute.vue
  10. 5 5
      minggao/src/page/monitor/Monitor.vue
  11. 7 7
      minggao/src/page/systemmanger/customsManger.vue
  12. 7 7
      minggao/src/page/systemmanger/userManger.vue

+ 3 - 2
minggao/config/index.js
Bestand weergeven 

@@ -12,8 +12,8 @@ module.exports = {
 
     assetsPublicPath: '/',
 
     proxyTable: {
 
       '/api': {
 
-         target: 'http://192.168.1.17:12345', //翟毅飞
 
-        //  target: 'https://www.yhswjc.com', //线上
 
+        //  target: 'http://192.168.1.17:12345', //翟毅飞
 
+         target: 'https://www.yhswjc.com', //线上
 
         // target: 'http://192.168.1.77:12345', //曹世祥
 
         // target:"http://114.115.147.140:12345",
 
         changeOrigin: true,
 
@@ -25,6 +25,7 @@ module.exports = {
 
 
     // Various Dev Server settings
 
     host: 'localhost', // can be overwritten by process.env.HOST
 
+    // host: '192.168.1.29', // can be overwritten by process.env.HOST
 
     port: 8888, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
 
     autoOpenBrowser: false,
 
     errorOverlay: true,

+ 1 - 1
minggao/index.html
Bestand weergeven 

@@ -3,7 +3,7 @@
 
   <head>
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
-    <title>深圳海关国门生物安全监测预警指挥平台</title>
 
+    <title>监测指挥平台</title>
 
     <link rel="SHORTCUT ICON" href="../static/images/ico.ico">
 
   </head>
 
   <body style="margin: 0;">

+ 47 - 13
minggao/src/page/commandCenter/superviseAdminDetails.vue
Bestand weergeven 

@@ -207,13 +207,17 @@
 
           >
 
             <i class="el-icon-plus avatar-uploader-icon"></i>
 
           </el-upload>
 
-          <!--  -->
 
-          <img
 
-              v-for="(item, index) in ruleForm2.img"
 
-              :key="index"
 
-              :src="$deriveData + item"
 
-              class="avatar"
 
-            />
 
+          <!-- $deriveData -->
 
+          <div
 
+            class="avatar"
 
+            v-for="(item, index) in ruleForm2.img"
 
+            :key="index"
 
+          > 
+            <div class="delbox" @click="delimg(index)">
 
+              <i class="el-icon-delete"></i>
 
+            </div>
 
+            <img :src="$deriveData + item" class="img" />
 
+          </div>
 
         </el-form-item>
 
         <el-form-item>
 
           <el-button @click="superviseSubmitForm('ruleForm2')">取 消</el-button>
 
@@ -344,7 +348,7 @@ export default {
 
     // 监督
 
     superviseAxiso(formName) {
 
       this.loading2 = true;
 
-      console.log(this.ruleForm2.img)
 
+      console.log(this.ruleForm2.img);
 
       this.$refs[formName].validate((valid) => {
 
         if (valid) {
 
           this.submitBtn = true;
 
@@ -356,7 +360,7 @@ export default {
 
               supervisor_type: this.ruleForm2.resource, // 监督类型
 
               supervisor_depa: this.ruleForm2.region, // 监督部门
 
               supervisor_msg: this.ruleForm2.desc, // 监督内容
 
-              supervisor_imglist:JSON.stringify(this.ruleForm2.img)
 
+              supervisor_imglist: JSON.stringify(this.ruleForm2.img),
 
             }),
 
           })
 
             .then((res) => {
 
@@ -401,6 +405,7 @@ export default {
 
     },
 
 
     ImgUploadSectionFile(param) {
 
+      console.log(param);
 
       let that = this;
 
       let formData = new FormData();
 
       formData.append("img_file", param.file); //首页图片
 
@@ -413,6 +418,7 @@ export default {
 
         .then((res) => {
 
           if (res.data.data.src !== "0") {
 
             // that.imageSrc = res.data.data.src;
 
+            console.log(res.data.data.src);
 
             that.ruleForm2.img.push(res.data.data.src);
 
           } else {
 
             if (document.getElementsByClassName("el-message").length == 0) {
 
@@ -452,6 +458,9 @@ export default {
 
       this.ruleForm2.desc = ""; // 监督情况
 
       this.ruleForm2.img = [];
 
     },
 
+    delimg(index){
 
+      this.ruleForm2.img.splice(index,1)
 
+    }
 
   },
 
   //生命周期 - 创建完成（可以访问当前this实例）z
 
   created() {},
 
@@ -584,15 +593,40 @@ export default {
 
   background-color: #409eff;
 
   border-color: #409eff;
 
 }
 
-/deep/.el-form-item__content{
 
+/deep/.el-form-item__content {
 
   display: flex;
 
   flex-wrap: wrap;
 
-  .avatar{
 
-    margin:0 10px 10px 0;
 
+  .avatar {
 
+    margin: 0 10px 10px 0;
 
     height: 102px;
 
     width: 102px;
 
+    position: relative;
 
+    img {
 
+      height: 102px;
 
+      width: 102px;
 
+    }
 
+    .delbox{
 
+      height: 102px;
 
+      width: 102px;
 
+      background-color: rgba(0, 0, 0, 0.4);
 
+      position: absolute;
 
+      top: 0;
 
+      left: 0;
 
+      text-align: center;
 
+      line-height: 102px;
 
+      display: none;
 
+      i{
 
+        color: #fff;
 
+        font-size: 20px;
 
+      }
 
+    }
 
+  }
 
+  .avatar:hover{
 
+    .delbox{
 
+      display: block;
 
+    }
 
   }
 
-  .el-upload{
 
+  .el-upload {
 
     height: 100px;
 
     margin-right: 10px;
 
     box-sizing: border-box;

+ 1 - 1
minggao/src/page/commandCenter/superviseDetails.vue
Bestand weergeven 

@@ -55,7 +55,7 @@
 
                 <div class="list_div">
 
                   <span class="list_div_tlt">监督图片：</span>
 
                   <div class="imgbox">
 
-                    <img v-for="item,index in taskObj.supervisor_imglist" :key="index" :src="$deriveData+item" alt="">
 
+                    <img v-viewer v-for="item,index in taskObj.supervisor_imglist" :key="index" :src="$deriveData+item" alt="">
 
                   </div>
 
                 </div>
 
               </li>

+ 5 - 8
minggao/src/page/forecasting/cbd/Cbd.vue
Bestand weergeven 

@@ -91,7 +91,7 @@
 
                 </p>
 
                 <p>
 
                   <i class="iconfont icon-yonghu"></i>
 
-                  隶属海关组织 :
 
+                  隶属组织 :
 
                   <span v-if="item.org_list.length == 1">{{
 
                     item.org_list[0].org_name
 
                   }}</span>
 
@@ -545,7 +545,7 @@
 
           <el-form-item label="设备名称" prop="device_name">
 
             <el-input v-model="ruleForm.device_name"></el-input>
 
           </el-form-item>
 
-          <el-form-item label="已绑定海关" prop="oldorg_id">
 
+          <el-form-item label="已绑定组织" prop="oldorg_id">
 
             <div class="haiguan">
 
               <p
 
                 class="haiguan_item"
 
@@ -562,14 +562,14 @@
 
               </p>
 
             </div>
 
           </el-form-item>
 
-          <el-form-item label="隶属海关" prop="org_id">
 
+          <el-form-item label="隶属组织" prop="org_id">
 
             <el-cascader
 
               :change-on-select="true"
 
               v-model="ruleForm.org_id"
 
               :options="versionsoptions"
 
               :props="defaultParams"
 
               :clearable="true"
 
-              placeholder="请选择隶属海关"
 
+              placeholder="请选择隶属组织"
 
             ></el-cascader>
 
           </el-form-item>
 
           <el-form-item label="所在监测点" prop="point_id">
 
@@ -820,9 +820,6 @@ export default {
 
         ],
 
         lng: [{ required: true, message: "请输入经度", trigger: "blur" }],
 
         lat: [{ required: true, message: "请输入纬度", trigger: "blur" }],
 
-        // org_id: [
 
-        //   { required: true, message: "请选择隶属海关", trigger: "change" },
 
-        // ],
 
         point_id: [
 
           { required: true, message: "请选择所在监测点", trigger: "change" },
 
         ],
 
@@ -1413,7 +1410,7 @@ export default {
 
         org_id = org_id.join("/");
 
       } else {
 
         this.$message({
 
-          message: "请选择隶属海关",
 
+          message: "请选择隶属组织",
 
           type: "warning",
 
         });
 
         return;

+ 2 - 11
minggao/src/page/forecasting/trap/fillinrecord.vue
Bestand weergeven 

@@ -30,7 +30,7 @@
 
       </el-select>
 
       <el-select
 
         v-model="versionsvalue2"
 
-        placeholder="请选择隶属海关"
 
+        placeholder="请选择隶属组织"
 
         size="mini"
 
         clearable
 
         @change="search"
 
@@ -44,15 +44,6 @@
 
         >
 
         </el-option>
 
       </el-select>
 
-      <!-- <el-cascader
 
-        :change-on-select="true"
 
-        :options="versionsoptions"
 
-        v-model="versionsvalue"
 
-        :props="defaultParams"
 
-        :clearable="true"
 
-        size="mini"
 
-        placeholder="请选择隶属海关"
 
-      ></el-cascader> -->
 
       <el-date-picker
 
         v-model="timevalue"
 
         type="daterange"
 
@@ -85,7 +76,7 @@
 
             </template>
 
           </el-table-column>
 
           <el-table-column prop="trap_number" label="编号"></el-table-column>
 
-          <el-table-column prop="org_name" label="隶属海关">
 
+          <el-table-column prop="org_name" label="隶属组织">
 
             <template slot-scope="scope">
 
               <span v-if="scope.row.org_name.split(',').length == 1">{{
 
                 scope.row.org_name

+ 10 - 10
minggao/src/page/forecasting/trap/trap.vue
Bestand weergeven 

@@ -25,7 +25,7 @@
 
       </el-select>
 
       <el-select
 
         v-model="versionsvalue2"
 
-        placeholder="请选择隶属海关"
 
+        placeholder="请选择隶属组织"
 
         size="mini"
 
         clearable
 
         @change="search"
 
@@ -47,7 +47,7 @@
 
         :clearable="true"
 
         @change="cascaderchange"
 
         size="mini"
 
-        placeholder="请选择隶属海关"
 
+        placeholder="请选择隶属组织"
 
       ></el-cascader> -->
 
       <el-select
 
         v-model="inoffvalue"
 
@@ -100,7 +100,7 @@
 
               <span>{{ ToDegrees(scope.row.lat, "lat") }}</span>
 
             </template>
 
           </el-table-column>
 
-          <el-table-column prop="org_list" label="隶属海关">
 
+          <el-table-column prop="org_list" label="隶属组织">
 
             <template slot-scope="scope">
 
               <span v-if="scope.row.org_list.length == 1">{{
 
                 scope.row.org_list[0].org_name
 
@@ -214,7 +214,7 @@
 
               style="width: 217px"
 
             ></el-input>
 
           </el-form-item>
 
-          <el-form-item label="已绑定海关" prop="oldorg_id">
 
+          <el-form-item label="已绑定组织" prop="oldorg_id">
 
             <div class="haiguan">
 
               <p
 
                 class="haiguan_item"
 
@@ -231,14 +231,14 @@
 
               </p>
 
             </div>
 
           </el-form-item>
 
-          <el-form-item label="隶属海关" prop="org_id">
 
+          <el-form-item label="隶属组织" prop="org_id">
 
             <el-cascader
 
               :change-on-select="true"
 
               v-model="ruleForm.org_id"
 
               :options="versionsoptions"
 
               :props="defaultParams"
 
               :clearable="true"
 
-              placeholder="请选择隶属海关"
 
+              placeholder="请选择隶属组织"
 
               filterable
 
             ></el-cascader>
 
           </el-form-item>
 
@@ -462,7 +462,7 @@ export default {
 
         trap_number: "", //诱捕器编号
 
         lat: "", //           必传(string)               纬度
 
         lng: "", //      必传(string)               经度
 
-        org_id: [], //     必传(string)               所属海关id
 
+        org_id: [], //     必传(string)               所属组织id
 
         inducer_id: "", //     必传(string)               诱剂id
 
         point_id: "", //     必传(string)               所属监测点id
 
         trap_status: "", //    必传(string)               设备状态0停用 1正常
 
@@ -484,7 +484,7 @@ export default {
 
           // { validator: checklnglat, trigger: "blur" },
 
         ],
 
         // org_id: [
 
-        //   { required: true, message: "请选择隶属海关", trigger: "change" },
 
+        //   { required: true, message: "请选择隶属组织", trigger: "change" },
 
         // ],
 
         point_id: [
 
           { required: true, message: "请选择所在监测点", trigger: "change" },
 
@@ -646,7 +646,7 @@ export default {
 
             org_id = org_id.join("/");
 
           } else {
 
             this.$message({
 
-              message: "请选择隶属海关",
 
+              message: "请选择隶属组织",
 
               type: "warning",
 
             });
 
             return;
 
@@ -670,7 +670,7 @@ export default {
 
               trap_number: this.ruleForm.trap_number, //               必传(string)               设备编号
 
               lat: this.ToDegrees(this.ruleForm.lat,"lat"), //                       必传(string)               纬度
 
               lng: this.ToDegrees(this.ruleForm.lng,"lng"), //                       必传(string)               经度
 
-              org_id: org_id, //                    必传(string)               所属海关id
 
+              org_id: org_id, //                    必传(string)               所属组织id
 
               inducer_id: this.ruleForm.inducer_id, //                必传(string)               诱剂id
 
               point_id: this.ruleForm.point_id, //                  必传(string)               所属监测点id
 
               trap_status: this.ruleForm.trap_status, //               必传(string)               设备状态0停用 1正常

+ 6 - 5
minggao/src/page/homepage/facilitydistribute.vue
Bestand weergeven 

@@ -30,7 +30,7 @@
 
       </el-select>
 
       <el-select
 
         v-model="versionsvalue2"
 
-        placeholder="请选择隶属海关"
 
+        placeholder="请选择隶属组织"
 
         size="mini"
 
         @change="search"
 
       >
 
@@ -130,11 +130,12 @@
 
             <span>所属监测点：</span><span>{{ baseinfo[0].poin_name }}</span>
 
           </p>
 
           <p>
 
-            <span>隶属海关：</span
 
+            <span>隶属组织：</span
 
             ><span
 
               v-for="item in baseinfo[0].temp_org_list"
 
               :key="item.org_id"
 
-              >{{ item.org_name + "、" }}</span
 
+              style="margin-rignt:10px;"
 
+              >{{ item.org_name}}</span
 
             >
 
           </p>
 
         </div>
 
@@ -218,8 +219,8 @@ export default {
 
       width: "0px",
 
       inoffvalue: "", //监测点 选择
 
       inoffoptions: [], //监测点列表
 
-      versionsvalue2: "", //隶属海关 选择
 
-      versionsoptions2: [], //隶属海关列表
 
+      versionsvalue2: "", //隶属组织 选择
 
+      versionsoptions2: [], //隶属组织列表
 
       statevalue: "", //设备状态
 
       stateoptions: [
 
         {

+ 6 - 3
minggao/src/page/homepage/pestdistribute.vue
Bestand weergeven 

@@ -39,7 +39,7 @@
 
       </el-select>
 
       <el-select
 
         v-model="versionsvalue2"
 
-        placeholder="请选择隶属海关"
 
+        placeholder="请选择隶属组织"
 
         size="mini"
 
         @change="search"
 
       >
 
@@ -142,8 +142,8 @@ export default {
 
       wornoptions: [], //有害生物列表
 
       inoffvalue: "", //监测点 选择
 
       inoffoptions: [], //监测点列表
 
-      versionsvalue2: "", //隶属海关选择
 
-      versionsoptions2: [], //隶属海关列表
 
+      versionsvalue2: "", //隶属组织选择
 
+      versionsoptions2: [], //隶属组织列表
 
       timevalue: "",
 
       start_time: "",
 
       end_time: "",
 
@@ -501,8 +501,11 @@ export default {
 
         var maxnum = 0
 
         for (var i = 0; i < capitals.length; i += 1) {
 
           if(capitals[i].pest_total>maxnum){
 
+            console.log()
 
             maxnum = capitals[i].pest_total
 
           }
 
+        }
 
+        for (var i = 0; i < capitals.length; i += 1) {
 
           var color = ''
 
           if(capitals[i].pest_total > Math.floor(maxnum*0.8)){
 
               color = '#ff0202'

+ 5 - 5
minggao/src/page/monitor/Monitor.vue
Bestand weergeven 

@@ -655,7 +655,7 @@
 
           <el-form-item label="设备名称" prop="device_name">
 
             <el-input v-model="ruleForm.device_name"></el-input>
 
           </el-form-item>
 
-          <el-form-item label="已绑定海关" prop="oldorg_id">
 
+          <el-form-item label="已绑定组织" prop="oldorg_id">
 
             <div class="haiguan">
 
               <p
 
                 class="haiguan_item"
 
@@ -672,14 +672,14 @@
 
               </p>
 
             </div>
 
           </el-form-item>
 
-          <el-form-item label="隶属海关" prop="org_id">
 
+          <el-form-item label="隶属组织" prop="org_id">
 
             <el-cascader
 
               :change-on-select="true"
 
               v-model="ruleForm.org_id"
 
               :options="versionsoptions"
 
               :props="defaultParams"
 
               :clearable="true"
 
-              placeholder="请选择隶属海关"
 
+              placeholder="请选择隶属组织"
 
               filterable
 
             ></el-cascader>
 
           </el-form-item>
 
@@ -1033,7 +1033,7 @@ export default {
 
         lng: [{ required: true, message: "请输入经度", trigger: "blur" }],
 
         lat: [{ required: true, message: "请输入纬度", trigger: "blur" }],
 
         // org_id: [
 
-        //   { required: true, message: "请选择隶属海关", trigger: "change" },
 
+        //   { required: true, message: "请选择隶属组织", trigger: "change" },
 
         // ],
 
         point_id: [
 
           { required: true, message: "请选择所在监测点", trigger: "change" },
 
@@ -2009,7 +2009,7 @@ export default {
 
         org_id = org_id.join("/");
 
       } else {
 
         this.$message({
 
-          message: "请选择隶属海关",
 
+          message: "请选择隶属组织",
 
           type: "warning",
 
         });
 
         return;

+ 7 - 7
minggao/src/page/systemmanger/customsManger.vue
Bestand weergeven 

@@ -125,7 +125,7 @@ export default {
 
       tableSum: 0, // 表格列表总数
 
       page: 1, // 当前页数
 
 
-      // 添加隶属海关弹框
 
+      // 添加隶属组织弹框
 
       addrUserVisible: false,
 
       higherList: [
 
         {
 
@@ -137,7 +137,7 @@ export default {
 
         name: "",
 
         higher: ""
 
       },
 
-      tltData: "添加隶属海关",
 
+      tltData: "添加隶属组织",
 
       userData: {}, // 点击编辑时获取到的当前数据
 
 
       isClick: true, // 防止重复弹框
 
@@ -148,7 +148,7 @@ export default {
 
   computed: {},
 
   //监控data中的数据变化
 
   watch: {
 
-    // 添加隶属海关弹框
 
+    // 添加隶属组织弹框
 
     addrUserVisible(val) {
 
       if (val == false) {
 
         this.form.higher = ""; // 清除上级值
 
@@ -191,7 +191,7 @@ export default {
 
     actionFunc(m) {
 
       // console.log(m);
 
       this.userData = m;
 
-      this.tltData = "编辑隶属海关"; //改变弹框标题
 
+      this.tltData = "编辑隶属组织"; //改变弹框标题
 
       if (m.level == 1) {
 
         this.$set(this.higherList, 0, {
 
           value: "",
 
@@ -275,7 +275,7 @@ export default {
 
     // 添加下级组织
 
     addOrganization(m) {
 
       console.log(m);
 
-      this.tltData = "添加隶属海关"; //改变弹框标题
 
+      this.tltData = "添加隶属组织"; //改变弹框标题
 
       this.$set(this.higherList, 0, {
 
         value: m.id,
 
         label: m.org_name
 
@@ -333,14 +333,14 @@ export default {
 
       } else {
 
         this.submitBtn = true;
 
         // 请求添加接口
 
-        if (this.tltData == "编辑隶属海关") {
 
+        if (this.tltData == "编辑隶属组织") {
 
           // 编辑
 
           var url = "/api/api_gateway?method=sysmenage.usermanager.org_modify";
 
           var postData = this.qs.stringify({
 
             org_name: this.form.name, //组织名称
 
             org_id: this.userData.id // 组织id
 
           });
 
-        } else if (this.tltData == "添加隶属海关") {
 
+        } else if (this.tltData == "添加隶属组织") {
 
           // 添加
 
           var url = "/api/api_gateway?method=sysmenage.usermanager.org_add";
 
           var postData = this.qs.stringify({

+ 7 - 7
minggao/src/page/systemmanger/userManger.vue
Bestand weergeven 

@@ -76,7 +76,7 @@
 
             <el-table-column
 
               :show-overflow-tooltip="true"
 
               prop="org_list"
 
-              label="隶属海关"
 
+              label="隶属组织"
 
               width="280"
 
             >
 
               <template slot-scope="scope">
 
@@ -251,7 +251,7 @@
 
           ></el-input>
 
         </el-form-item>
 
 
-        <el-form-item label="隶属海关: " prop="judge">
 
+        <el-form-item label="隶属组织: " prop="judge">
 
           <el-cascader
 
             filterable
 
             @change="judgeData"
 
@@ -267,7 +267,7 @@
 
               checkStrictly: true,
 
             }"
 
             :clearable="true"
 
-            placeholder="请选择隶属海关"
 
+            placeholder="请选择隶属组织"
 
           ></el-cascader>
 
         </el-form-item>
 
 
@@ -402,7 +402,7 @@ export default {
 
         user: "", //账号
 
         password: "", // 密码
 
         name: "", // 姓名
 
-        judge: [], // 隶属海关
 
+        judge: [], // 隶属组织
 
         role: [], //角色
 
         phone: "", // 手机号码
 
         mailbox: "", //邮箱
 
@@ -427,7 +427,7 @@ export default {
 
           //   { min: 3, max: 5, message: "长度在 1 到 15 个字符", trigger: "blur" },
 
         ],
 
         judge: [
 
-          { required: true, message: "隶属海关，可多选", trigger: "change" },
 
+          { required: true, message: "隶属组织，可多选", trigger: "change" },
 
           //   { min: 3, max: 5, message: "长度在 1 到 15 个字符", trigger: "blur" },
 
         ],
 
         role: [
 
@@ -727,8 +727,8 @@ export default {
 
       this.$refs["form"].validate((valid) => {
 
         if (valid) {
 
           this.submitBtn = true;
 
-          // 处理隶属海关、角色
 
-          var orgList = []; //隶属海关
 
+          // 处理隶属组织、角色
 
+          var orgList = []; //隶属组织
 
           var roleList = []; // 角色
 
           for (var i = 0; i < this.form.judge.length; i++) {
 
             orgList.push(this.form.judge[i][this.form.judge[i].length - 1]);