Merge branch 'lvtianfang' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/tcZz-pc

src/assets/styles/diythem.scss

@@ -173,6 +173,9 @@ input[type="number"] {
 .desLable {
   width: 180px !important;
 }
+.desContent {
+  width: 400px;
+}
 
 .image-title {
   margin: 10px 0;

src/components/FileUpload/index.vue

@@ -90,7 +90,7 @@ export default {
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              item = { name: item, url: this.baseUrl + item };
+              item = { name: item, url: item };
             }
             item.uid = item.uid || new Date().getTime() + temp++;
             return item;

src/components/ImageUpload/index.vue

@@ -94,7 +94,7 @@ export default {
           this.fileList = list.map(item => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  item = { name: this.baseUrl + item, url: item };
+                  item = { name: this.baseUrl + item, url: this.baseUrl + item };
               } else {
                   item = { name: item, url: item };
               }

src/views/tcZz/netManage/bzhan/index.vue

@@ -237,23 +237,13 @@
     <el-dialog  :visible.sync="open" width="500px" append-to-body custom-class="dialog-box">
      <div slot="title" class="dialog-title">{{ title }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto" class="dialog-from">
-                        <!-- <el-form-item label="区域" prop="areaId">
-                          <el-select v-model="form.areaId" placeholder="请选择区域">
-                            <el-option
-                                v-for="dict in dict.type.tc_area"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item> -->
         <el-form-item label="类型" prop="type">
           <el-select v-model="form.type" placeholder="请选择类型">
             <el-option
               v-for="dict in dict.type.tc_bztype"
               :key="dict.value"
               :label="dict.label"
-:value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -262,7 +252,7 @@
             <el-radio
               v-for="dict in dict.type.tc_start"
               :key="dict.value"
-:label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -301,7 +291,8 @@
 
         <el-descriptions-item label="账号ID">{{ form.zhId }}</el-descriptions-item>
 
-                      <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item> -->
+        <el-descriptions-item label="网址"><a :href="form.url" target="blank">网址</a></el-descriptions-item>
 
         <el-descriptions-item label="类型">{{ selectDictLabel(dict.type.tc_bztype,form.type) }}</el-descriptions-item>
 
@@ -614,3 +605,9 @@
   }
 
 </script>
+<style lang="scss" scoped>
+a {
+  color: #0072c6;
+  margin: 0 5px;
+}
+</style>

src/views/tcZz/netManage/gzdt/index.vue

@@ -638,11 +638,16 @@
       },
       /** 提交按钮 */
       submitForm() {
+        let reg = new RegExp('http')
         let arr1 = [];
         let arr2 = [];
         this.fileNameS.forEach((value) => {
           arr1.push(value.name);
+          if(reg.test(value.url)){
             arr2.push(value.url);
+          } else {
+            arr2.push(process.env.VUE_APP_BASE_API + value.url);
+          }
         });
         this.form.fileName = arr1.join(",");
         this.form.fileUrl = arr2.join(",");

src/views/tcZz/netManage/qlzxxddt/index.vue

@@ -240,8 +240,8 @@
           <!-- <editor v-model="form.content" :min-height="192"/> -->
           <el-input v-model="form.content" resize="none" :rows="5" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="图片上传" prop="imageUrl">
-          <imageUpload v-model="form.imageUrl"/>
+        <el-form-item label="图片上传">
+          <imageUpload v-model="imageUrls"/>
         </el-form-item>
         <!-- <el-form-item label="文件">
           <el-button @click="addDomain" type="primary">添加图片</el-button>
@@ -280,7 +280,7 @@
 
      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
 
-        <el-descriptions title="清朗专项行动动态"  :column="2" border labelClassName="desLable">
+        <el-descriptions title="清朗专项行动动态"  :column="2" border labelClassName="desLable" contentClassName="desContent">
         <!-- <el-descriptions-item label="区域">{{ selectDictLabel(dict.type.tc_area,form.areaId) }}</el-descriptions-item> -->
 
         <el-descriptions-item label="启用/禁用">{{ selectDictLabel(dict.type.tc_start,form.isStatus) }}</el-descriptions-item>
@@ -289,7 +289,7 @@
 
         <el-descriptions-item label="内容"><div v-html='form.content'></div></el-descriptions-item>
 
-        <el-descriptions-item label="图片路径(完整路径)"><a v-for="(url,index) in images" :key="index" :href="url" target="blank">查看图片</a></el-descriptions-item>
+        <el-descriptions-item label="图片路径(完整路径)"><div class="images-box"><img v-for="(url,index) in images" :key="index" :src="url"></img></div></el-descriptions-item>
 
         <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
@@ -395,6 +395,7 @@
         },
         fileList:[],
         images:[],
+        imageUrls:'',
       };
     },
     created() {
@@ -526,6 +527,8 @@
         const id = row.id || this.ids
         getQlzxxddt(id).then(response => {
           this.form = response.data;
+          this.imageUrls = this.form.imageUrl
+          
           // this.form.isStatus = response.data.isStatus;
           // this.form.title = response.data.title;
           // this.form.content = response.data.content;
@@ -572,11 +575,23 @@
       },
       /** 提交按钮 */
       submitForm() {
-        // let arr1 = [];
+        let arr1 = [];
         // this.form.domains.forEach((value) => {
         //   arr1.push(value.imageUrl);
         // });
-        this.form.imageUrl = process.env.VUE_APP_BASE_API + this.form.imageUrl;
+        let images = this.imageUrls.split(',')
+        let reg = new RegExp('http')
+        if(images.length > 0 && images[0] !== ''){
+          images.forEach(item=>{
+            if(reg.test(item)){
+              item = item;
+            } else {
+              item = process.env.VUE_APP_BASE_API + item;
+            }
+            arr1.push(item)
+          })
+        }
+        this.form.imageUrl = arr1.join(',')
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {
@@ -675,9 +690,14 @@
         }
       }
     }
-    a {
-      color: #0072c6;
-      margin: 0 5px;
+    .images-box {
+      display: flex;
+      flex-wrap: wrap;
+      width: 100%;
+      img {
+        width: 150px;
+        margin: 5px;
+      }
     }
   }
 } 

