港投项目-页面bug修复

2023-05-08 18:23:59 +08:00 · 2023-05-08 18:23:59 +08:00 · 999c4cbf06
commit 999c4cbf06
parent a369220164
11 changed files with 64 additions and 54 deletions
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@ -42,7 +42,7 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL = 'http://192.168.34.117:6023/' // 杨杰本地
  // axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
  // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上（旧）地址
-  // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+  axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
  // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
  // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
  // axios.defaults.baseURL = 'http://192.168.34.231:6023/'; //杨思瑞本地
@ -80,7 +80,7 @@ if (process.env.NODE_ENV == 'development') {
  // axios.defaults.baseURL = 'http://192.168.34.221:12346' //郭圣雄本地
  // axios.defaults.baseURL = 'http://192.168.34.221:12350' //金林湾本地
  // axios.defaults.baseURL = 'http://192.168.34.122:8070' //彭洁本地
-  axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
+  // axios.defaults.baseURL = 'http://192.168.34.221:8070' //演示平台郭圣雄本地
  // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
  // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
  // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
--- a/src/assets/style/dialog.less
+++ b/src/assets/style/dialog.less
@ -23,7 +23,7 @@
 }
 .dialog-footer{
    margin-top: 40px;
-    text-align: right;
+    text-align: center;
    .el-button + .el-button{
        margin-left: 30px;
    }
--- a/src/store/index.js
+++ b/src/store/index.js
@ -48,12 +48,12 @@ export default new Vuex.Store({
    BASEURL: baseUrl
      ? baseUrl
      : window.location.protocol + "//" + window.location.host + "/", //正式环境
-    // UPLOADURL:
-    //   window.location.protocol +
-    //   "//" +
-    //   window.location.host +
-    //   "/upload/image", //正式环境
-    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
+    UPLOADURL:
+      window.location.protocol +
+      "//" +
+      window.location.host +
+      "/upload/image", //正式环境
+    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
    //---------------------------------------------------------------------------------------------
    // BASEURL: baseUrl
    //   ? baseUrl
@ -87,8 +87,8 @@ export default new Vuex.Store({
    // FILEURL:'http://'+"47.97.202.104:6023"+'/image/',//正式
    // UPLOADURL: 'http://182.90.224.147:100/upload/image',//演示平台
    // FILEURL: 'http://182.90.224.147:100/image/',//演示平台
-    UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
-    FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
+    // UPLOADURL: 'http://192.168.34.221:8070/upload/image',//演示平台郭圣雄本地
+    // FILEURL: 'http://192.168.34.221:8070/image/',//演示平台郭圣雄本地
    // UPLOADURL: 'http://192.168.34.221:30000/upload/image',//郭圣雄本地
    // FILEURL: 'http://192.168.34.221:30000/image/',//郭圣雄本地
    // UPLOADURL: 'http://101.43.164.214:12345/upload/image',//内蒙古
--- a/src/views/projectAdmin/zjsj/command/index.vue
+++ b/src/views/projectAdmin/zjsj/command/index.vue
@ -39,7 +39,7 @@
 <script>
 import LeftOne from './leftOne'
 import LeftTwo from './leftTwo'
-import LeftThree from './leftThree'
+import LeftThree from './LeftThree'
 import LeftFour from './leftFour'
 import Center from './center'
 import CenterBOne from './centerBOne'
--- a/src/views/projectFront/contractManagement/basicInformation.vue
+++ b/src/views/projectFront/contractManagement/basicInformation.vue
@ -257,7 +257,7 @@
            ></el-input>
          </el-form-item>
        </el-form>
-        <div class="dialog-footer" style="margin-right: 45%">
+        <div class="dialog-footer">
          <el-button
            class="cancleBtn"
            @click="dialogShow = false"
@ -725,7 +725,7 @@
          </el-table>
        </div>

-        <div class="dialog-footer" style="margin-right: 48%">
+        <div class="dialog-footer" >
          <el-button
            type="primary"
            icon="el-icon-circle-check"
--- a/src/views/projectFront/equipmentManagement/leasingEquipment.vue
+++ b/src/views/projectFront/equipmentManagement/leasingEquipment.vue
@ -336,7 +336,7 @@
            </el-upload>
          </el-form-item>
        </el-form>
-        <div class="dialog-footer" style="margin-right: 45%">
+        <div class="dialog-footer" >
          <el-button
            class="cancleBtn"
            @click="dialogShow = false"
@ -772,7 +772,7 @@
          </el-table>
        </div>

-        <div class="dialog-footer" style="margin-right: 48%">
+        <div class="dialog-footer" >
          <el-button
            type="primary"
            icon="el-icon-circle-check"
--- a/src/views/projectFront/equipmentManagement/ownEquipment.vue
+++ b/src/views/projectFront/equipmentManagement/ownEquipment.vue
@ -336,7 +336,7 @@
            </el-upload>
          </el-form-item>
        </el-form>
-        <div class="dialog-footer" style="margin-right: 45%">
+        <div class="dialog-footer" >
          <el-button
            class="cancleBtn"
            @click="dialogShow = false"
@ -778,7 +778,7 @@
          </el-table>
        </div>

-        <div class="dialog-footer" style="margin-right: 48%">
+        <div class="dialog-footer" >
          <el-button
            type="primary"
            icon="el-icon-circle-check"
--- a/src/views/projectFront/inspectionTesting/witnessSampling.vue
+++ b/src/views/projectFront/inspectionTesting/witnessSampling.vue
@ -140,8 +140,8 @@
        ></el-table-column>
        <el-table-column label="操作" align="center" width="200px">
          <template slot-scope="scope">
-            <div class="tableBtns" style="margin-left: 30px !important;">
-              <div @click="edit(scope.row)" class="operationText" >
+            <div class="tableBtns" style="margin-left: 30px !important">
+              <div @click="edit(scope.row)" class="operationText">
                <img
                  src="@/assets/images/icon-edit.png"
                  width="15px"
@ -302,24 +302,25 @@
          <el-form-item label="见证取样视频" prop="witnessSamplingVideo">
            <div class="videoUpload">
              <el-upload
+                class="upload-demo"
                name="files"
                :action="$store.state.UPLOADURL"
-                multiple
-                :file-list="fileList"
                :on-success="(file) => handleSuccess(file, 4)"
                :show-file-list="false"
+                accept="video/mp4"
              >
                <el-button type="primary">上传视频</el-button>
              </el-upload>
              <video
-              :src="$store.state.FILEURL + addEditForm.witnessSamplingVideo"
-              width="100%"
-              height="200"
-              controls
-            ></video>
+                v-if="isRouterAlive || addEditForm.witnessSamplingVideo"
+                :src="$store.state.FILEURL + addEditForm.witnessSamplingVideo"
+                width="100%"
+                height="200"
+                controls
+              ></video>
            </div>
          </el-form-item>
-          <div class="dialog-footer">
+          <div class="dialog-footer" >
            <el-button
              class="cancleBtn"
              @click="dialogShow = false"
@ -353,6 +354,7 @@ export default {
  },
  data() {
    return {
+      isRouterAlive: false,
      title: "",
      dialogShow: false,
      pagInfo: {
@ -387,10 +389,11 @@ export default {
        projectName: '',
        sampleName: '',
      },
+      videoUrl: '',
    }
  },
  methods: {
-    // 删除照片
+    // 删除
    handleRemove(file, fileList, type) {
      if (type == 1) {
        this.fileUplodList1 = fileList
@ -408,27 +411,35 @@ export default {
        name: file.data[0].filename,
        url: this.$store.state.FILEURL + file.data[0].imageUrl
      }
+
      if (type == 1) {
        this.fileUplodList1.push(
          data
        )
+
      }
      else if (type == 2) {
        this.fileUplodList2.push(
          data
        )
+
      }
      else if (type == 3) {
        this.fileUplodList3.push(
          data
        )
+
      }
      else if (type == 4) {
-        this.addEditForm.witnessSamplingVideo = file.data[0].filename
+        this.isRouterAlive = false;
+        this.$nextTick(() => {
+          this.addEditForm.witnessSamplingVideo = file.data[0].imageUrl
+          this.isRouterAlive = true;
+        })
      }

    },
- 
+
    //查询仓库数据
    getList() {
      gettgtMaterialWitnessSamplePageApi({
@ -447,7 +458,7 @@ export default {
              item.samplerPhoto[0].url =
                this.$store.state.FILEURL + item.samplerPhoto[0].url;
            }
-          }else {
+          } else {
            let url = item.samplerPhoto

            if (url.length !== 0 && !url.includes(this.$store.state.FILEURL)) {
@ -566,11 +577,11 @@ export default {
    },

    close() {
-      this.fileUplodList1=[],
-      this.fileUplodList2=[],
-      this.fileUplodList3=[],
-    
-      this.addEditForm = {}
+      this.fileUplodList1 = [],
+        this.fileUplodList2 = [],
+        this.fileUplodList3 = [],
+        this.addEditForm = {}
+        this.isRouterAlive = false;
      this.$nextTick(() => {
        this.$refs.addEditForm.clearValidate()
      })
--- a/src/views/projectFront/procurementManagement/biddingManagement.vue
+++ b/src/views/projectFront/procurementManagement/biddingManagement.vue
@ -434,7 +434,7 @@
          </el-table>
        </div>

-        <div class="dialog-footer" style="margin-right: 48%">
+        <div class="dialog-footer" >
          <el-button
            type="primary"
            icon="el-icon-circle-check"
--- a/src/views/projectFront/smartPartyBuilding/articleManagement.vue
+++ b/src/views/projectFront/smartPartyBuilding/articleManagement.vue
@ -72,11 +72,10 @@
          </div>
        </div>
        <div class="noData" v-else>
-        <img src="@/assets/images/noData.png" alt srcset />
-        <p>暂无数据</p>
-      </div>
+          <img src="@/assets/images/noData.png" alt srcset />
+          <p>暂无数据</p>
+        </div>
      </vue-scroll>
-     
    </div>

    <!-- 新增 -->
@ -99,14 +98,14 @@
          <el-form-item label="文章标题">
            <el-input
              v-model="addEditForm.articleTitle"
-              style="width: 1020px"
+              style="width: 1010px"
              placeholder="请输入文章标题"
            ></el-input>
          </el-form-item>
-          <el-form-item label="文章内容" prop="content">
+          <el-form-item label="文章内容" prop="content" style="line-height: 140px;">
            <quill-editor
              class="ql-editor"
-              style="width: 1020px"
+              style="width: 1038px; margin-left: -15px; margin-top: -20px"
              v-model="addEditForm.articleContent"
              ref="myQuillEditor"
              :options="editorOption"
@ -116,7 +115,7 @@
            >
            </quill-editor>
          </el-form-item>
-          <el-form-item label="封面图片">
+          <el-form-item label="封面图片" style="line-height: 140px;">
            <el-upload
              :action="$store.state.UPLOADURL"
              list-type="picture-card"
@ -131,7 +130,7 @@
            </el-upload>
          </el-form-item>
        </el-form>
-        <div class="dialog-footer" style="margin-right: 40%">
+        <div class="dialog-footer">
          <el-button
            class="cancleBtn"
            @click="dialogShow = false"
@ -168,7 +167,7 @@
            v-html="detailData.articleContent"
          ></div>
        </div>
-        <div class="dialog-footer" style="margin-right: 45%">
+        <div class="dialog-footer" >
          <el-button
            type="primary"
            icon="el-icon-circle-check"
--- a/src/views/projectFront/smartPartyBuilding/partyBuildingActivities.vue
+++ b/src/views/projectFront/smartPartyBuilding/partyBuildingActivities.vue
@ -102,7 +102,7 @@
          <el-form-item label="活动主题">
            <el-input
              v-model="addEditForm.activityTheme"
-              style="width: 1020px"
+              style="width: 1010px"
              placeholder="请输入活动主题"
            ></el-input>
          </el-form-item>
@ -124,14 +124,14 @@
          <el-form-item label="参与人">
            <el-input
              v-model="addEditForm.participant"
-              style="width: 438px"
+              style="width: 425px"
              placeholder="请输入参与人"
            ></el-input>
          </el-form-item>
-          <el-form-item label="活动内容" prop="content">
+          <el-form-item label="活动内容" prop="content"  style="line-height: 140px;">
            <quill-editor
            class="ql-editor"
-              style="width: 1020px"
+            style="width: 1038px; margin-left: -15px; margin-top: -20px"
              v-model="addEditForm.activity"
              ref="myQuillEditor"
              :options="editorOption"
@ -142,7 +142,7 @@
            </quill-editor>
          </el-form-item>
        </el-form>
-        <div class="dialog-footer" style="margin-right: 40%">
+        <div class="dialog-footer">
          <el-button
            class="cancleBtn"
            @click="dialogShow = false"
@ -178,7 +178,7 @@
          <div class="ql-editor" style="white-space:pre-line" v-html="detailData.activity"></div>
         </div>
      
-        <div class="dialog-footer" style="margin-right: 45%">
+        <div class="dialog-footer" >
          <el-button
            type="primary"
            icon="el-icon-circle-check"