Merge branch 'hjw-222' into 'master'

生产修改

See merge request spfm/spfm-market-front!476

src/components/upload.vue

@@ -232,6 +232,7 @@ export default {
           } else {
             this.attList.push({
               id: res.data.body.id,
+              fileName: res.data.body.fileName,
               name: res.data.body.fileName,
               fileCode: res.data.body.fileCode,
               opName: res.data.body.opName,

src/components/uploadDown.vue

@@ -6,13 +6,7 @@
       <i class="iconfont icon-ppt" v-if="item.type === 'ppt'"></i>
       <i class="iconfont icon-wenjian" v-if="item.type === 'wenjian'"></i>
       <i class="el-icon-picture" v-if="item.type === 'png'"></i>
-      <el-tooltip
-        class="item"
-        effect="dark"
-        :content="item.fileName"
-        placement="right"
-        :enterable="false"
-      >
+      <el-tooltip class="item" effect="dark" :content="item.fileName" placement="right" :enterable="false">
         <span class="tab-long">{{ item.fileName }}</span>
       </el-tooltip>
       <div class="seedown" v-if="datalist.type === 2">
@@ -44,8 +38,11 @@ export default {
       }
     },
     uploadsee(v) {
-      let url = encodeURIComponent(v.callPath);
-      this.srcsc = "http://114.215.71.182:8012/onlinePreview?url=" + url;
+      console.log(v);
+      let url = encodeURIComponent(Base64.encode(v.callPath));
+      console.log(url);
+      this.srcsc = 'http://10.230.15.228:8012/onlinePreview?url=' + url;
+      // this.srcsc = 'http:///114.215.71.182:8012/onlinePreview?url=' + url;
       this.ifrshow = true;
       // window.open('http://114.215.71.182:8012/onlinePreview?url=' + url);
     },
@@ -111,7 +108,7 @@ export default {
     this.dataHandle();
     console.log(this.infolist);
   },
-  created() {},
+  created() { },
   watch: {
     dialogStatus() {
       this.$forceUpdate();
@@ -178,9 +175,12 @@ export default {
       margin: 0 10px;
       overflow: hidden;
       text-overflow: ellipsis;
-      display: -webkit-box; /* 将对象作为弹性伸缩盒子模型显示 */
-      -webkit-line-clamp: 1; /* 控制最多显示几行 */
-      -webkit-box-orient: vertical; /* 设置或检索伸缩盒对象的子元素的排列方式 */
+      display: -webkit-box;
+      /* 将对象作为弹性伸缩盒子模型显示 */
+      -webkit-line-clamp: 1;
+      /* 控制最多显示几行 */
+      -webkit-box-orient: vertical;
+      /* 设置或检索伸缩盒对象的子元素的排列方式 */
     }
   }
 

src/pages/main/firewall/index.vue

@@ -710,7 +710,7 @@ export default {
             });
         },
         setForm(e) {
-            this.request_form.title = '[工作台]-防火墙策略-' + this.$refs.formTable.form.needName;
+            this.request_form.title = '[IT工作台]-防火墙策略-' + this.$refs.formTable.form.needName;
             this.$http({
                 url: "/market/fhqProcess/add",
                 method: "post",

src/pages/main/opcode/index.vue

@@ -693,7 +693,7 @@ export default {
             });
         },
         setForm(e) {
-            this.request_form.title = '[工作台]-Op_Code-' + this.$refs.formTable.form.needName;
+            this.request_form.title = '[IT工作台]-Op_Code-' + this.$refs.formTable.form.needName;
             this.$http({
                 url: "/market/opProcess/add",
                 method: "post",

src/pages/main/terminals/advertincreases.vue

@@ -448,8 +448,8 @@ export default {
         processDefinitionKey: "ggsj_process",
       },
       requestForm: {
-          // fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
-        fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
+          fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
+        // fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00",//本地环境
         processDefinitionKey: "ggsj_process",
       },

src/pages/main/terminals/components/adverts.vue

@@ -238,8 +238,8 @@ export default {
       // draftStatus:'',//起草状态更改表单状态
       uploadDownStatus: false,
       requestForm: {
-        // fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
-        fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
+        fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
+        // fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
         // fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00", //本地环境
         processDefinitionKey: "ggsj_process",
       },