src/views/tcZz/netManage/wz/index.vue

@@ -248,7 +248,7 @@
             <el-radio
               v-for="dict in dict.type.tc_start"
               :key="dict.value"
-:label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -295,7 +295,8 @@
 
         <el-descriptions-item label="真实IP">{{ form.trueIp }}</el-descriptions-item>
 
-                      <el-descriptions-item label="网站域名">{{ form.webDns }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="网站域名">{{ form.webDns }}</el-descriptions-item> -->
+        <el-descriptions-item label="网站域名"><a :href="form.webDns" target="blank">网站域名</a></el-descriptions-item>
 
         <el-descriptions-item label="备案许可证号">{{ form.icp }}</el-descriptions-item>
 
@@ -615,3 +616,9 @@
   }
 
 </script>
+<style lang="scss" scoped>
+a {
+  color: #0072c6;
+  margin: 0 5px;
+}
+</style>

src/views/tcZz/netManage/ytlc/index.vue

@@ -332,7 +332,7 @@
             arr1.forEach((item,index)=>{
               let obj = {};
               obj.name = item;
-              obj.url = process.env.VUE_APP_BASE_API + arr2[index];
+              obj.url = arr2[index];
               this.files.push(obj);
             })
           } else {
@@ -355,7 +355,7 @@
         this.fileNameS = []
         const id = row.id || this.ids
         getYtlc(id).then(response => {
-          console.log(response.data,'response.data')
+          // console.log(response.data,'response.data')
           this.form = response.data;
           // this.form.name = response.data.name;
           // this.form.createTime = response.data.createTime;
@@ -372,6 +372,7 @@
               });
             });
           }
+          // console.log(this.fileNameS,'this.fileNameS')
           this.open = true;
           this.title = "修改约谈流程";
         });
