fuliqi
2024-12-02 d441a339549da0e1280879333f0b22823a603443
合同积分的提示、地图样式调整
4个文件已修改
147 ■■■■ 已修改文件
src/views/screen/components/map3.vue 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/screen/index.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/contract/contract/index.vue 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/contract/score/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/screen/components/map3.vue
@@ -36,7 +36,7 @@
        },
        {
          name: '大安区',
          value: [104.93805, 29.175946, 300],
          value: [104.95805, 29.155946, 300],
          platformOnline: true
        },
        {
@@ -64,7 +64,7 @@
        {
          name: '自流井区',
          number: '0',
          value: [104.841471408, 29.860000, 300]
          value: [104.821471408, 29.860000, 300]
        },
        {
          name: '高新区',
@@ -74,12 +74,12 @@
        {
          name: '大安区',
          number: '0',
          value: [105.17337686031, 29.57948885792289, 300]
          value: [105.27337686031, 29.57948885792289, 300]
        },
        {
          name: '沿滩区',
          number: '0',
          value: [105.36237686031, 30.30048885792289, 300]
          value: [105.33237686031, 30.20048885792289, 300]
        },
        {
          name: '贡井区',
@@ -160,6 +160,8 @@
          map: name,
          left: '-5%',
          top: '20%',
          width: '100%', // 明确指定宽度
          height: '720px', // 明确指定高度
          // boxWidth: 100,
          regionHeight: 0.8,
          zlevel: 10,
@@ -256,6 +258,8 @@
            regionHeight: 0.8,
            left: '-5%',
            top: '20%',
            width: '100%', // 明确指定宽度
            height: '720px', // 明确指定高度
            zlevel: 5,
            // tooltip: {
@@ -333,21 +337,21 @@
              {
                coords: [
                  [104.621171408, 29.150000, 300],
                  [104.841471408, 29.860000, 335]
                  [104.841471408, 29.900000, 335]
                ]
              },
              // 高新区线
              {
                coords: [
                  [104.780000, 29.19, 300],
                  [104.867237686031, 29.39548885792289, 335]
                  [104.880237686031, 29.42548885792289, 335]
                ]
              },
              // 大安区线
              {
                coords: [
                  [104.93805, 29.175946, 300],
                  [105.17337686031, 29.57948885792289, 335]
                  [104.95805, 29.155946, 300],
                  [105.27337686031, 29.60948885792289, 335]
                ]
              },
              // 沿滩区线
@@ -417,8 +421,8 @@
          },
          formatter: function (params) {
            return `{style|${params.data.name} :${params.data.number}}`
            // return `{style|${params.data.name} \n 视频:${params.data.number} \n 车辆:${params.data.number} \n 人脸:${params.data.number}}`
            // return `{style|${params.data.name} :${params.data.number}}`
            return `{style|${params.data.name} \n 视频:${params.data.number} \n 车辆:${params.data.number} \n 人脸:${params.data.number}}`
          },
          rich: {
            style: {
src/views/screen/index.vue
@@ -1435,8 +1435,8 @@
}
.rotating-image {
  width: 900px;
  height: 900px;
  width: 950px;
  height: 950px;
  position: absolute;
  top: calc(50% - 450px);
  left: calc(50% - 450px);
@@ -1445,8 +1445,8 @@
}
.rotating-image-in {
  width: 850px;
  height: 850px;
  width: 900px;
  height: 900px;
  position: absolute;
  top: calc(50% - 425px);
  left: calc(50% - 425px);
src/views/system/contract/contract/index.vue
@@ -23,7 +23,6 @@
      </el-form-item>
    </el-form>
    <el-row :gutter="10" class="mb8" style="margin-top: 10px">
      <el-col :span="1.5">
        <el-button
@@ -171,13 +170,106 @@
            </el-link
            >
            <div style="text-align: right; margin-top: 10px">
<!--              <el-button type="primary" @click="handleImportRule">导入规则</el-button>-->
              <el-button type="primary" @click="submitForm">提交</el-button>
            </div>
          </el-collapse>
        </el-form>
      </div>
    </el-drawer>
    <!-- 导入规则对话框 -->
    <el-dialog
      :title="importRule.title"
      :visible.sync="importRule.open"
      width="1000px"
      append-to-body
    >
      <el-form ref="form" :model="upload" :rules="rules" label-width="80px">
            <div class="row-right" style="margin-left: 80px">
              <div class="margin-5">
                <el-upload
                  ref="upload"
                  :limit="1"
                  accept=".xlsx, .xls"
                  :headers="upload.headers"
                  :action="upload.url"
                  :disabled="upload.isUploading"
                  :on-progress="handleFileUploadProgress"
                  :on-success="handleFileSuccess"
                  :data="upload"
                  :auto-upload="false"
                  drag
                  style="text-align: center"
                >
                  <i class="el-icon-upload"></i>
                  <div class="el-upload__text">
                    将文件拖到此处,或<em>点击上传</em>
                  </div>
                  <div class="el-upload__tip text-center" slot="tip">
                    <span>仅允许导入xls、xlsx格式文件。</span>
                    <el-link
                      type="primary"
                      :underline="false"
                      style="font-size: 12px; vertical-align: baseline"
                      @click="importTemplate"
                    >下载模板
                    </el-link
                    >
                  </div>
                </el-upload>
              </div>
            </div>
        <el-divider content-position="left">考核结果应用规则</el-divider>
        <div class="row-warp">
          <div
            class="row"
            v-for="(item, index) in upload.ruleList"
            :key="index"
          >
            <div class="row-left" style="flex: 0.7">
              <div class="block">
                <el-form-item label="考核条件" prop="ruleList">
                  <el-input
                    v-model="item.scoreCondition"
                    style="width: 250px"
                  />
                </el-form-item>
              </div>
            </div>
            <div class="row-right">
              <div class="margin-5">
                <el-form-item label="规则描述" prop="ruleList">
                  <el-input
                    type="textarea"
                    v-model="item.description"
                    style="width: 300px"
                  />
                  <el-button
                    style="margin-left: 50px"
                    type="danger"
                    icon="el-icon-delete"
                    circle
                    @click="deleteRule(index)"
                  ></el-button>
                </el-form-item>
              </div>
            </div>
          </div>
        </div>
        <el-button
          style="margin-left: 50px"
          type="success"
          icon="el-icon-plus"
          circle
          @click="addRule"
        ></el-button>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button @click="upload.open = false">取 消</el-button>
        <el-button type="primary" @click="submitFileForm">确 定</el-button>
      </div>
    </el-dialog>
    <!-- 合同导入对话框 -->
    <el-dialog
      :title="upload.title"
@@ -355,6 +447,20 @@
        startTime: "",
        endTime: "",
      },
      // 规则导入参数
      importRule: {
        // 是否显示弹出层(合同导入)
        open: false,
        // 弹出层标题(合同导入)
        title: "",
        // 是否禁用上传
        isUploading: false,
        // 设置上传的请求头部
        headers: {Authorization: "Bearer " + getToken()},
        // 上传的地址
        url: process.env.VUE_APP_BASE_API + "/system/contract/updateRule",
        ruleList: [],
      },
      dialogImageUrl: "",
      dialogVisible: false,
      disabled: false,
@@ -460,6 +566,11 @@
      this.upload.title = "合同导入";
      this.upload.open = true;
    },
    /** 导入按钮操作 */
    handleImportRule() {
      this.importRule.title = "规则导入";
      this.importRule.open = true;
    },
    /** 下载模板操作 */
    importTemplate() {
      this.download("system/contract/importTemplate", {}, `合同导入模板.xlsx`);
src/views/system/contract/score/index.vue
@@ -139,7 +139,7 @@
              </div>
            </div>
          </div>
          <div style="font-size: 5px">
          <div>
            {{ ruleDescription}}
          </div>