@@ -380,11 +381,15 @@
       submitForm() {
         let arr1 = [];
         let arr2 = [];
-        console.log(this.fileNameS)
+        let reg = new RegExp('http')
         if (this.fileNameS.length > 0) {
           this.fileNameS.forEach((value) => {
             arr1.push(value.name);
+            if(reg.test(value.url)){
               arr2.push(value.url);
+            } else {
+              arr2.push(process.env.VUE_APP_BASE_API + value.url);
+            }
           });
           this.form.fileName = arr1.join(",");
           this.form.fileUrl = arr2.join(",");
@@ -392,6 +397,7 @@
           this.form.fileName = "";
           this.form.fileUrl = "";
         }
+        console.log(this.form,'this.form')
         this.$refs["form"].validate(valid => {
           if (valid) {
             if (this.form.id != null) {

src/views/tcZz/netManage/zdgzxm/index.vue

@@ -174,22 +174,12 @@
     <el-dialog  :visible.sync="open" width="500px" append-to-body custom-class="dialog-box">
      <div slot="title" class="dialog-title">{{ title }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto" class="dialog-from">
-                        <!-- <el-form-item label="区域" prop="areaId">
-                          <el-select v-model="form.areaId" placeholder="请选择区域">
-                            <el-option
-                                v-for="dict in dict.type.tc_area"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item> -->
         <el-form-item label="启用/禁用">
           <el-radio-group v-model="form.isStatus">
             <el-radio
               v-for="dict in dict.type.tc_start"
               :key="dict.value"
-:label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -231,7 +221,7 @@
 
      <div slot="title" class="dialog-title">{{ infoTitle }}</div>
 
-        <el-descriptions title="重点工作项目"  :column="2" border labelClassName="desLable">
+      <el-descriptions title="重点工作项目"  :column="2" border labelClassName="desLable" contentClassName="desContent">
         <!-- <el-descriptions-item label="区域">{{ selectDictLabel(dict.type.tc_area,form.areaId) }}</el-descriptions-item> -->
 
         <el-descriptions-item label="启用/禁用">{{ selectDictLabel(dict.type.tc_start,form.isStatus) }}</el-descriptions-item>

src/views/tcZz/netManage/zdqyml/index.vue

@@ -283,22 +283,12 @@
     <el-dialog  :visible.sync="open" width="500px" append-to-body custom-class="dialog-box">
      <div slot="title" class="dialog-title">{{ title }}</div>
       <el-form ref="form" :model="form" :rules="rules" label-width="auto" class="dialog-from">
-                        <!-- <el-form-item label="区域" prop="areaId">
-                          <el-select v-model="form.areaId" placeholder="请选择区域">
-                            <el-option
-                                v-for="dict in dict.type.tc_area"
-                                :key="dict.value"
-                                :label="dict.label"
-                                :value="dict.value"
-                            ></el-option>
-                          </el-select>
-                        </el-form-item> -->
         <el-form-item label="启用/禁用">
           <el-radio-group v-model="form.isStatus">
             <el-radio
               v-for="dict in dict.type.tc_start"
               :key="dict.value"
-:label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -370,9 +360,11 @@
 
         <el-descriptions-item label="联系电话">{{ form.linkTel }}</el-descriptions-item>
 
-                      <el-descriptions-item label="网址或平台名称">{{ form.url }}</el-descriptions-item>
+        <el-descriptions-item label="网址或平台名称" v-if="!isurl">{{ form.url }}</el-descriptions-item>
+        <el-descriptions-item label="网址或平台名称" v-else><a :href="form.url" target="blank">网址</a></el-descriptions-item>
 
-                      <el-descriptions-item label="域名">{{ form.dns }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="域名">{{ form.dns }}</el-descriptions-item> -->
+        <el-descriptions-item label="域名"><a :href="form.dns" target="blank">域名</a></el-descriptions-item>
 
         <el-descriptions-item label="备注">{{ form.remark }}</el-descriptions-item>
 
@@ -501,6 +493,7 @@
           ],
         },
         fileList:[],
+        isurl:true,
       };
     },
     created() {
@@ -620,6 +613,12 @@
         const id = row.id || this.ids
         getZdqyml(id).then(response => {
           this.form = response.data;
+          let reg = new RegExp('http');
+          if(reg.test(this.form.url)){
+            this.isurl = true;
+          } else {
+            this.isurl = false;
+          }
           this.infoOpen = true;
           this.infoTitle = "查看重点企业名录详情"
         });
@@ -707,3 +706,9 @@
   }
 
 </script>
+<style lang="scss" scoped>
+a {
+  color: #0072c6;
+  margin: 0 5px;
+}
+</style>

src/views/tcZz/networkEcology/fb/index.vue

@@ -313,7 +313,8 @@
           parseTime(form.dateTime,'{y}-{m}-{d}')
         }}</el-descriptions-item>
 
-        <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item> -->
+        <el-descriptions-item label="网址"><a :href="form.url" target="blank">网址</a></el-descriptions-item>
 
         <el-descriptions-item label="备注">{{
           form.remark
@@ -649,3 +650,9 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+a {
+  color: #0072c6;
+  margin: 0 5px;
+}
+</style>

src/views/tcZz/networkEcology/wpwzlyqk/index.vue

@@ -299,7 +299,8 @@
           form.title
         }}</el-descriptions-item>
 
-        <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item>
+        <!-- <el-descriptions-item label="网址">{{ form.url }}</el-descriptions-item> -->
+        <el-descriptions-item label="网址"><a :href="form.url" target="blank">网址</a></el-descriptions-item>
 
         <el-descriptions-item label="备注">{{
           form.remark
@@ -621,3 +622,9 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+a {
+  color: #0072c6;
+  margin: 0 5px;
+}
+</style>